Changeset 4338 in orxonox.OLD for orxonox/trunk/src/lib/graphics/particles/particle_engine.h

Timestamp:

May 27, 2005, 9:16:53 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/physics back to the trunk
merged with command
svn merge -r 3866:HEAD . ../../trunk/
many conflict that i tried to resolv
@patrick: i hope i did not interfere with your stuff :/

File:

• orxonox/trunk/src/lib/graphics/particles/particle_engine.h (modified) (2 diffs)

orxonox/trunk/src/lib/graphics/particles/particle_engine.h

@@ -13 +13 @@
 // FORWARD DEFINITION 
 template<class T> class tList;
-class ParticleSystem;
-class ParticleEmitter;
 
 struct ParticleConnection
@@ -41 +39 @@
   bool breakConnection(ParticleConnection* connection);
 
+  ParticleSystem* getSystemByName(const char* systemName) const;
+  ParticleSystem* getSystemByNumber(unsigned int number) const;
+  ParticleEmitter* getEmitterByName(const char* emitterName) const;
+  ParticleEmitter* getEmitterByNumber(unsigned int number) const;
+
   void debug();