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

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/02/11 09:53:33

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

Log message:
        debugs for animation. might be a matching problem...

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

Patches:
Index: gzz/gzz/view/buoy/buoymanager.py
diff -u gzz/gzz/view/buoy/buoymanager.py:1.20 
gzz/gzz/view/buoy/buoymanager.py:1.21
--- gzz/gzz/view/buoy/buoymanager.py:1.20       Tue Feb 11 07:08:56 2003
+++ gzz/gzz/view/buoy/buoymanager.py    Tue Feb 11 09:53:33 2003
@@ -66,8 +66,13 @@
         if hasattr(self, "animationCS_buoy") and \
                self.animationCS_buoy != None:
             # Interpolation : buoy -> to main vp
-            self.vs.matcher.keymapSingleCoordsys(main,self.animationCS_buoy)
+            print 'Do MAIN Animation'
+            self.vs.matcher.keymapSingleCoordsys(main, 
self.animationCS_buoy[0][3])
+            old_vs = self.animationCS_buoy[1]
+            old_vs.matcher.dumpByParent(self.animationCS_buoy[0][3])
+
             self.animationCS_buoy = None
+
         self.mainCS = main
 
     def link(self, *args):
@@ -99,8 +104,8 @@
            self.vs.put(coloredQuad((0,1,0)), dbg1)
        into = self.nadir(into)
        self.vs.activate(into)
-       self.cs[into] = (otherNode, linkId, otherAnchor)
        otherAnchorCS = otherNode.renderBuoy(self.vs, into, linkId, 
otherAnchor, None)
+       self.cs[into] = (otherNode, linkId, otherAnchor, otherAnchorCS)
        self.vs.map.put(GLCache.getCallList("""
            PushAttrib ENABLE_BIT LINE_BIT
            Disable TEXTURE_2D
@@ -118,15 +123,17 @@
            PopAttrib
        """))
 
-        print 'Link ID: ', linkId
         if hasattr(self, "animationCS_main") and \
                self.animationCS_main != None and \
-               linkId == self.animationCS_main[1]:
+               linkId == self.animationCS_main[1][1]:
             print 'Main to Buoy interpolation..'
             # Interpolation : mainvp -> to buoy
-            self.vs.matcher.keymapSingleCoordsys(into,self.animationCS_main[0])
-            self.animationCS_main = None
+            
self.vs.matcher.keymapSingleCoordsys(otherAnchorCS,self.animationCS_main[0])
 
+            old_vs = self.animationCS_main[2]
+            old_vs.matcher.dumpByParent(self.animationCS_main[0])
+            
+            self.animationCS_main = None
 
     def key(self, key):
        gzz.client.AbstractUpdateManager.chg()
@@ -149,8 +156,8 @@
 
            self.mainNode = link[0].createMainNode(link[1], link[2], self)
 
-            self.animationCS_buoy = cs
-            self.animationCS_main = [self.mainCS, link]
+            self.animationCS_buoy = [link, self.vs]
+            self.animationCS_main = [self.mainCS, link, self.vs]
 
            gzz.client.AbstractUpdateManager.chg()