From 45b179b75bec34ccc48dce299e738777887d3707 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 14 Mar 2009 17:05:06 +0000 Subject: [PATCH] Fixed deprecated calls --- doc/SceneEditor/dataHolder.py | 6 +++--- doc/SceneEditor/seCameraControl.py | 2 +- doc/SceneEditor/seFileSaver.py | 2 +- doc/SceneEditor/seGrid.py | 2 +- doc/SceneEditor/seLights.py | 10 +++++----- doc/SceneEditor/seMopathRecorder.py | 2 +- doc/SceneEditor/seSceneGraphExplorer.py | 2 +- doc/SceneEditor/seSelection.py | 4 ++-- doc/SceneEditor/seSession.py | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/SceneEditor/dataHolder.py b/doc/SceneEditor/dataHolder.py index 5378b129d3..b591cd52e8 100644 --- a/doc/SceneEditor/dataHolder.py +++ b/doc/SceneEditor/dataHolder.py @@ -166,7 +166,7 @@ class dataHolder: name = nodePath.getName() ## Check if there is any child node, if so, remove it. - childrenList = nodePath.getChildrenAsList() + childrenList = nodePath.getChildren() if self.ModelDic.has_key(name): @@ -258,7 +258,7 @@ class dataHolder: newName = name+'_copy_%d'%i while self.isInScene(newName): newName = newName + '_1' - holder[newName] = loader.loadModelCopy(FilePath.getFullpath()) + holder[newName] = loader.loadModel(FilePath.getFullpath()) holderRef[newName] = FilePath self.ModelNum += 1 holder[newName].reparentTo(parent) @@ -713,7 +713,7 @@ class dataHolder: number = len(self.dummyDict) number += 1 name = 'Dummy%d'%number - self.dummyModel = loader.loadModelCopy( "models/misc/sphere" ) + self.dummyModel = loader.loadModel( "models/misc/sphere" ) self.dummyModel.reparentTo(nodePath) while self.isInScene(name): name = name + '_1' diff --git a/doc/SceneEditor/seCameraControl.py b/doc/SceneEditor/seCameraControl.py index b07c500091..1842837c6f 100644 --- a/doc/SceneEditor/seCameraControl.py +++ b/doc/SceneEditor/seCameraControl.py @@ -310,7 +310,7 @@ class DirectCameraControl(DirectObject): self.cqEntries = self.cqEntries[1:] + self.cqEntries[:1] # Filter out object's under camera nodePath = entry.getIntoNodePath() - if SEditor.camera not in nodePath.getAncestry(): + if SEditor.camera not in nodePath.getAncestors(): # Compute new hit point hitPt = entry.getSurfacePoint(entry.getFromNodePath()) # Move coa marker to new point diff --git a/doc/SceneEditor/seFileSaver.py b/doc/SceneEditor/seFileSaver.py index bdf2931c6a..2c817a46d4 100644 --- a/doc/SceneEditor/seFileSaver.py +++ b/doc/SceneEditor/seFileSaver.py @@ -250,7 +250,7 @@ class FileSaver: dummyS=str(dummy) if(1): # This is kept for now... perhaps later some sort of check might have to be enforced based on loadMode - out_file.write(i2+ "self."+ dummyS + "=loader.loadModelCopy(\"models/misc/sphere\")\n") + out_file.write(i2+ "self."+ dummyS + "=loader.loadModel(\"models/misc/sphere\")\n") #Transformation Code out_file.write(i2+"# Transforming the Dummy\n") out_file.write(i2+ "self."+ dummyS + ".setPosHprScale(%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f,%.3f)\n"% (AllScene.dummyDict[dummy].getX(),AllScene.dummyDict[dummy].getY(),AllScene.dummyDict[dummy].getZ(),AllScene.dummyDict[dummy].getH(),AllScene.dummyDict[dummy].getP(),AllScene.dummyDict[dummy].getR(),AllScene.dummyDict[dummy].getSx(),AllScene.dummyDict[dummy].getSy(),AllScene.dummyDict[dummy].getSz())) diff --git a/doc/SceneEditor/seGrid.py b/doc/SceneEditor/seGrid.py index 10107a5732..559bdf6cb1 100644 --- a/doc/SceneEditor/seGrid.py +++ b/doc/SceneEditor/seGrid.py @@ -88,7 +88,7 @@ class DirectGrid(NodePath,DirectObject): self.centerLines.reset() # Now redraw lines - numLines = math.ceil(self.gridSize/self.gridSpacing) + numLines = int(math.ceil(self.gridSize/self.gridSpacing)) scaledSize = numLines * self.gridSpacing center = self.centerLines diff --git a/doc/SceneEditor/seLights.py b/doc/SceneEditor/seLights.py index 0f26ff4419..59d7b1dc72 100644 --- a/doc/SceneEditor/seLights.py +++ b/doc/SceneEditor/seLights.py @@ -81,13 +81,13 @@ class seLight(NodePath): self.assign(self.LightNode) if(self.type=='spot'): - self.helpModel = loader.loadModelCopy( "models/misc/Spotlight" ) + self.helpModel = loader.loadModel( "models/misc/Spotlight" ) elif(self.type=='point'): - self.helpModel = loader.loadModelCopy( "models/misc/Pointlight" ) + self.helpModel = loader.loadModel( "models/misc/Pointlight" ) elif(self.type=='directional'): - self.helpModel = loader.loadModelCopy( "models/misc/Dirlight" ) + self.helpModel = loader.loadModel( "models/misc/Dirlight" ) else: - self.helpModel = loader.loadModelCopy( "models/misc/sphere" ) + self.helpModel = loader.loadModel( "models/misc/sphere" ) self.helpModel.setColor(self.lightcolor) self.helpModel.reparentTo(self) DirectUtil.useDirectRenderStyle(self.helpModel) @@ -304,7 +304,7 @@ class seLightManager(NodePath): # Originally, we don't do this load model thing. # But the problem is, if we don't, then it will cause some # Bounding calculation error... - self.helpModel = loader.loadModelCopy( "models/misc/sphere" ) + self.helpModel = loader.loadModel( "models/misc/sphere" ) self.helpModel.reparentTo(self) self.helpModel.hide() diff --git a/doc/SceneEditor/seMopathRecorder.py b/doc/SceneEditor/seMopathRecorder.py index 9346e44590..1816bb3168 100644 --- a/doc/SceneEditor/seMopathRecorder.py +++ b/doc/SceneEditor/seMopathRecorder.py @@ -700,7 +700,7 @@ class MopathRecorder(AppShell, DirectObject): def getChildIds(self, nodePath): ids = [nodePath.id()] - kids = nodePath.getChildrenAsList() + kids = nodePath.getChildren() for kid in kids: ids += self.getChildIds(kid) return ids diff --git a/doc/SceneEditor/seSceneGraphExplorer.py b/doc/SceneEditor/seSceneGraphExplorer.py index d1e475ef43..337d16c651 100644 --- a/doc/SceneEditor/seSceneGraphExplorer.py +++ b/doc/SceneEditor/seSceneGraphExplorer.py @@ -185,7 +185,7 @@ class SceneGraphExplorerItem(TreeItem): def GetSubList(self): sublist = [] - for nodePath in self.nodePath.getChildrenAsList(): + for nodePath in self.nodePath.getChildren(): item = SceneGraphExplorerItem(nodePath) sublist.append(item) return sublist diff --git a/doc/SceneEditor/seSelection.py b/doc/SceneEditor/seSelection.py index acf2697747..1e9811f390 100644 --- a/doc/SceneEditor/seSelection.py +++ b/doc/SceneEditor/seSelection.py @@ -350,7 +350,7 @@ class DirectBoundingBox: # Get a node path's bounds nodeBounds = BoundingSphere() nodeBounds.extendBy(self.nodePath.node().getInternalBound()) - for child in self.nodePath.getChildrenAsList(): + for child in self.nodePath.getChildren(): nodeBounds.extendBy(child.getBounds()) return nodeBounds.makeCopy() @@ -514,7 +514,7 @@ class SelectionQueue(CollisionHandlerQueue): # Skip, if backfacing poly pass elif ((skipFlags & SKIP_CAMERA) and - (camera in nodePath.getAncestry())): + (camera in nodePath.getAncestors())): # Skip if parented to a camera. pass # Can pick unpickable, use the first visible node diff --git a/doc/SceneEditor/seSession.py b/doc/SceneEditor/seSession.py index a2357d992a..7fb9325098 100644 --- a/doc/SceneEditor/seSession.py +++ b/doc/SceneEditor/seSession.py @@ -388,7 +388,7 @@ class SeSession(DirectObject): ### Customized DirectSession messenger.send('DIRECT_preSelectNodePath', [dnp]) if fResetAncestry: # Update ancestry - self.ancestry = dnp.getAncestry() + self.ancestry = dnp.getAncestors() self.ancestry.reverse() self.ancestryIndex = 0 # Update the selectedNPReadout