Ver Fonte

*** empty log message ***

gregw há 24 anos atrás
pai
commit
e43b9badc3
1 ficheiros alterados com 8 adições e 7 exclusões
  1. 8 7
      direct/src/showbase/Transitions.py

+ 8 - 7
direct/src/showbase/Transitions.py

@@ -2,12 +2,13 @@
 from PandaModules import *
 from PandaModules import *
 import Task
 import Task
 
 
-# These may be reassigned before the fade or iris transitions are
-# actually invoked to change the models that will be used.
-IrisModelName = "phase_3/models/misc/iris"
-FadeModelName = "phase_3/models/misc/fade"
-
 class Transitions:
 class Transitions:
+
+    # These may be reassigned before the fade or iris transitions are
+    # actually invoked to change the models that will be used.
+    IrisModelName = "models/misc/iris"
+    FadeModelName = "models/misc/fade"
+
     def __init__(self, loader):
     def __init__(self, loader):
         self.iris = None
         self.iris = None
         self.fade = None
         self.fade = None
@@ -238,7 +239,7 @@ class Transitions:
 
 
     def loadIris(self):
     def loadIris(self):
         if self.iris == None:
         if self.iris == None:
-            self.iris = loader.loadModel(IrisModelName)
+            self.iris = loader.loadModel(self.IrisModelName)
             self.iris.setPos(0,0,0)
             self.iris.setPos(0,0,0)
 
 
     def loadFade(self):
     def loadFade(self):
@@ -249,7 +250,7 @@ class Transitions:
             # simply loading the polygon model and using it directly,
             # simply loading the polygon model and using it directly,
             # so that it will also obscure mouse events for objects
             # so that it will also obscure mouse events for objects
             # positioned behind it.
             # positioned behind it.
-            fadeModel = loader.loadModel(FadeModelName)
+            fadeModel = loader.loadModel(self.FadeModelName)
 
 
             self.fade = DirectFrame(
             self.fade = DirectFrame(
                 parent = hidden,
                 parent = hidden,