diff --git a/direct/src/particles/Forces.py b/direct/src/particles/Forces.py index 2db7942620..c5bf4e831e 100644 --- a/direct/src/particles/Forces.py +++ b/direct/src/particles/Forces.py @@ -12,8 +12,8 @@ class Forces(DirectObject): """__init__(self)""" if (name == None): - self.name = 'Forces-%d' % forceNum - forceNum = forceNum + 1 + self.name = 'Forces-%d' % self.forceNum + self.forceNum = self.forceNum + 1 else: self.name = name diff --git a/direct/src/particles/ParticleEffect.py b/direct/src/particles/ParticleEffect.py index 5af3eeef33..15fb2b18d5 100644 --- a/direct/src/particles/ParticleEffect.py +++ b/direct/src/particles/ParticleEffect.py @@ -5,11 +5,11 @@ import Particles import Forces class ParticleEffect(NodePath): - def __init__(self, nodePath): - """__init__(self, nodePath)""" + def __init__(self, name = 'ParticleEffect'): + """__init__(self)""" NodePath.__init__(self) - self.assign(nodePath) - self.name = self.getName() + self.assign(hidden.attachNewNode(name)) + self.name = name self.forces = [] @@ -30,12 +30,12 @@ class ParticleEffect(NodePath): """enable(self)""" for f in self.forces: f.enable() - for p = self.particles: + for p in self.particles: p.enable() def disable(self): """disable(self)""" - for f = self.forces: + for f in self.forces: f.disable() - for p = self.particles: + for p in self.particles: p.disable() diff --git a/direct/src/particles/Particles.py b/direct/src/particles/Particles.py index 18217d345f..49b412cc7f 100644 --- a/direct/src/particles/Particles.py +++ b/direct/src/particles/Particles.py @@ -37,8 +37,8 @@ class Particles(ParticleSystem.ParticleSystem): """__init__(self, name, poolSize)""" if (name == None): - self.name = 'particles-%d' % particleNum - particleNum = particleNum + 1 + self.name = 'particles-%d' % self.particleNum + self.particleNum = self.particleNum + 1 else: self.name = name ParticleSystem.ParticleSystem.__init__(self, poolSize) @@ -47,7 +47,7 @@ class Particles(ParticleSystem.ParticleSystem): self.setLitterSpread(0) # Set up a physical node - self.node = PhysicalNode.PhysicalNode(self.name) + self.node = PhysicalNode(self.name) self.nodePath = hidden.attachNewNode(self.node) self.setRenderParent(self.node) self.node.addPhysical(self)