Joe Shochet 24 лет назад
Родитель
Сommit
20ca39fc2c

+ 4 - 0
direct/src/directscripts/runPythonEmacs

@@ -66,6 +66,10 @@ if [ "$TTMODELS" ]; then
     export TTMODELS
 fi
 
+if [ "$BARMODELS" ]; then
+    TTMODELS=`cygpath -w $BARMODELS`
+    export BARMODELS
+fi
 
 
 # Export the proper home environment variable

+ 6 - 6
direct/src/directutil/Mopath.py

@@ -13,6 +13,8 @@ class Mopath(PandaObject):
             self.nameIndex = self.nameIndex + 1
         self.name = name
         self.tPoint = Point3(0)
+        self.posPoint = Point3(0)
+        self.hprPoint = Point3(0)
         self.reset()
 
     def getMaxT(self):
@@ -91,13 +93,11 @@ class Mopath(PandaObject):
             return
         self.playbackTime = self.calcTime(CLAMP(time, 0.0, self.maxT))
         if (self.xyzNurbsCurve != None):
-            pos = Point3(0)
-            self.xyzNurbsCurve.getPoint(self.playbackTime, pos)
-            node.setPos(pos)
+            self.xyzNurbsCurve.getPoint(self.playbackTime, self.posPoint)
+            node.setPos(self.posPoint)
         if (self.hprNurbsCurve != None):
-            hpr = Point3(0)
-            self.hprNurbsCurve.getPoint(self.playbackTime, hpr)
-            node.setHpr(hpr)
+            self.hprNurbsCurve.getPoint(self.playbackTime, self.hprPoint)
+            node.setHpr(self.hprPoint)
 
     def play(self, node, time = 0.0, loop = 0):
         if (self.xyzNurbsCurve == None) and (self.hprNurbsCurve == None):

+ 2 - 1
direct/src/gui/DirectWaitBar.py

@@ -71,7 +71,8 @@ class DirectWaitBar(DirectFrame):
         self.updateBarStyle()
 
     def setBarColor(self):
-        self.barStyle.setColor(*self['barColor'])
+        color = self['barColor']
+        self.barStyle.setColor(color[0], color[1], color[2], color[3])
         self.updateBarStyle()
 
     def update(self, value):

+ 3 - 0
direct/src/interval/Interval.py

@@ -68,6 +68,9 @@ class Interval(DirectObject):
         # Record t for next time around
         self.prev_t = self.curr_t
 
+    def getT(self):
+        return self.curr_t
+
     def updateFunc(self, t, event = IVAL_NONE):
         """ updateFunc(t, event)
         """