[ff-cvs] libvob/vob buoy/buoymanager.py putil/demo.py

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/libvob
Module name:    libvob
Branch:         
Changes by:     Tuomas J. Lukka <address@hidden>        03/08/17 06:04:10

Modified files:
        vob/buoy       : buoymanager.py 
        vob/putil      : demo.py 

Log message:
        Allow reloading even if scene wasn't constructed

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/buoy/buoymanager.py.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/libvob/libvob/vob/putil/demo.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: libvob/vob/buoy/buoymanager.py
diff -u libvob/vob/buoy/buoymanager.py:1.58 libvob/vob/buoy/buoymanager.py:1.59
--- libvob/vob/buoy/buoymanager.py:1.58 Sat Aug 16 08:39:29 2003
+++ libvob/vob/buoy/buoymanager.py      Sun Aug 17 06:04:10 2003
@@ -91,9 +91,8 @@
 
     def getMainNode(self):
         return self.mainNode
-    def drawscene(self, vs, mainboxinto, into, buoyinto):
+    def drawScene(self, vs, mainboxinto):
        self.vs = vs
-       self.buoyinto = buoyinto
        self.cs = { }
 
 
@@ -262,10 +261,9 @@
        geoms = self.geometer.place(vs)
 
        for i in range(0, len(self.singles)):
-           self.singles[i].drawscene(vs, 
-                   geoms[i][0],
-                   geoms[i][1],
-                   geoms[i][2])
+           if geoms[i][0] >= 0:
+               self.singles[i].drawScene(vs, 
+                       geoms[i][0])
 
     def mouse(self, ev):
         """ Returns true if buoymanager has eaten the event ;)"""
Index: libvob/vob/putil/demo.py
diff -u libvob/vob/putil/demo.py:1.17 libvob/vob/putil/demo.py:1.18
--- libvob/vob/putil/demo.py:1.17       Sat Aug 16 08:49:30 2003
+++ libvob/vob/putil/demo.py    Sun Aug 17 06:04:10 2003
@@ -211,11 +211,12 @@
            elif not globalkey(s):
                currentScene.key(s)
        else:
-            currentScene.key(s)
            if s == "Ctrl-Q":
                System.exit(43)
            elif s == "Ctrl-R":
                loadScenes()
+           else:
+               currentScene.key(s)
        vob.AbstractUpdateManager.chg()
     def mouse(self, e):
        # print "MOUSE: '%s'"%e