From ddf501b588c7adabc498bee425bb9343d95c83b5 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 28 Aug 2008 19:24:59 +0000 Subject: [PATCH] loadModelOnce -> loadModel --- direct/src/controls/GravityWalker.py | 2 +- direct/src/controls/PhysicsWalker.py | 4 ++-- direct/src/controls/ShipPilot.py | 2 +- direct/src/controls/ShipPilot2.py | 2 +- direct/src/directbase/TestStart.py | 2 +- direct/src/directbase/ThreeUpStart.py | 2 +- direct/src/directtools/DirectSession.py | 2 +- direct/src/distributed/DistributedCartesianGrid.py | 2 +- direct/src/extensions/SpriteParticleRenderer-extensions.py | 2 +- direct/src/gui/DirectGuiGlobals.py | 2 +- direct/src/gui/OnscreenGeom.py | 2 +- direct/src/gui/OnscreenImage.py | 2 +- direct/src/particles/SpriteParticleRendererExt.py | 4 ++-- direct/src/physics/FallTest.py | 2 +- direct/src/physics/RotationTest.py | 2 +- direct/src/showbase/Loader.py | 6 +++--- direct/src/showbase/ShowBase.py | 2 +- direct/src/tkpanels/ParticlePanel.py | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/direct/src/controls/GravityWalker.py b/direct/src/controls/GravityWalker.py index 4e2794e3ee..941ac75224 100755 --- a/direct/src/controls/GravityWalker.py +++ b/direct/src/controls/GravityWalker.py @@ -86,7 +86,7 @@ class GravityWalker(DirectObject.DirectObject): self.platform2.destroy() del self.platform2 - model = loader.loadModelCopy('phase_9/models/cogHQ/platform1') + model = loader.loadModel('phase_9/models/cogHQ/platform1') fakeId = id(self) self.platform = MovingPlatform.MovingPlatform() self.platform.setupCopyModel(fakeId, model, 'platformcollision') diff --git a/direct/src/controls/PhysicsWalker.py b/direct/src/controls/PhysicsWalker.py index d6563affe6..dae64252fc 100755 --- a/direct/src/controls/PhysicsWalker.py +++ b/direct/src/controls/PhysicsWalker.py @@ -80,7 +80,7 @@ class PhysicsWalker(DirectObject.DirectObject): self.platform.destroy() del self.platform - model = loader.loadModelCopy('phase_9/models/cogHQ/platform1') + model = loader.loadModel('phase_9/models/cogHQ/platform1') fakeId = id(self) self.platform = MovingPlatform.MovingPlatform() self.platform.setupCopyModel(fakeId, model, 'platformcollision') @@ -781,7 +781,7 @@ class PhysicsWalker(DirectObject.DirectObject): if __debug__: def setupAvatarPhysicsIndicator(self): if self.wantDebugIndicator: - indicator=loader.loadModelCopy('phase_5/models/props/dagger') + indicator=loader.loadModel('phase_5/models/props/dagger') #self.walkControls.setAvatarPhysicsIndicator(indicator) def debugPrint(self, message): diff --git a/direct/src/controls/ShipPilot.py b/direct/src/controls/ShipPilot.py index 4839db6563..5d47f93bc0 100755 --- a/direct/src/controls/ShipPilot.py +++ b/direct/src/controls/ShipPilot.py @@ -637,7 +637,7 @@ class ShipPilot(PhysicsWalker): if __debug__: def setupAvatarPhysicsIndicator(self): if self.wantDebugIndicator: - indicator=loader.loadModelCopy('phase_5/models/props/dagger') + indicator=loader.loadModel('phase_5/models/props/dagger') #self.walkControls.setAvatarPhysicsIndicator(indicator) def debugPrint(self, message): diff --git a/direct/src/controls/ShipPilot2.py b/direct/src/controls/ShipPilot2.py index e294a8304b..215d2bf418 100755 --- a/direct/src/controls/ShipPilot2.py +++ b/direct/src/controls/ShipPilot2.py @@ -1000,7 +1000,7 @@ class ShipPilot2(PhysicsWalker): if __debug__: def setupAvatarPhysicsIndicator(self): if self.wantDebugIndicator: - indicator=loader.loadModelCopy('phase_5/models/props/dagger') + indicator=loader.loadModel('phase_5/models/props/dagger') #self.walkControls.setAvatarPhysicsIndicator(indicator) def debugPrint(self, message): diff --git a/direct/src/directbase/TestStart.py b/direct/src/directbase/TestStart.py index ab590bef30..7439c691fa 100755 --- a/direct/src/directbase/TestStart.py +++ b/direct/src/directbase/TestStart.py @@ -7,7 +7,7 @@ from direct.showbase import ShowBase ShowBase.ShowBase() # Put an axis in the world: -loader.loadModelCopy("models/misc/xyzAxis").reparentTo(render) +loader.loadModel("models/misc/xyzAxis").reparentTo(render) if 0: # Hack: diff --git a/direct/src/directbase/ThreeUpStart.py b/direct/src/directbase/ThreeUpStart.py index a1aae3fc98..3d1784408f 100644 --- a/direct/src/directbase/ThreeUpStart.py +++ b/direct/src/directbase/ThreeUpStart.py @@ -8,7 +8,7 @@ from direct.showbase import ThreeUpShow ThreeUpShow.ThreeUpShow() # Put an axis in the world: -loader.loadModelCopy("models/misc/xyzAxis").reparentTo(render) +loader.loadModel("models/misc/xyzAxis").reparentTo(render) if 0: # Hack: diff --git a/direct/src/directtools/DirectSession.py b/direct/src/directtools/DirectSession.py index 8239b0c1db..c857af4b7e 100644 --- a/direct/src/directtools/DirectSession.py +++ b/direct/src/directtools/DirectSession.py @@ -284,7 +284,7 @@ class DirectSession(DirectObject): self.oobeCamera = hidden.attachNewNode('oobeCamera') - self.oobeVis = loader.loadModelOnce('models/misc/camera') + self.oobeVis = loader.loadModel('models/misc/camera') if self.oobeVis: self.oobeVis.node().setFinal(1) diff --git a/direct/src/distributed/DistributedCartesianGrid.py b/direct/src/distributed/DistributedCartesianGrid.py index e97705eafa..8d0eaa133f 100755 --- a/direct/src/distributed/DistributedCartesianGrid.py +++ b/direct/src/distributed/DistributedCartesianGrid.py @@ -392,7 +392,7 @@ class DistributedCartesianGrid(DistributedNode, CartesianGridBase): dx = self.cellWidth * self.gridSize * .5 for i in range(self.gridSize): for j in range(self.gridSize): - marker = loader.loadModelCopy("models/misc/smiley") + marker = loader.loadModel("models/misc/smiley") marker.reparentTo(self.markerParent) marker.setPos(i * self.cellWidth - dx, j * self.cellWidth - dx, diff --git a/direct/src/extensions/SpriteParticleRenderer-extensions.py b/direct/src/extensions/SpriteParticleRenderer-extensions.py index 1f1e08e33c..6ec3986bb7 100644 --- a/direct/src/extensions/SpriteParticleRenderer-extensions.py +++ b/direct/src/extensions/SpriteParticleRenderer-extensions.py @@ -67,7 +67,7 @@ else: self.setSourceNodeName(nodeName) # Load model and get texture - m = loader.loadModelOnce(modelName) + m = loader.loadModel(modelName) if (m == None): print "SpriteParticleRenderer: Couldn't find model: %s!" % modelName return None diff --git a/direct/src/gui/DirectGuiGlobals.py b/direct/src/gui/DirectGuiGlobals.py index d4a42f1e33..91e868ea05 100644 --- a/direct/src/gui/DirectGuiGlobals.py +++ b/direct/src/gui/DirectGuiGlobals.py @@ -136,7 +136,7 @@ def setDefaultFontFunc(newFontFunc): def getDefaultDialogGeom(): global defaultDialogGeom if defaultDialogGeom == None: - defaultDialogGeom = loader.loadModelOnce('models/gui/dialog_box_gui') + defaultDialogGeom = loader.loadModel('models/gui/dialog_box_gui') return defaultDialogGeom def setDefaultDialogGeom(newDialogGeom): diff --git a/direct/src/gui/OnscreenGeom.py b/direct/src/gui/OnscreenGeom.py index 6897f2da01..3c1e4d3c24 100644 --- a/direct/src/gui/OnscreenGeom.py +++ b/direct/src/gui/OnscreenGeom.py @@ -95,7 +95,7 @@ class OnscreenGeom(DirectObject, NodePath): if isinstance(geom, NodePath): self.assign(geom.copyTo(parent, sort)) elif isinstance(geom, types.StringTypes): - self.assign(loader.loadModelCopy(geom)) + self.assign(loader.loadModel(geom)) self.reparentTo(parent, sort) if not self.isEmpty(): diff --git a/direct/src/gui/OnscreenImage.py b/direct/src/gui/OnscreenImage.py index 409deb0832..2f482c164e 100644 --- a/direct/src/gui/OnscreenImage.py +++ b/direct/src/gui/OnscreenImage.py @@ -110,7 +110,7 @@ class OnscreenImage(DirectObject, NodePath): self.setTexture(tex) elif type(image) == type(()): # Assume its a file+node name, extract texture from node - model = loader.loadModelOnce(image[0]) + model = loader.loadModel(image[0]) if model: node = model.find(image[1]) if node: diff --git a/direct/src/particles/SpriteParticleRendererExt.py b/direct/src/particles/SpriteParticleRendererExt.py index 324793368a..6f8cbe5820 100644 --- a/direct/src/particles/SpriteParticleRendererExt.py +++ b/direct/src/particles/SpriteParticleRendererExt.py @@ -84,7 +84,7 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): nodeName = self.getSourceNodeName() # Load model and get texture - m = loader.loadModelOnce(modelName) + m = loader.loadModel(modelName) if (m == None): print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName return False @@ -111,7 +111,7 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): nodeName = self.getSourceNodeName() # Load model and get texture - m = loader.loadModelOnce(modelName) + m = loader.loadModel(modelName) if (m == None): print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName return False diff --git a/direct/src/physics/FallTest.py b/direct/src/physics/FallTest.py index ea000ea3ab..a99b9cd182 100644 --- a/direct/src/physics/FallTest.py +++ b/direct/src/physics/FallTest.py @@ -13,7 +13,7 @@ class FallTest(NodePath): #self.setPos(avatarNodePath, Vec3(0)) #self.setHpr(avatarNodePath, Vec3(0)) - avatarNodePath=loader.loadModelCopy("models/misc/smiley") + avatarNodePath=loader.loadModel("models/misc/smiley") assert not avatarNodePath.isEmpty() camLL=render.find("**/camLL") diff --git a/direct/src/physics/RotationTest.py b/direct/src/physics/RotationTest.py index 9abeacd40f..fa852999c2 100644 --- a/direct/src/physics/RotationTest.py +++ b/direct/src/physics/RotationTest.py @@ -13,7 +13,7 @@ class RotationTest(NodePath): #self.setPos(avatarNodePath, Vec3(0)) #self.setHpr(avatarNodePath, Vec3(0)) - avatarNodePath=loader.loadModelCopy("models/misc/smiley") + avatarNodePath=loader.loadModel("models/misc/smiley") assert not avatarNodePath.isEmpty() camLL=render.find("**/camLL") diff --git a/direct/src/showbase/Loader.py b/direct/src/showbase/Loader.py index e96f3a9a5e..7437f286c8 100644 --- a/direct/src/showbase/Loader.py +++ b/direct/src/showbase/Loader.py @@ -185,7 +185,7 @@ class Loader(DirectObject): then attempt to load it from disk. Return a nodepath to the model if successful or None otherwise """ - Loader.notify.debug("loader.loadModelOnce() is deprecated; use loader.loadModel() instead.") + Loader.notify.info("loader.loadModel() is deprecated; use loader.loadModel() instead.") return self.loadModel(modelPath, noCache = False) @@ -195,7 +195,7 @@ class Loader(DirectObject): then attempt to load it from disk. Return a nodepath to a copy of the model if successful or None otherwise """ - Loader.notify.debug("loader.loadModelCopy() is deprecated; use loader.loadModel() instead.") + Loader.notify.info("loader.loadModel() is deprecated; use loader.loadModel() instead.") return self.loadModel(modelPath, loaderOptions = loaderOptions, noCache = False) @@ -213,7 +213,7 @@ class Loader(DirectObject): However, if you're loading a font, see loadFont(), below. """ - Loader.notify.debug("loader.loadModelNode() is deprecated; use loader.loadModel() instead.") + Loader.notify.info("loader.loadModelNode() is deprecated; use loader.loadModel() instead.") model = self.loadModel(modelPath, noCache = False) if model is not None: diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py index 0daf2532ae..28567d8afd 100644 --- a/direct/src/showbase/ShowBase.py +++ b/direct/src/showbase/ShowBase.py @@ -1790,7 +1790,7 @@ class ShowBase(DirectObject.DirectObject): self.oobe2cam = self.oobeTrackball.attachNewNode(Transform2SG('oobe2cam')) self.oobe2cam.node().setNode(self.oobeCameraTrackball.node()) - self.oobeVis = loader.loadModelOnce('models/misc/camera') + self.oobeVis = loader.loadModel('models/misc/camera') if self.oobeVis: self.oobeVis.node().setFinal(1) self.oobeCullFrustum = None diff --git a/direct/src/tkpanels/ParticlePanel.py b/direct/src/tkpanels/ParticlePanel.py index ed328490c6..e4ccc40aa7 100644 --- a/direct/src/tkpanels/ParticlePanel.py +++ b/direct/src/tkpanels/ParticlePanel.py @@ -2426,7 +2426,7 @@ class ParticlePanel(AppShell): self.widgetDict['Sprite Renderer-'+animName+' Anim Node'] = entry def checkForNode(modelStrVar=mStrVar, nodeStrVar=nStrVar): - mod = loader.loadModelCopy(modelStrVar.get()) + mod = loader.loadModel(modelStrVar.get()) if mod: node = mod.find(nodeStrVar.get()) if node: