TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

loadModelOnce -> loadModel

Browse Source
This commit is contained in:
David Rose 2008-08-28 19:24:59 +00:00
parent b98db4a8d8
commit ddf501b588
18 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/controls/GravityWalker.py
View File

@ -86,7 +86,7 @@ class GravityWalker(DirectObject.DirectObject):
self.platform2.destroy() self.platform2.destroy()
del self.platform2 del self.platform2
model = loader.loadModelCopy('phase_9/models/cogHQ/platform1') model = loader.loadModel('phase_9/models/cogHQ/platform1')
fakeId = id(self) fakeId = id(self)
self.platform = MovingPlatform.MovingPlatform() self.platform = MovingPlatform.MovingPlatform()
self.platform.setupCopyModel(fakeId, model, 'platformcollision') self.platform.setupCopyModel(fakeId, model, 'platformcollision')

4
direct/src/controls/PhysicsWalker.py
View File

@ -80,7 +80,7 @@ class PhysicsWalker(DirectObject.DirectObject):
self.platform.destroy() self.platform.destroy()
del self.platform del self.platform
model = loader.loadModelCopy('phase_9/models/cogHQ/platform1') model = loader.loadModel('phase_9/models/cogHQ/platform1')
fakeId = id(self) fakeId = id(self)
self.platform = MovingPlatform.MovingPlatform() self.platform = MovingPlatform.MovingPlatform()
self.platform.setupCopyModel(fakeId, model, 'platformcollision') self.platform.setupCopyModel(fakeId, model, 'platformcollision')
@ -781,7 +781,7 @@ class PhysicsWalker(DirectObject.DirectObject):
if __debug__: if __debug__:
def setupAvatarPhysicsIndicator(self): def setupAvatarPhysicsIndicator(self):
if self.wantDebugIndicator: if self.wantDebugIndicator:
indicator=loader.loadModelCopy('phase_5/models/props/dagger') indicator=loader.loadModel('phase_5/models/props/dagger')
#self.walkControls.setAvatarPhysicsIndicator(indicator) #self.walkControls.setAvatarPhysicsIndicator(indicator)
def debugPrint(self, message): def debugPrint(self, message):

2
direct/src/controls/ShipPilot.py
View File

@ -637,7 +637,7 @@ class ShipPilot(PhysicsWalker):
if __debug__: if __debug__:
def setupAvatarPhysicsIndicator(self): def setupAvatarPhysicsIndicator(self):
if self.wantDebugIndicator: if self.wantDebugIndicator:
indicator=loader.loadModelCopy('phase_5/models/props/dagger') indicator=loader.loadModel('phase_5/models/props/dagger')
#self.walkControls.setAvatarPhysicsIndicator(indicator) #self.walkControls.setAvatarPhysicsIndicator(indicator)
def debugPrint(self, message): def debugPrint(self, message):

2
direct/src/controls/ShipPilot2.py
View File

@ -1000,7 +1000,7 @@ class ShipPilot2(PhysicsWalker):
if __debug__: if __debug__:
def setupAvatarPhysicsIndicator(self): def setupAvatarPhysicsIndicator(self):
if self.wantDebugIndicator: if self.wantDebugIndicator:
indicator=loader.loadModelCopy('phase_5/models/props/dagger') indicator=loader.loadModel('phase_5/models/props/dagger')
#self.walkControls.setAvatarPhysicsIndicator(indicator) #self.walkControls.setAvatarPhysicsIndicator(indicator)
def debugPrint(self, message): def debugPrint(self, message):

2
direct/src/directbase/TestStart.py
View File

@ -7,7 +7,7 @@ from direct.showbase import ShowBase
ShowBase.ShowBase() ShowBase.ShowBase()
# Put an axis in the world: # Put an axis in the world:
loader.loadModelCopy("models/misc/xyzAxis").reparentTo(render) loader.loadModel("models/misc/xyzAxis").reparentTo(render)
if 0: if 0:
# Hack: # Hack:

2
direct/src/directbase/ThreeUpStart.py
View File

@ -8,7 +8,7 @@ from direct.showbase import ThreeUpShow
ThreeUpShow.ThreeUpShow() ThreeUpShow.ThreeUpShow()
# Put an axis in the world: # Put an axis in the world:
loader.loadModelCopy("models/misc/xyzAxis").reparentTo(render) loader.loadModel("models/misc/xyzAxis").reparentTo(render)
if 0: if 0:
# Hack: # Hack:

2
direct/src/directtools/DirectSession.py
View File

@ -284,7 +284,7 @@ class DirectSession(DirectObject):
self.oobeCamera = hidden.attachNewNode('oobeCamera') self.oobeCamera = hidden.attachNewNode('oobeCamera')
self.oobeVis = loader.loadModelOnce('models/misc/camera') self.oobeVis = loader.loadModel('models/misc/camera')
if self.oobeVis: if self.oobeVis:
self.oobeVis.node().setFinal(1) self.oobeVis.node().setFinal(1)

2
direct/src/distributed/DistributedCartesianGrid.py
View File

@ -392,7 +392,7 @@ class DistributedCartesianGrid(DistributedNode, CartesianGridBase):
dx = self.cellWidth * self.gridSize * .5 dx = self.cellWidth * self.gridSize * .5
for i in range(self.gridSize): for i in range(self.gridSize):
for j 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.reparentTo(self.markerParent)
marker.setPos(i * self.cellWidth - dx, marker.setPos(i * self.cellWidth - dx,
j * self.cellWidth - dx, j * self.cellWidth - dx,

2
direct/src/extensions/SpriteParticleRenderer-extensions.py
View File

@ -67,7 +67,7 @@
else: else:
self.setSourceNodeName(nodeName) self.setSourceNodeName(nodeName)
# Load model and get texture # Load model and get texture
m = loader.loadModelOnce(modelName) m = loader.loadModel(modelName)
if (m == None): if (m == None):
print "SpriteParticleRenderer: Couldn't find model: %s!" % modelName print "SpriteParticleRenderer: Couldn't find model: %s!" % modelName
return None return None

2
direct/src/gui/DirectGuiGlobals.py
View File

@ -136,7 +136,7 @@ def setDefaultFontFunc(newFontFunc):
def getDefaultDialogGeom(): def getDefaultDialogGeom():
global defaultDialogGeom global defaultDialogGeom
if defaultDialogGeom == None: if defaultDialogGeom == None:
defaultDialogGeom = loader.loadModelOnce('models/gui/dialog_box_gui') defaultDialogGeom = loader.loadModel('models/gui/dialog_box_gui')
return defaultDialogGeom return defaultDialogGeom
def setDefaultDialogGeom(newDialogGeom): def setDefaultDialogGeom(newDialogGeom):

2
direct/src/gui/OnscreenGeom.py
View File

@ -95,7 +95,7 @@ class OnscreenGeom(DirectObject, NodePath):
if isinstance(geom, NodePath): if isinstance(geom, NodePath):
self.assign(geom.copyTo(parent, sort)) self.assign(geom.copyTo(parent, sort))
elif isinstance(geom, types.StringTypes): elif isinstance(geom, types.StringTypes):
self.assign(loader.loadModelCopy(geom)) self.assign(loader.loadModel(geom))
self.reparentTo(parent, sort) self.reparentTo(parent, sort)
if not self.isEmpty(): if not self.isEmpty():

2
direct/src/gui/OnscreenImage.py
View File

@ -110,7 +110,7 @@ class OnscreenImage(DirectObject, NodePath):
self.setTexture(tex) self.setTexture(tex)
elif type(image) == type(()): elif type(image) == type(()):
# Assume its a file+node name, extract texture from node # Assume its a file+node name, extract texture from node
model = loader.loadModelOnce(image[0]) model = loader.loadModel(image[0])
if model: if model:
node = model.find(image[1]) node = model.find(image[1])
if node: if node:

4
direct/src/particles/SpriteParticleRendererExt.py
View File

@ -84,7 +84,7 @@ class SpriteParticleRendererExt(SpriteParticleRenderer):
nodeName = self.getSourceNodeName() nodeName = self.getSourceNodeName()
# Load model and get texture # Load model and get texture
m = loader.loadModelOnce(modelName) m = loader.loadModel(modelName)
if (m == None): if (m == None):
print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName
return False return False
@ -111,7 +111,7 @@ class SpriteParticleRendererExt(SpriteParticleRenderer):
nodeName = self.getSourceNodeName() nodeName = self.getSourceNodeName()
# Load model and get texture # Load model and get texture
m = loader.loadModelOnce(modelName) m = loader.loadModel(modelName)
if (m == None): if (m == None):
print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName print "SpriteParticleRendererExt: Couldn't find model: %s!" % modelName
return False return False

2
direct/src/physics/FallTest.py
View File

@ -13,7 +13,7 @@ class FallTest(NodePath):
#self.setPos(avatarNodePath, Vec3(0)) #self.setPos(avatarNodePath, Vec3(0))
#self.setHpr(avatarNodePath, Vec3(0)) #self.setHpr(avatarNodePath, Vec3(0))
avatarNodePath=loader.loadModelCopy("models/misc/smiley") avatarNodePath=loader.loadModel("models/misc/smiley")
assert not avatarNodePath.isEmpty() assert not avatarNodePath.isEmpty()
camLL=render.find("**/camLL") camLL=render.find("**/camLL")

2
direct/src/physics/RotationTest.py
View File

@ -13,7 +13,7 @@ class RotationTest(NodePath):
#self.setPos(avatarNodePath, Vec3(0)) #self.setPos(avatarNodePath, Vec3(0))
#self.setHpr(avatarNodePath, Vec3(0)) #self.setHpr(avatarNodePath, Vec3(0))
avatarNodePath=loader.loadModelCopy("models/misc/smiley") avatarNodePath=loader.loadModel("models/misc/smiley")
assert not avatarNodePath.isEmpty() assert not avatarNodePath.isEmpty()
camLL=render.find("**/camLL") camLL=render.find("**/camLL")

6
direct/src/showbase/Loader.py
View File

@ -185,7 +185,7 @@ class Loader(DirectObject):
then attempt to load it from disk. Return a nodepath to then attempt to load it from disk. Return a nodepath to
the model if successful or None otherwise 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) return self.loadModel(modelPath, noCache = False)
@ -195,7 +195,7 @@ class Loader(DirectObject):
then attempt to load it from disk. Return a nodepath to then attempt to load it from disk. Return a nodepath to
a copy of the model if successful or None otherwise 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) 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. 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) model = self.loadModel(modelPath, noCache = False)
if model is not None: if model is not None:

2
direct/src/showbase/ShowBase.py
View File

@ -1790,7 +1790,7 @@ class ShowBase(DirectObject.DirectObject):
self.oobe2cam = self.oobeTrackball.attachNewNode(Transform2SG('oobe2cam')) self.oobe2cam = self.oobeTrackball.attachNewNode(Transform2SG('oobe2cam'))
self.oobe2cam.node().setNode(self.oobeCameraTrackball.node()) self.oobe2cam.node().setNode(self.oobeCameraTrackball.node())
self.oobeVis = loader.loadModelOnce('models/misc/camera') self.oobeVis = loader.loadModel('models/misc/camera')
if self.oobeVis: if self.oobeVis:
self.oobeVis.node().setFinal(1) self.oobeVis.node().setFinal(1)
self.oobeCullFrustum = None self.oobeCullFrustum = None

2
direct/src/tkpanels/ParticlePanel.py
View File

@ -2426,7 +2426,7 @@ class ParticlePanel(AppShell):
self.widgetDict['Sprite Renderer-'+animName+' Anim Node'] = entry self.widgetDict['Sprite Renderer-'+animName+' Anim Node'] = entry
def checkForNode(modelStrVar=mStrVar, nodeStrVar=nStrVar): def checkForNode(modelStrVar=mStrVar, nodeStrVar=nStrVar):
mod = loader.loadModelCopy(modelStrVar.get()) mod = loader.loadModel(modelStrVar.get())
if mod: if mod:
node = mod.find(nodeStrVar.get()) node = mod.find(nodeStrVar.get())
if node: if node: