Explorar el Código

"fixed init/cleanup ordering issue"

Josh Wilson hace 19 años
padre
commit
1d286689b2
Se han modificado 1 ficheros con 6 adiciones y 4 borrados
  1. 6 4
      direct/src/showbase/DistancePhasedNode.py

+ 6 - 4
direct/src/showbase/DistancePhasedNode.py

@@ -268,9 +268,15 @@ class BufferedDistancePhasedNode(DistancePhasedNode):
 
 
     def __init__(self, name, bufferParamMap = {}, autoCleanup = True,
     def __init__(self, name, bufferParamMap = {}, autoCleanup = True,
                  enterPrefix = 'enter', exitPrefix = 'exit', phaseCollideMask = BitMask32.allOn(), fromCollideNode = None):
                  enterPrefix = 'enter', exitPrefix = 'exit', phaseCollideMask = BitMask32.allOn(), fromCollideNode = None):
+        self.bufferParamMap = bufferParamMap
+        self.bufferParamList = sorted(bufferParamMap.items(),
+                                      key = lambda x: x[1],
+                                      reverse = True)
+
         sParams = dict(bufferParamMap)
         sParams = dict(bufferParamMap)
         for key in sParams:
         for key in sParams:
             sParams[key] = sParams[key][0]
             sParams[key] = sParams[key][0]
+
         DistancePhasedNode.__init__(self, name = name,
         DistancePhasedNode.__init__(self, name = name,
                                     phaseParamMap = sParams,
                                     phaseParamMap = sParams,
                                     autoCleanup = autoCleanup,
                                     autoCleanup = autoCleanup,
@@ -278,10 +284,6 @@ class BufferedDistancePhasedNode(DistancePhasedNode):
                                     exitPrefix = exitPrefix,
                                     exitPrefix = exitPrefix,
                                     phaseCollideMask = phaseCollideMask,
                                     phaseCollideMask = phaseCollideMask,
                                     fromCollideNode = fromCollideNode)
                                     fromCollideNode = fromCollideNode)
-        self.bufferParamMap = bufferParamMap
-        self.bufferParamList = sorted(bufferParamMap.items(),
-                                      key = lambda x: x[1],
-                                      reverse = True)
 
 
     def __repr__(self):
     def __repr__(self):
         outStr = 'BufferedDistancePhasedNode('
         outStr = 'BufferedDistancePhasedNode('