[Gzz-commits] gzz/gzz/view/buoy buoymanager.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        03/02/13 09:51:44

Modified files:
        gzz/view/buoy  : buoymanager.py 

Log message:
        Twiddle animation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/buoy/buoymanager.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.35 
gzz/gzz/view/buoy/buoymanager.py:1.36
--- gzz/gzz/view/buoy/buoymanager.py:1.35       Thu Feb 13 09:41:05 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Thu Feb 13 09:51:43 2003
@@ -44,7 +44,7 @@
        self.cs = { }
 
        self.ctrx = vs.size.width / 2
-       self.ctry = vs.size.height / 7 * 3
+       self.ctry = vs.size.height * .485 # A *little* above real ctr
 
        mainsize = vs.size.width * .5
 
@@ -55,21 +55,20 @@
 
        center = vs.translateCS(0, "Center", self.ctrx, self.ctry)
 
-       main = vs.orthoBoxCS(center, "MAINVP", 0, 
+       into = vs.orthoBoxCS(center, "MAINVP", 0, 
                              -mainsize/2, -mainsize/2, 1, 1, mainsize, 
mainsize)
-       self.vs.activate(main)
 
-       into = self.nadir(main)
+       self.vs.activate(into)
 
        self.links = []
        self.mainNode.renderMain(vs, into)
        for l in self.links: self.linkReally(*l)
-       self.cs[main] = None
+       self.cs[into] = None
         
         # Interpolation : old buoy -> to new main vp
         if hasattr(self, "animationCS_buoy") and \
                self.animationCS_buoy != None:
-            self.vs.matcher.keymapSingleCoordsys(into, 
self.animationCS_buoy[0][3])
+            self.vs.matcher.keymapSingleCoordsys(into, 
self.animationCS_buoy[0])
             self.animationCS_buoy = None
 
         self.mainCS = into
@@ -104,7 +103,7 @@
        into = self.nadir(into)
        self.vs.activate(into)
        otherAnchorCS = otherNode.renderBuoy(self.vs, into, linkId, 
otherAnchor, None)
-       self.cs[into] = (otherNode, linkId, otherAnchor, otherAnchorCS)
+       self.cs[into] = (otherNode, linkId, otherAnchor, into)
        self.vs.map.put(GLCache.getCallList("""
            PushAttrib ENABLE_BIT LINE_BIT
            Disable TEXTURE_2D
@@ -148,7 +147,7 @@
             if ev.getID() != ev.MOUSE_CLICKED:
                 return
 
-            self.animationCS_buoy = [link, self.vs]
+            self.animationCS_buoy = [cs, link, self.vs]
             self.animationCS_main = [self.mainCS, link, self.vs]
 
            self.mainNode = link[0].createMainNode(link[1], link[2], self)