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

formatting

Browse Source
This commit is contained in:
Dave Schuyler 2006-03-18 00:56:30 +00:00
parent 82b8fd363c
commit 5b9c717f3d
4 changed files with 122 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
direct/src/ffi/FFITypes.py
View File

@ -511,13 +511,13 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
file = open(os.path.join(dir, fileName), 'w') file = open(os.path.join(dir, fileName), 'w')
indent(file, 0, FFIConstants.generatedHeader) indent(file, 0, FFIConstants.generatedHeader)
self.outputBaseImports(file) self.outputBaseImports(file)
self.generateCode1(file, 0,extensionsDir) self.generateCode1(file, 0, extensionsDir)
file.close() file.close()
file = open(os.path.join(dir, fileName1), 'w') file = open(os.path.join(dir, fileName1), 'w')
indent(file, 0, FFIConstants.generatedHeader) indent(file, 0, FFIConstants.generatedHeader)
#self.outputBaseImports(file) #self.outputBaseImports(file)
self.generateCode2(file, 0,extensionsDir,self.foreignTypeName) self.generateCode2(file, 0, extensionsDir, self.foreignTypeName)
file.close() file.close()
@ -969,7 +969,7 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
""" """
#if classTypeDesc != self: #if classTypeDesc != self:
# indent(file, nesting, 'import ' + self.foreignTypeName + '\n') # indent(file, nesting, 'import ' + self.foreignTypeName + '\n')
indent(file,nesting, 'if returnValue == 0: return None\n') indent(file, nesting, 'if returnValue == 0: return None\n')
# Do not put Class.Class if this file is the file that defines Class # Do not put Class.Class if this file is the file that defines Class
# Also check for nested classes. They do not need the module name either # Also check for nested classes. They do not need the module name either
typeName = FFIOverload.getTypeName(classTypeDesc, self) typeName = FFIOverload.getTypeName(classTypeDesc, self)
@ -977,9 +977,9 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
### inline the old constructers ### inline the old constructers
#indent(file, nesting, 'returnObject = ') #indent(file, nesting, 'returnObject = ')
#file.write('FFIExternalObject.FFIInstance('+ typeName + ',returnValue,'+str(userManagesMemory)+')\n') #file.write('FFIExternalObject.FFIInstance('+ typeName + ', returnValue,'+str(userManagesMemory)+')\n')
#indent(file,nesting, 'returnObject.this = 0\n') #indent(file, nesting, 'returnObject.this = 0\n')
#indent(file,nesting, 'returnObject.userManagesMemory = 0\n'); #indent(file, nesting, 'returnObject.userManagesMemory = 0\n');
## ##
#indent(file, nesting, 'returnObject.this = returnValue\n') #indent(file, nesting, 'returnObject.this = returnValue\n')
@ -991,16 +991,16 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
# indent(file, nesting, 'returnObject.userManagesMemory = 0\n') # indent(file, nesting, 'returnObject.userManagesMemory = 0\n')
if needsDowncast: if needsDowncast:
#indent(file, nesting, 'returnObject = FFIExternalObject.FFIInstance('+ typeName + ',returnValue,'+str(userManagesMemory)+')\n') #indent(file, nesting, 'returnObject = FFIExternalObject.FFIInstance('+ typeName + ', returnValue,'+str(userManagesMemory)+')\n')
if (FFIOverload.inheritsFrom(self, TypedObjectDescriptor) or if (FFIOverload.inheritsFrom(self, TypedObjectDescriptor) or
self == TypedObjectDescriptor): self == TypedObjectDescriptor):
#indent(file, nesting, 'return returnObject.setPointer()\n') #indent(file, nesting, 'return returnObject.setPointer()\n')
indent(file, nesting, 'return FFIExternalObject.FFIInstance('+ typeName + ',returnValue,'+str(userManagesMemory)+').setPointer()\n') indent(file, nesting, 'return FFIExternalObject.FFIInstance('+ typeName + ', returnValue,'+str(userManagesMemory)+').setPointer()\n')
else: else:
indent(file, nesting,'return FFIExternalObject.FFIInstance('+ typeName + ',returnValue,'+str(userManagesMemory)+')\n') indent(file, nesting,'return FFIExternalObject.FFIInstance('+ typeName + ', returnValue,'+str(userManagesMemory)+')\n')
#indent(file, nesting, 'return returnObject\n') #indent(file, nesting, 'return returnObject\n')
else: else:
indent(file, nesting,'return FFIExternalObject.FFIInstance('+ typeName + ',returnValue,'+str(userManagesMemory)+')\n') indent(file, nesting,'return FFIExternalObject.FFIInstance('+ typeName + ', returnValue,'+str(userManagesMemory)+')\n')
#indent(file, nesting, 'return returnObject\n') #indent(file, nesting, 'return returnObject\n')

16
direct/src/ffi/jGenPyCode.py
View File

@ -14,7 +14,7 @@
# #
############################################################## ##############################################################
import sys,os import sys, os
############################################################## ##############################################################
# #
@ -83,13 +83,13 @@ DoGenPyCode.etcPath = [os.path.join(PANDAC,"input")]
DoGenPyCode.pythonSourcePath = [DIRECT] DoGenPyCode.pythonSourcePath = [DIRECT]
DoGenPyCode.native = 1 DoGenPyCode.native = 1
#print "outputDir = ",DoGenPyCode.outputDir #print "outputDir = ", DoGenPyCode.outputDir
#print "directDir = ",DoGenPyCode.directDir #print "directDir = ", DoGenPyCode.directDir
#print "extensionsDir = ",DoGenPyCode.extensionsDir #print "extensionsDir = ", DoGenPyCode.extensionsDir
#print "interrogateLib = ",DoGenPyCode.interrogateLib #print "interrogateLib = ", DoGenPyCode.interrogateLib
#print "codeLibs = ",DoGenPyCode.codeLibs #print "codeLibs = ", DoGenPyCode.codeLibs
#print "etcPath = ",DoGenPyCode.etcPath #print "etcPath = ", DoGenPyCode.etcPath
#print "native = ",DoGenPyCode.native #print "native = ", DoGenPyCode.native
DoGenPyCode.run() DoGenPyCode.run()

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

@ -79,7 +79,8 @@ class Loader:
want to load a model and immediately set a transform on it. want to load a model and immediately set a transform on it.
But also consider loadModelCopy(). But also consider loadModelCopy().
""" """
assert Loader.notify.debug("Loading model once: %s under %s" % (modelPath, underNode)) assert Loader.notify.debug(
"Loading model once: %s under %s" % (modelPath, underNode))
if phaseChecker: if phaseChecker:
phaseChecker(modelPath) phaseChecker(modelPath)
node = ModelPool.loadModel(modelPath) node = ModelPool.loadModel(modelPath)
@ -296,5 +297,3 @@ class Loader:
if (shader == None): if (shader == None):
Loader.notify.warning("Could not load shader file %s." % shaderPath) Loader.notify.warning("Could not load shader file %s." % shaderPath)
return shader return shader

35
direct/src/tkpanels/Placer.py
View File

@ -186,7 +186,7 @@ class Placer(AppShell):
self.posX['preCallback'] = self.xformStart self.posX['preCallback'] = self.xformStart
self.posX['postCallback'] = self.xformStop self.posX['postCallback'] = self.xformStop
self.posX['callbackData'] = ['x'] self.posX['callbackData'] = ['x']
self.posX.pack(expand=1,fill='both') self.posX.pack(expand=1, fill='both')
self.posY = self.createcomponent('posY', (), None, self.posY = self.createcomponent('posY', (), None,
Floater.Floater, (posInterior,), Floater.Floater, (posInterior,),
@ -197,7 +197,7 @@ class Placer(AppShell):
self.posY['preCallback'] = self.xformStart self.posY['preCallback'] = self.xformStart
self.posY['postCallback'] = self.xformStop self.posY['postCallback'] = self.xformStop
self.posY['callbackData'] = ['y'] self.posY['callbackData'] = ['y']
self.posY.pack(expand=1,fill='both') self.posY.pack(expand=1, fill='both')
self.posZ = self.createcomponent('posZ', (), None, self.posZ = self.createcomponent('posZ', (), None,
Floater.Floater, (posInterior,), Floater.Floater, (posInterior,),
@ -208,7 +208,7 @@ class Placer(AppShell):
self.posZ['preCallback'] = self.xformStart self.posZ['preCallback'] = self.xformStart
self.posZ['postCallback'] = self.xformStop self.posZ['postCallback'] = self.xformStop
self.posZ['callbackData'] = ['z'] self.posZ['callbackData'] = ['z']
self.posZ.pack(expand=1,fill='both') self.posZ.pack(expand=1, fill='both')
# Create and pack the Hpr Controls # Create and pack the Hpr Controls
hprGroup = Pmw.Group(interior, hprGroup = Pmw.Group(interior,
@ -223,7 +223,7 @@ class Placer(AppShell):
hprMenu.add_command(label = 'Set to zero', command = self.zeroHpr) hprMenu.add_command(label = 'Set to zero', command = self.zeroHpr)
hprMenu.add_command(label = 'Reset initial', command = self.resetHpr) hprMenu.add_command(label = 'Reset initial', command = self.resetHpr)
hprMenubutton['menu'] = hprMenu hprMenubutton['menu'] = hprMenu
hprGroup.pack(side='left',fill = 'both', expand = 1) hprGroup.pack(side='left', fill = 'both', expand = 1)
hprInterior = hprGroup.interior() hprInterior = hprGroup.interior()
# Create the dials # Create the dials
@ -237,7 +237,7 @@ class Placer(AppShell):
self.hprH['preCallback'] = self.xformStart self.hprH['preCallback'] = self.xformStart
self.hprH['postCallback'] = self.xformStop self.hprH['postCallback'] = self.xformStop
self.hprH['callbackData'] = ['h'] self.hprH['callbackData'] = ['h']
self.hprH.pack(expand=1,fill='both') self.hprH.pack(expand=1, fill='both')
self.hprP = self.createcomponent('hprP', (), None, self.hprP = self.createcomponent('hprP', (), None,
Dial.AngleDial, (hprInterior,), Dial.AngleDial, (hprInterior,),
@ -249,7 +249,7 @@ class Placer(AppShell):
self.hprP['preCallback'] = self.xformStart self.hprP['preCallback'] = self.xformStart
self.hprP['postCallback'] = self.xformStop self.hprP['postCallback'] = self.xformStop
self.hprP['callbackData'] = ['p'] self.hprP['callbackData'] = ['p']
self.hprP.pack(expand=1,fill='both') self.hprP.pack(expand=1, fill='both')
self.hprR = self.createcomponent('hprR', (), None, self.hprR = self.createcomponent('hprR', (), None,
Dial.AngleDial, (hprInterior,), Dial.AngleDial, (hprInterior,),
@ -261,7 +261,7 @@ class Placer(AppShell):
self.hprR['preCallback'] = self.xformStart self.hprR['preCallback'] = self.xformStart
self.hprR['postCallback'] = self.xformStop self.hprR['postCallback'] = self.xformStop
self.hprR['callbackData'] = ['r'] self.hprR['callbackData'] = ['r']
self.hprR.pack(expand=1,fill='both') self.hprR.pack(expand=1, fill='both')
# Create and pack the Scale Controls # Create and pack the Scale Controls
# The available scaling modes # The available scaling modes
@ -292,7 +292,7 @@ class Placer(AppShell):
variable = self.scalingMode) variable = self.scalingMode)
self.scaleMenubutton['menu'] = scaleMenu self.scaleMenubutton['menu'] = scaleMenu
# Pack group widgets # Pack group widgets
scaleGroup.pack(side='left',fill = 'both', expand = 1) scaleGroup.pack(side='left', fill = 'both', expand = 1)
scaleInterior = scaleGroup.interior() scaleInterior = scaleGroup.interior()
# Create the dials # Create the dials
@ -307,7 +307,7 @@ class Placer(AppShell):
self.scaleX['callbackData'] = ['sx'] self.scaleX['callbackData'] = ['sx']
self.scaleX['preCallback'] = self.xformStart self.scaleX['preCallback'] = self.xformStart
self.scaleX['postCallback'] = self.xformStop self.scaleX['postCallback'] = self.xformStop
self.scaleX.pack(expand=1,fill='both') self.scaleX.pack(expand=1, fill='both')
self.scaleY = self.createcomponent('scaleY', (), None, self.scaleY = self.createcomponent('scaleY', (), None,
Floater.Floater, (scaleInterior,), Floater.Floater, (scaleInterior,),
@ -320,7 +320,7 @@ class Placer(AppShell):
self.scaleY['callbackData'] = ['sy'] self.scaleY['callbackData'] = ['sy']
self.scaleY['preCallback'] = self.xformStart self.scaleY['preCallback'] = self.xformStart
self.scaleY['postCallback'] = self.xformStop self.scaleY['postCallback'] = self.xformStop
self.scaleY.pack(expand=1,fill='both') self.scaleY.pack(expand=1, fill='both')
self.scaleZ = self.createcomponent('scaleZ', (), None, self.scaleZ = self.createcomponent('scaleZ', (), None,
Floater.Floater, (scaleInterior,), Floater.Floater, (scaleInterior,),
@ -333,7 +333,7 @@ class Placer(AppShell):
self.scaleZ['callbackData'] = ['sz'] self.scaleZ['callbackData'] = ['sz']
self.scaleZ['preCallback'] = self.xformStart self.scaleZ['preCallback'] = self.xformStart
self.scaleZ['postCallback'] = self.xformStop self.scaleZ['postCallback'] = self.xformStop
self.scaleZ.pack(expand=1,fill='both') self.scaleZ.pack(expand=1, fill='both')
# Make sure appropriate labels are showing # Make sure appropriate labels are showing
self.setMovementMode('Relative To:') self.setMovementMode('Relative To:')
@ -538,21 +538,21 @@ class Placer(AppShell):
def updateAuxiliaryCoordinateSystems(self): def updateAuxiliaryCoordinateSystems(self):
# Temp CS # Temp CS
self.tempCS.setPosHpr(self['nodePath'], 0,0,0,0,0,0) self.tempCS.setPosHpr(self['nodePath'], 0, 0, 0, 0, 0, 0)
# Orbit CS # Orbit CS
# At reference # At reference
self.orbitFromCS.setPos(self.refCS, 0,0,0) self.orbitFromCS.setPos(self.refCS, 0, 0, 0)
# But aligned with target # But aligned with target
self.orbitFromCS.setHpr(self['nodePath'], 0,0,0) self.orbitFromCS.setHpr(self['nodePath'], 0, 0, 0)
# Also update to CS # Also update to CS
self.orbitToCS.setPosHpr(self.orbitFromCS, 0,0,0,0,0,0) self.orbitToCS.setPosHpr(self.orbitFromCS, 0, 0, 0, 0, 0, 0)
# Get offset from origin # Get offset from origin
self.posOffset.assign(self['nodePath'].getPos(self.orbitFromCS)) self.posOffset.assign(self['nodePath'].getPos(self.orbitFromCS))
### NODE PATH TRANSFORMATION OPERATIONS ### ### NODE PATH TRANSFORMATION OPERATIONS ###
def xform(self, value, axis): def xform(self, value, axis):
if axis in ['sx', 'sy', 'sz']: if axis in ['sx', 'sy', 'sz']:
self.xformScale(value,axis) self.xformScale(value, axis)
elif self.movementMode == 'Relative To:': elif self.movementMode == 'Relative To:':
self.xformRelative(value, axis) self.xformRelative(value, axis)
elif self.movementMode == 'Orbit:': elif self.movementMode == 'Orbit:':
@ -639,7 +639,7 @@ class Placer(AppShell):
elif axis == 'sz': elif axis == 'sz':
scale.setZ(value) scale.setZ(value)
elif mode == 'Scale Uniform': elif mode == 'Scale Uniform':
scale.set(value,value,value) scale.set(value, value, value)
elif mode == 'Scale Proportional': elif mode == 'Scale Proportional':
if axis == 'sx': if axis == 'sx':
sf = value/scale[0] sf = value/scale[0]
@ -790,4 +790,3 @@ def place(nodePath):
if __name__ == '__main__': if __name__ == '__main__':
root = Pmw.initialise() root = Pmw.initialise()
widget = Placer() widget = Placer()