TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from frainfreeze/master

Browse Source 
updated direct/particle to import from panda3d.physics
This commit is contained in:
rdb 2015-01-13 20:12:44 +01:00
commit 9b747b525e
5 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/particles/ParticleManagerGlobal.py
View File

@ -1,6 +1,6 @@
""" """
Contains the global particle system manager Contains the global particle system manager
""" """
from pandac.PandaModules import ParticleSystemManager from panda3d.physics import ParticleSystemManager
particleMgr = ParticleSystemManager() particleMgr = ParticleSystemManager()

45
direct/src/particles/Particles.py
View File

@ -1,27 +1,27 @@
from pandac.PandaModules import * from pandac.PandaModules import *
from pandac.PandaModules import ParticleSystem from panda3d.physics import ParticleSystem
from pandac.PandaModules import BaseParticleFactory from panda3d.physics import BaseParticleFactory
from pandac.PandaModules import PointParticleFactory from panda3d.physics import PointParticleFactory
from pandac.PandaModules import ZSpinParticleFactory from panda3d.physics import ZSpinParticleFactory
#from pandac.PandaModules import OrientedParticleFactory #from panda3d.physics import OrientedParticleFactory
from pandac.PandaModules import BaseParticleRenderer from panda3d.physics import BaseParticleRenderer
from pandac.PandaModules import PointParticleRenderer from panda3d.physics import PointParticleRenderer
from pandac.PandaModules import LineParticleRenderer from panda3d.physics import LineParticleRenderer
from pandac.PandaModules import GeomParticleRenderer from panda3d.physics import GeomParticleRenderer
from pandac.PandaModules import SparkleParticleRenderer from panda3d.physics import SparkleParticleRenderer
#from pandac.PandaModules import SpriteParticleRenderer #from panda3d.physics import SpriteParticleRenderer
from pandac.PandaModules import BaseParticleEmitter from panda3d.physics import BaseParticleEmitter
from pandac.PandaModules import ArcEmitter from panda3d.physics import ArcEmitter
from pandac.PandaModules import BoxEmitter from panda3d.physics import BoxEmitter
from pandac.PandaModules import DiscEmitter from panda3d.physics import DiscEmitter
from pandac.PandaModules import LineEmitter from panda3d.physics import LineEmitter
from pandac.PandaModules import PointEmitter from panda3d.physics import PointEmitter
from pandac.PandaModules import RectangleEmitter from panda3d.physics import RectangleEmitter
from pandac.PandaModules import RingEmitter from panda3d.physics import RingEmitter
from pandac.PandaModules import SphereSurfaceEmitter from panda3d.physics import SphereSurfaceEmitter
from pandac.PandaModules import SphereVolumeEmitter from panda3d.physics import SphereVolumeEmitter
from pandac.PandaModules import TangentRingEmitter from panda3d.physics import TangentRingEmitter
import SpriteParticleRendererExt import SpriteParticleRendererExt
@ -595,4 +595,3 @@ class Particles(ParticleSystem):
base.physicsMgr.doPhysics(remainder,self) base.physicsMgr.doPhysics(remainder,self)
self.render() self.render()

3
direct/src/particles/SpriteParticleRendererExt.py
View File

@ -1,4 +1,4 @@
from pandac.PandaModules import SpriteParticleRenderer from panda3d.physics import SpriteParticleRenderer
class SpriteParticleRendererExt(SpriteParticleRenderer): class SpriteParticleRendererExt(SpriteParticleRenderer):
@ -126,4 +126,3 @@ class SpriteParticleRendererExt(SpriteParticleRenderer):
m.removeNode() m.removeNode()
return True return True

2
direct/src/showbase/PhysicsManagerGlobal.py
View File

@ -2,6 +2,6 @@
__all__ = ['physicsMgr'] __all__ = ['physicsMgr']
from pandac.PandaModules import PhysicsManager from panda3d.physics import PhysicsManager
physicsMgr = PhysicsManager() physicsMgr = PhysicsManager()