From b25666aedceb3e57077ad4deb53d46cc8b282190 Mon Sep 17 00:00:00 2001 From: "Asad M. Zaman" Date: Tue, 1 May 2007 02:07:46 +0000 Subject: [PATCH] this goes with the quieting of the loader errors on island pieces --- direct/src/actor/Actor.py | 10 ---------- direct/src/showbase/Loader.py | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py index 9cb3dbe1a3..fe44e1f6fb 100644 --- a/direct/src/actor/Actor.py +++ b/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() diff --git a/direct/src/showbase/Loader.py b/direct/src/showbase/Loader.py index e8fb7cb78b..3690cb913c 100644 --- a/direct/src/showbase/Loader.py +++ b/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): """