Преглед изворни кода

this goes with the quieting of the loader errors on island pieces

Asad M. Zaman пре 18 година
родитељ
комит
b25666aedc
2 измењених фајлова са 2 додато и 12 уклоњено
  1. 0 10
      direct/src/actor/Actor.py
  2. 2 2
      direct/src/showbase/Loader.py

+ 0 - 10
direct/src/actor/Actor.py

@@ -569,16 +569,6 @@ class Actor(DirectObject, NodePath):
         sortedKeys.sort()
         index = sortedKeys.index(lodName)
         self.__LODNode.node().forceSwitch(index)
-##         self.resetLOD()
-##         # store the data in the switches for later use
-##         sortedKeys = self.switches.keys()
-##         for eachLod in sortedKeys:
-##             index = sortedKeys.index(eachLod)
-##             # set the switches to not display ever
-##             self.__LODNode.node().setSwitch(index, 0, 10000)
-##         # turn the given LOD on 'always'
-##         index = sortedKeys.index(lodName)
-##         self.__LODNode.node().setSwitch(index, 10000, 0)
 
     def printLOD(self):
         sortedKeys = self.switches.keys()

+ 2 - 2
direct/src/showbase/Loader.py

@@ -188,7 +188,7 @@ class Loader(DirectObject):
 
         return self.loadModel(modelPath, noCache = False)
 
-    def loadModelCopy(self, modelPath):
+    def loadModelCopy(self, modelPath, loaderOptions = None):
         """loadModelCopy(self, string)
         Attempt to load a model from modelPool, if not present
         then attempt to load it from disk. Return a nodepath to
@@ -196,7 +196,7 @@ class Loader(DirectObject):
         """
         Loader.notify.debug("loader.loadModelCopy() is deprecated; use loader.loadModel() instead.")
 
-        return self.loadModel(modelPath, noCache = False)
+        return self.loadModel(modelPath, loaderOptions = loaderOptions, noCache = False)
 
     def loadModelNode(self, modelPath):
         """