[beryl-commits] r1482 - branches/beryl-3d-plugin

[roico at server.beryl-project.org]

Author: roico
Date: 2006-12-02 00:22:44 +0100 (Sat, 02 Dec 2006)
New Revision: 1482

Modified:
   branches/beryl-3d-plugin/3d.c
Log:
fix a small bug that windows on 2 different viewports won't get connected if the multiscreen cube mode is "multiple cubes" even if there is only one 
screen.


Modified: branches/beryl-3d-plugin/3d.c
===================================================================
--- branches/beryl-3d-plugin/3d.c	2006-12-01 10:26:56 UTC (rev 1481)
+++ branches/beryl-3d-plugin/3d.c	2006-12-01 23:22:44 UTC (rev 1482)
@@ -22,20 +22,14 @@
 
 /**
 TODO:
-        1. Change windowIs3D.
-        2. Clean.
-        3. Things done in tdPreparePaintScreen should be done only when needed...
-        4. Make settings for this plugin, its just changing the spacing of the windows (SPACE) and the speed of zooming (SPEED).
-        5. Fix bugs:    1. Non-Maximized windows can't take focus from maximized windows.
-                        2. Gnome-Panel is drawn last. It also happened in switcher but it was fixed, i'll see how they fixed it there later...
-                        (ALMOST FIXED) check if thats the best solution, add a reorder when a new window i mapped, and check why the problem is only fixed at the top panel.
-
-                        3. Windows are breaking when they are in more than 1 viewport. This one will be very hard to fix... =\
-                        4. Decorations not always zooming correctly.
-                        5. The plugin works much better with the benchmark plugin.
-        6. update TODO :D
-
-        Fix zoom.
+        1. Add 3d shadows / projections.
+        2. Add width to windows.
+        3. Add an option to select z-order of windows not only by viewports but also by screens.
+        4. Fix 3d for inside cube and planed / unfolded cube.
+        5. Find a better solution for blur cache + 3d.
+        6. Fix bugs with 3d + animations / wobbly.
+        	- Wobbly will draw the window twice if its in 2 different viewports.
+        	- Many Bugs with animations, some are solvable by changing the load order, but it will result with clipping when animations are done.
 */
 
 #define _GNU_SOURCE
@@ -383,7 +377,9 @@
                 	tds->currentViewportNum *= tds->currentScreenNum;
 
 
-                if(tds->currentViewportNum > 2 && tds->currentMmMode != Multiple && !(MULTISCREENCUBE_MODE && tds->currentDifferentResolutions))
+                if(tds->currentViewportNum > 2
+                   && (tds->currentMmMode != Multiple || screen->nOutputDev == 1)
+                   && !(MULTISCREENCUBE_MODE && tds->currentDifferentResolutions))
                         tds->xMove = 1.0f / (tan( PI * (tds->currentViewportNum - 2.0f) / (2.0f * tds->currentViewportNum) ));
                 else
                         tds->xMove = 0.0f;