*** empty log message ***

Mark Mine · Mark Mine · commit e34085f5fa19 · 2001-01-27T00:36:10.000Z
diff --git a/direct/src/particles/Forces.py b/direct/src/particles/Forces.py
@@ -12,8 +12,8 @@ def __init__(self, name = None):
 	"""__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
@@ -5,11 +5,11 @@
 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 @@ def enable(self):
 	"""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
@@ -37,8 +37,8 @@ def __init__(self, name = None, poolSize = 1024):
 	"""__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 @@ def __init__(self, name = None, poolSize = 1024):
 	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)
