formatting

This commit is contained in:
Dave Schuyler 2004-09-02 22:17:48 +00:00
parent 62f45b292c
commit f4764caa68
2 changed files with 2 additions and 18 deletions

View File

@ -12,8 +12,6 @@ class ForceGroup(DirectObject):
id = 1 id = 1
def __init__(self, name=None): def __init__(self, name=None):
"""__init__(self)"""
if (name == None): if (name == None):
self.name = 'ForceGroup-%d' % ForceGroup.id self.name = 'ForceGroup-%d' % ForceGroup.id
ForceGroup.id += 1 ForceGroup.id += 1
@ -34,16 +32,14 @@ class ForceGroup(DirectObject):
del self.particleEffect del self.particleEffect
def enable(self): def enable(self):
"""enable(self) """Convenience function to enable all forces in force group"""
Convenience function to enable all forces in force group"""
for i in range(self.node.getNumForces()): for i in range(self.node.getNumForces()):
f = self.node.getForce(i) f = self.node.getForce(i)
f.setActive(1) f.setActive(1)
self.fEnabled = 1 self.fEnabled = 1
def disable(self): def disable(self):
"""disable(self) """Convenience function to disable all forces in force group"""
Convenience function to disable all forces in force group"""
for i in range(self.node.getNumForces()): for i in range(self.node.getNumForces()):
f = self.node.getForce(i) f = self.node.getForce(i)
f.setActive(0) f.setActive(0)
@ -53,49 +49,40 @@ class ForceGroup(DirectObject):
return self.fEnabled return self.fEnabled
def addForce(self, force): def addForce(self, force):
"""addForce(self, force)"""
self.node.addForce(force) self.node.addForce(force)
if (self.particleEffect): if (self.particleEffect):
self.particleEffect.addForce(force) self.particleEffect.addForce(force)
def removeForce(self, force): def removeForce(self, force):
"""removeForce(self, force)"""
self.node.removeForce(force) self.node.removeForce(force)
if (self.particleEffect != None): if (self.particleEffect != None):
self.particleEffect.removeForce(force) self.particleEffect.removeForce(force)
# Get/set # Get/set
def getName(self): def getName(self):
"""getName(self)"""
return self.name return self.name
def getNode(self): def getNode(self):
"""getNode(self)"""
return self.node return self.node
def getNodePath(self): def getNodePath(self):
"""getNodePath(self)"""
return self.nodePath return self.nodePath
# Utility functions # Utility functions
def __getitem__(self, index): def __getitem__(self, index):
"""__getItem__(self, index)"""
numForces = self.node.getNumForces() numForces = self.node.getNumForces()
if ((index < 0) or (index >= numForces)): if ((index < 0) or (index >= numForces)):
raise IndexError raise IndexError
return self.node.getForce(index) return self.node.getForce(index)
def __len__(self): def __len__(self):
"""__len__(self)"""
return self.node.getNumForces() return self.node.getNumForces()
def asList(self): def asList(self):
"""asList(self)"""
l = [] l = []
for i in range(self.node.getNumForces()): for i in range(self.node.getNumForces()):
l.append(self.node.getForce(i)) l.append(self.node.getForce(i))
return l return l
def printParams(self, file = sys.stdout, targ = 'self'): def printParams(self, file = sys.stdout, targ = 'self'):
"""printParams(file, targ)"""
file.write('# Force parameters\n') file.write('# Force parameters\n')
for i in range(self.node.getNumForces()): for i in range(self.node.getNumForces()):
f = self.node.getForce(i) f = self.node.getForce(i)

View File

@ -3,11 +3,9 @@ import ForceGroup
class GlobalForceGroup(ForceGroup.ForceGroup): class GlobalForceGroup(ForceGroup.ForceGroup):
def __init__(self, name = None): def __init__(self, name = None):
"""__init__(self)"""
ForceGroup.ForceGroup.__init__(self, name) ForceGroup.ForceGroup.__init__(self, name)
def addForce(self, force): def addForce(self, force):
"""addForce(self, force)"""
ForceGroup.ForceGroup.addForce(force) ForceGroup.ForceGroup.addForce(force)
if (force.isLinear() == 0): if (force.isLinear() == 0):
# Physics manager will need an angular integrator # Physics manager will need an angular integrator
@ -18,7 +16,6 @@ class GlobalForceGroup(ForceGroup.ForceGroup):
physicsMgr.addAngularForce(force) physicsMgr.addAngularForce(force)
def removeForce(self, force): def removeForce(self, force):
"""removeForce(self, force)"""
ForceGroup.ForceGroup.removeForce(force) ForceGroup.ForceGroup.removeForce(force)
if (force.isLinear() == 1): if (force.isLinear() == 1):
physicsMgr.removeLinearForce(force) physicsMgr.removeLinearForce(force)