Browse Source

*** empty log message ***

Mike Goslin 25 years ago
parent
commit
469a00e23b

+ 8 - 10
direct/src/particles/ForceGroup.py

@@ -27,20 +27,18 @@ class ForceGroup(DirectObject):
     def enable(self):
     def enable(self):
 	"""enable(self)
 	"""enable(self)
 	   Convenience function to enable all forces in force group"""
 	   Convenience function to enable all forces in force group"""
-	if (self.fEnabled == 0):
-	    for i in range(self.node.getNumForces()):
-	    	f = self.node.getForce(i)
-	    	f.setActive(1)	
-            self.fEnabled = 1
+	for i in range(self.node.getNumForces()):
+	    f = self.node.getForce(i)
+	    f.setActive(1)	
+        self.fEnabled = 1
 
 
     def disable(self):
     def disable(self):
 	"""disable(self)
 	"""disable(self)
 	   Convenience function to disable all forces in force group"""
 	   Convenience function to disable all forces in force group"""
-	if (self.fEnabled == 1):
-	    for i in range(self.node.getNumForces()):
-	    	f = self.node.getForce(i)
-		f.setActive(0)
-            self.fEnabled = 0
+	for i in range(self.node.getNumForces()):
+	    f = self.node.getForce(i)
+	    f.setActive(0)
+        self.fEnabled = 0
 
 
     def isEnabled(self):
     def isEnabled(self):
         return self.fEnabled
         return self.fEnabled

+ 0 - 1
direct/src/particles/ParticleTest.py

@@ -17,7 +17,6 @@ pe = ParticleEffect.ParticleEffect('particle-fx')
 pe.reparentTo(render)
 pe.reparentTo(render)
 pe.setPos(0.0, 5.0, 4.0)
 pe.setPos(0.0, 5.0, 4.0)
 pe.addForceGroup(fg)
 pe.addForceGroup(fg)
-pe.enable()
 
 
 # Particle Panel
 # Particle Panel
 pp = ParticlePanel.ParticlePanel(pe)
 pp = ParticlePanel.ParticlePanel(pe)

+ 8 - 6
direct/src/particles/Particles.py

@@ -68,15 +68,17 @@ class Particles(ParticleSystem.ParticleSystem):
 
 
     def enable(self):
     def enable(self):
 	"""enable()"""
 	"""enable()"""
-	physicsMgr.attachPhysical(self)
-	particleMgr.attachParticlesystem(self)
-        self.fEnabled = 1
+	if (self.fEnabled == 0):
+	    physicsMgr.attachPhysical(self)
+	    particleMgr.attachParticlesystem(self)
+            self.fEnabled = 1
 
 
     def disable(self):
     def disable(self):
 	"""disable()"""
 	"""disable()"""
-	physicsMgr.removePhysical(self)
-	particleMgr.removeParticlesystem(self)
-        self.fEnabled = 0
+	if (self.fEnabled == 1):
+	    physicsMgr.removePhysical(self)
+	    particleMgr.removeParticlesystem(self)
+            self.fEnabled = 0
 
 
     def isEnabled(self):
     def isEnabled(self):
         return self.fEnabled
         return self.fEnabled