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

tabs to spaces

Browse Source
This commit is contained in:
Dave Schuyler 2006-01-27 19:47:08 +00:00
parent 3bb5bb8332
commit 538885d1d7
3 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
doc/SceneEditor/sceneEditor.py
View File

@ -210,7 +210,7 @@ class myLevelEditor(AppShell):
['SEditor-ToggleBackface',self.toggleBackface], ['SEditor-ToggleBackface',self.toggleBackface],
['SEditor-ToggleTexture',self.toggleTexture], ['SEditor-ToggleTexture',self.toggleTexture],
['SEditor-ToggleWireframe',self.toggleWireframe], ['SEditor-ToggleWireframe',self.toggleWireframe],
['ParticlePanel_Added_Effect',self.addParticleEffect], ['ParticlePanel_Added_Effect',self.addParticleEffect],
['f11',self.loadFromBam], ['f11',self.loadFromBam],
['f12',self.saveAsBam], ['f12',self.saveAsBam],
] ]
@ -219,7 +219,7 @@ class myLevelEditor(AppShell):
################################# #################################
### Collision detection ### Collision detection
################################# #################################
self.cTrav = CollisionTraverser() self.cTrav = CollisionTraverser()
base.cTrav = self.cTrav base.cTrav = self.cTrav
for event in self.dataFlowEvents: for event in self.dataFlowEvents:
@ -233,7 +233,7 @@ class myLevelEditor(AppShell):
['SGE_Remove', self.remove], ['SGE_Remove', self.remove],
['SGE_Add Dummy', self.addDummyNode], ['SGE_Add Dummy', self.addDummyNode],
['SGE_Add Collision Object', self.addCollisionObj], ['SGE_Add Collision Object', self.addCollisionObj],
['SGE_Metadata', self.openMetadataPanel], ['SGE_Metadata', self.openMetadataPanel],
['SGE_Set as Reparent Target', self.setAsReparentTarget], ['SGE_Set as Reparent Target', self.setAsReparentTarget],
['SGE_Reparent to Target', self.reparentToNode], ['SGE_Reparent to Target', self.reparentToNode],
['SGE_Animation Panel', self.openAnimPanel], ['SGE_Animation Panel', self.openAnimPanel],
@ -265,17 +265,17 @@ class myLevelEditor(AppShell):
### Create SceneEditor Ver. DirectSession ### Create SceneEditor Ver. DirectSession
self.seSession = SeSession() self.seSession = SeSession()
self.seSession.enable() self.seSession.enable()
SEditor.camera.setPos(0,-50,10) SEditor.camera.setPos(0,-50,10)
self.placer=None self.placer=None
self.MopathPanel = None self.MopathPanel = None
self.alignPanelDict = {} self.alignPanelDict = {}
#self.quadview=QuadView() #self.quadview=QuadView()
self.lightingPanel = None self.lightingPanel = None
self.controllerPanel = None self.controllerPanel = None
self.particlePanel = None self.particlePanel = None
### Create Side Window ### Create Side Window
self.sideWindow = sideWindow(worldColor = self.worldColor, self.sideWindow = sideWindow(worldColor = self.worldColor,
@ -308,7 +308,7 @@ class myLevelEditor(AppShell):
### Creating the Buttons in the window frame ### Creating the Buttons in the window frame
####################################################### #######################################################
buttonFrame = Frame(interior) buttonFrame = Frame(interior)
self.image=[] self.image=[]
self.image.append(self.getPhotoImage('models/icons/new.gif'))#0 self.image.append(self.getPhotoImage('models/icons/new.gif'))#0
self.image.append(self.getPhotoImage('models/icons/open.gif'))#1 self.image.append(self.getPhotoImage('models/icons/open.gif'))#1
@ -330,9 +330,9 @@ class myLevelEditor(AppShell):
self.image.append(self.getPhotoImage('models/icons/blank.gif')) self.image.append(self.getPhotoImage('models/icons/blank.gif'))
self.image.append(self.getPhotoImage('models/icons/blank.gif')) self.image.append(self.getPhotoImage('models/icons/blank.gif'))
self.image.append(self.getPhotoImage('models/icons/blank.gif')) self.image.append(self.getPhotoImage('models/icons/blank.gif'))
self.image.append(self.getPhotoImage('models/icons/blank.gif')) self.image.append(self.getPhotoImage('models/icons/blank.gif'))
self.image.append(self.getPhotoImage('models/icons/blank.gif')) self.image.append(self.getPhotoImage('models/icons/blank.gif'))
self.image.append(self.getPhotoImage('models/icons/blank.gif')) self.image.append(self.getPhotoImage('models/icons/blank.gif'))
i = 0 i = 0
for element in self.image: for element in self.image:
@ -354,8 +354,8 @@ class myLevelEditor(AppShell):
#### Change here to process the button event further. #### Change here to process the button event further.
#### ####
if buttonIndex==1: # New Scene if buttonIndex==1: # New Scene
self.newScene() self.newScene()
return return
elif buttonIndex==2: # Open Scene elif buttonIndex==2: # Open Scene
self.openScene() self.openScene()
return return
@ -372,13 +372,13 @@ class myLevelEditor(AppShell):
self.openPlacerPanel() self.openPlacerPanel()
return return
elif buttonIndex==7: # Open Mopath Panel elif buttonIndex==7: # Open Mopath Panel
self.openMoPathPanel() self.openMoPathPanel()
return return
elif buttonIndex==8: # Open Lighting Panel elif buttonIndex==8: # Open Lighting Panel
self.openLightingPanel() self.openLightingPanel()
return return
elif buttonIndex==9: # Open Particle Panel elif buttonIndex==9: # Open Particle Panel
self.openParticlePanel() self.openParticlePanel()
return return
elif buttonIndex==10: elif buttonIndex==10:
self.openInputPanel() self.openInputPanel()
@ -585,7 +585,7 @@ class myLevelEditor(AppShell):
## Processing message events ## Processing message events
def makeDirty(self): def makeDirty(self):
self.Dirty=1 self.Dirty=1
def removeLight(self, lightNode): def removeLight(self, lightNode):
################################################################# #################################################################
@ -642,7 +642,7 @@ class myLevelEditor(AppShell):
list, lightNode = AllScene.createLight(type = type) list, lightNode = AllScene.createLight(type = type)
if self.lightingPanel != None: if self.lightingPanel != None:
self.lightingPanel.updateList(list,lightNode) self.lightingPanel.updateList(list,lightNode)
self.makeDirty() self.makeDirty()
return return
def lightingPanelClose(self): def lightingPanelClose(self):
@ -677,9 +677,9 @@ class myLevelEditor(AppShell):
return return
def openMetadataPanel(self,nodePath=None): def openMetadataPanel(self,nodePath=None):
print nodePath print nodePath
self.MetadataPanel=MetadataPanel(nodePath) self.MetadataPanel=MetadataPanel(nodePath)
pass pass
def duplicate(self, nodePath = None): def duplicate(self, nodePath = None):
################################################################# #################################################################
@ -721,7 +721,7 @@ class myLevelEditor(AppShell):
# #
################################################################# #################################################################
AllScene.addDummyNode(nodepath) AllScene.addDummyNode(nodepath)
self.makeDirty() self.makeDirty()
pass pass
def addCollisionObj(self, nodepath = None): def addCollisionObj(self, nodepath = None):
@ -835,63 +835,63 @@ class myLevelEditor(AppShell):
# and will reset the application title to "New Scene" # and will reset the application title to "New Scene"
################################################################# #################################################################
self.closeAllSubWindows() ## Close all sub window self.closeAllSubWindows() ## Close all sub window
if(self.CurrentFileName): if(self.CurrentFileName):
currentF=Filename(self.CurrentFileName) currentF=Filename(self.CurrentFileName)
self.CurrentFileName=None self.CurrentFileName=None
AllScene.resetAll() AllScene.resetAll()
currentModName=currentF.getBasenameWoExtension() currentModName=currentF.getBasenameWoExtension()
# Let us actually remove the scene from sys modules... this is done because every scene is loaded as a module # Let us actually remove the scene from sys modules... this is done because every scene is loaded as a module
# And if we reload a scene python wont reload since its already in sys.modules... and hence we delete it # And if we reload a scene python wont reload since its already in sys.modules... and hence we delete it
# If there is ever a garbage colleciton bug..this might be a point to look at # If there is ever a garbage colleciton bug..this might be a point to look at
if sys.modules.has_key(currentModName): if sys.modules.has_key(currentModName):
del sys.modules[currentModName] del sys.modules[currentModName]
print sys.getrefcount(AllScene.theScene) print sys.getrefcount(AllScene.theScene)
del AllScene.theScene del AllScene.theScene
else: else:
AllScene.resetAll() AllScene.resetAll()
self.parent.title('Scene Editor - New Scene') self.parent.title('Scene Editor - New Scene')
pass pass
def openScene(self): def openScene(self):
################################################################# #################################################################
# openScene(self) # openScene(self)
################################################################# #################################################################
# In the future try and provide merging of two scenes # In the future try and provide merging of two scenes
if(self.CurrentFileName or self.Dirty): if(self.CurrentFileName or self.Dirty):
saveScene = tkMessageBox._show("Load scene","Save the current scene?",icon = tkMessageBox.QUESTION,type = tkMessageBox.YESNOCANCEL) saveScene = tkMessageBox._show("Load scene","Save the current scene?",icon = tkMessageBox.QUESTION,type = tkMessageBox.YESNOCANCEL)
if (saveScene == "yes"): if (saveScene == "yes"):
self.saveScene() self.saveScene()
elif (saveScene == "cancel"): elif (saveScene == "cancel"):
return return
self.closeAllSubWindows() ## Close all sub window self.closeAllSubWindows() ## Close all sub window
if(self.CurrentFileName): if(self.CurrentFileName):
currentF=Filename(self.CurrentFileName) currentF=Filename(self.CurrentFileName)
AllScene.resetAll() AllScene.resetAll()
currentModName=currentF.getBasenameWoExtension() currentModName=currentF.getBasenameWoExtension()
# Let us actually remove the scene from sys modules... this is done because every scene is loaded as a module # Let us actually remove the scene from sys modules... this is done because every scene is loaded as a module
# And if we reload a scene python wont reload since its already in sys.modules... and hence we delete it # And if we reload a scene python wont reload since its already in sys.modules... and hence we delete it
# If there is ever a garbage colleciton bug..this might be a point to look at # If there is ever a garbage colleciton bug..this might be a point to look at
if sys.modules.has_key(currentModName): if sys.modules.has_key(currentModName):
del sys.modules[currentModName] del sys.modules[currentModName]
print sys.getrefcount(AllScene.theScene) print sys.getrefcount(AllScene.theScene)
del AllScene.theScene del AllScene.theScene
else: else:
AllScene.resetAll() AllScene.resetAll()
self.CurrentFileName = AllScene.loadScene() self.CurrentFileName = AllScene.loadScene()
if(self.CurrentFileName==None): if(self.CurrentFileName==None):
return return
thefile=Filename(self.CurrentFileName) thefile=Filename(self.CurrentFileName)
thedir=thefile.getFullpathWoExtension() thedir=thefile.getFullpathWoExtension()
print "SCENE EDITOR::" + thedir print "SCENE EDITOR::" + thedir
self.CurrentDirName=thedir self.CurrentDirName=thedir
if self.CurrentFileName != None: if self.CurrentFileName != None:
self.parent.title('Scene Editor - '+ Filename.fromOsSpecific(self.CurrentFileName).getBasenameWoExtension()) self.parent.title('Scene Editor - '+ Filename.fromOsSpecific(self.CurrentFileName).getBasenameWoExtension())
if self.lightingPanel !=None: if self.lightingPanel !=None:
lightList=AllScene.getList() lightList=AllScene.getList()
self.lightingPanel.updateList(lightList) self.lightingPanel.updateList(lightList)
messenger.send('SGE_Update Explorer',[render]) messenger.send('SGE_Update Explorer',[render])
@ -920,12 +920,12 @@ class myLevelEditor(AppShell):
# If this filename exists in sys.modules you cannot use it # If this filename exists in sys.modules you cannot use it
################################################################# #################################################################
if(self.CurrentFileName): if(self.CurrentFileName):
f=FileSaver() f=FileSaver()
f.SaveFile(AllScene,self.CurrentFileName,self.CurrentDirName,1) f.SaveFile(AllScene,self.CurrentFileName,self.CurrentDirName,1)
self.Dirty=0 self.Dirty=0
else: else:
self.saveAsScene() self.saveAsScene()
pass pass
def saveAsBam(self): def saveAsBam(self):
@ -946,34 +946,34 @@ class myLevelEditor(AppShell):
def saveAsScene(self): def saveAsScene(self):
################################################################# #################################################################
# saveAsScene(self) # saveAsScene(self)
# Ask for filename using a file save dialog # Ask for filename using a file save dialog
# If this filename exists in sys.modules you cannot use it # If this filename exists in sys.modules you cannot use it
# Instantiate FileSaver from seFileSaver.py and pass it the filename # Instantiate FileSaver from seFileSaver.py and pass it the filename
################################################################# #################################################################
fileName = tkFileDialog.asksaveasfilename(filetypes = [("PY","py")],title = "Save Scene") fileName = tkFileDialog.asksaveasfilename(filetypes = [("PY","py")],title = "Save Scene")
if(not fileName): if(not fileName):
return return
fCheck=Filename(fileName) fCheck=Filename(fileName)
#print fCheck.getBasenameWoExtension() #print fCheck.getBasenameWoExtension()
############################################################################### ###############################################################################
# !!!!! See if a module exists by this name... if it does you cannot use this filename !!!!! # !!!!! See if a module exists by this name... if it does you cannot use this filename !!!!!
############################################################################### ###############################################################################
if(sys.modules.has_key(fCheck.getBasenameWoExtension())): if(sys.modules.has_key(fCheck.getBasenameWoExtension())):
tkMessageBox.showwarning( tkMessageBox.showwarning(
"Save file", "Save file",
"Cannot save with this name because there is a system module with the same name. Please resave as something else." "Cannot save with this name because there is a system module with the same name. Please resave as something else."
) )
return return
self.CurrentDirName=fileName self.CurrentDirName=fileName
fileName=fileName+".py" fileName=fileName+".py"
f=FileSaver() f=FileSaver()
self.CurrentFileName=fileName self.CurrentFileName=fileName
f.SaveFile(AllScene,fileName,self.CurrentDirName,0) f.SaveFile(AllScene,fileName,self.CurrentDirName,0)
self.Dirty=0 self.Dirty=0
self.parent.title('Scene Editor - '+ Filename.fromOsSpecific(self.CurrentFileName).getBasenameWoExtension()) self.parent.title('Scene Editor - '+ Filename.fromOsSpecific(self.CurrentFileName).getBasenameWoExtension())
pass pass
def loadModel(self): def loadModel(self):
@ -992,7 +992,7 @@ class myLevelEditor(AppShell):
title = 'Load New Model', title = 'Load New Model',
parent = self.parent) parent = self.parent)
if modelFilename: if modelFilename:
self.makeDirty() self.makeDirty()
if not AllScene.loadModel(modelFilename, Filename.fromOsSpecific(modelFilename)): if not AllScene.loadModel(modelFilename, Filename.fromOsSpecific(modelFilename)):
print '----Error! No Such Model File!' print '----Error! No Such Model File!'
pass pass
@ -1015,7 +1015,7 @@ class myLevelEditor(AppShell):
if ActorFilename: if ActorFilename:
self.makeDirty() self.makeDirty()
if not AllScene.loadActor(ActorFilename, Filename.fromOsSpecific(ActorFilename)): if not AllScene.loadActor(ActorFilename, Filename.fromOsSpecific(ActorFilename)):
print '----Error! No Such Model File!' print '----Error! No Such Model File!'
pass pass
@ -1192,24 +1192,24 @@ class myLevelEditor(AppShell):
return return
def addParticleEffect(self,effect_name,effect,node): def addParticleEffect(self,effect_name,effect,node):
AllScene.particleDict[effect_name]=effect AllScene.particleDict[effect_name]=effect
AllScene.particleNodes[effect_name]=node AllScene.particleNodes[effect_name]=node
if not self.ParticleEnable: if not self.ParticleEnable:
AllScene.particleNodes[effect_name].setTransparency(True) AllScene.particleNodes[effect_name].setTransparency(True)
AllScene.particleNodes[effect_name].setAlphaScale(0) AllScene.particleNodes[effect_name].setAlphaScale(0)
AllScene.particleNodes[effect_name].setBin("fixed",1) AllScene.particleNodes[effect_name].setBin("fixed",1)
return return
def openParticlePanel(self): def openParticlePanel(self):
if self.particlePanel != None: if self.particlePanel != None:
## There already has a Particle panel! ## There already has a Particle panel!
return return
if(len(AllScene.particleDict)==0): if(len(AllScene.particleDict)==0):
self.particlePanel=seParticlePanel.ParticlePanel() self.particlePanel=seParticlePanel.ParticlePanel()
else: else:
for effect in AllScene.particleDict: for effect in AllScene.particleDict:
theeffect=AllScene.particleDict[effect] theeffect=AllScene.particleDict[effect]
self.particlePanel=seParticlePanel.ParticlePanel(particleEffect=theeffect,effectsDict=AllScene.particleDict) self.particlePanel=seParticlePanel.ParticlePanel(particleEffect=theeffect,effectsDict=AllScene.particleDict)
pass pass
@ -1355,7 +1355,7 @@ class myLevelEditor(AppShell):
self.menuEdit.entryconfig('Duplicate', state=NORMAL) self.menuEdit.entryconfig('Duplicate', state=NORMAL)
self.menuEdit.entryconfig('Remove', state=NORMAL) self.menuEdit.entryconfig('Remove', state=NORMAL)
self.menuEdit.entryconfig('Object Properties', state=NORMAL) self.menuEdit.entryconfig('Object Properties', state=NORMAL)
if callBack: if callBack:
self.seSession.select(nodePath,fResetAncestry=1) self.seSession.select(nodePath,fResetAncestry=1)
messenger.send('SGE_Update Explorer',[render]) messenger.send('SGE_Update Explorer',[render])
if not taskMgr.hasTaskNamed('seMonitorSelectedNode'): if not taskMgr.hasTaskNamed('seMonitorSelectedNode'):

4
doc/SceneEditor/seForceGroup.py
View File

@ -128,7 +128,7 @@ class ForceGroup(DirectObject):
file.write(i2+fname + ' = LinearVectorForce(Vec3(%.4f, %.4f, %.4f), %.4f, %d)\n' % (vec[0], vec[1], vec[2], amplitude, massDependent)) file.write(i2+fname + ' = LinearVectorForce(Vec3(%.4f, %.4f, %.4f), %.4f, %d)\n' % (vec[0], vec[1], vec[2], amplitude, massDependent))
elif isinstance(f, AngularForce): elif isinstance(f, AngularForce):
if isinstance(f, AngularVectorForce): if isinstance(f, AngularVectorForce):
vec = f.getLocalVector() vec = f.getQuat()
file.write(i2+fname + ' = AngularVectorForce(Vec3(%.4f, %.4f, %.4f))\n' % (vec[0], vec[1], vec[2])) file.write(i2+fname + ' = AngularVectorForce(Quat(%.4f, %.4f, %.4f))\n' % (vec[0], vec[1], vec[2], vec[3]))
file.write(i2+fname + '.setActive(%d)\n' % f.getActive()) file.write(i2+fname + '.setActive(%d)\n' % f.getActive())
file.write(i2+targ + '.addForce(%s)\n' % fname) file.write(i2+targ + '.addForce(%s)\n' % fname)

6
doc/makepanda/makepanda.py
View File

@ -483,7 +483,7 @@ for (ver,key) in MAYAVERSIONINFO:
print "Checking for "+ver print "Checking for "+ver
if (OMIT.count(ver)==0): if (OMIT.count(ver)==0):
if (sys.platform == "win32"): if (sys.platform == "win32"):
if (MAYASDK.has_key(ver)==0): if (MAYASDK.has_key(ver)==0):
MAYASDK[ver]=GetRegistryKey(key, "MAYA_INSTALL_LOCATION") MAYASDK[ver]=GetRegistryKey(key, "MAYA_INSTALL_LOCATION")
if (MAYASDK[ver] == 0): if (MAYASDK[ver] == 0):
WARNINGS.append("The registry does not appear to contain a pointer to the "+ver+" SDK.") WARNINGS.append("The registry does not appear to contain a pointer to the "+ver+" SDK.")
@ -491,7 +491,7 @@ for (ver,key) in MAYAVERSIONINFO:
OMIT.append(ver) OMIT.append(ver)
else: else:
MAYASDK[ver] = MAYASDK[ver].replace("\\", "/").rstrip("/") MAYASDK[ver] = MAYASDK[ver].replace("\\", "/").rstrip("/")
else: else:
WARNINGS.append(ver+" not yet supported under linux") WARNINGS.append(ver+" not yet supported under linux")
WARNINGS.append("I have automatically added this command-line option: --no-"+ver.lower()) WARNINGS.append("I have automatically added this command-line option: --no-"+ver.lower())
OMIT.append(ver) OMIT.append(ver)
@ -510,7 +510,7 @@ MAXVERSIONINFO = [("MAX6", "SOFTWARE\\Autodesk\\3DSMAX\\6.0", "instal
for version,key1,key2,subdir in MAXVERSIONINFO: for version,key1,key2,subdir in MAXVERSIONINFO:
if (OMIT.count(version)==0): if (OMIT.count(version)==0):
if (sys.platform == "win32"): if (sys.platform == "win32"):
if (MAXSDK.has_key(version)==0): if (MAXSDK.has_key(version)==0):
top = GetRegistryKey(key1,key2) top = GetRegistryKey(key1,key2)
if (top == 0): if (top == 0):
WARNINGS.append("The registry does not appear to contain a pointer to "+version) WARNINGS.append("The registry does not appear to contain a pointer to "+version)