Changeset 4394 in orxonox.OLD

Timestamp:

May 30, 2005, 2:05:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: PhysicsEngine is now aware of the existing fields and interfaces

Location:

orxonox/trunk/src/lib

Files:

• graphics/particles/particle_engine.h (modified) (2 diffs)
• graphics/particles/particle_system.h (modified) (3 diffs)
• physics/fields/field.cc (modified) (3 diffs)
• physics/physics_connection.h (modified) (1 diff)
• physics/physics_engine.cc (modified) (2 diffs)
• physics/physics_engine.h (modified) (3 diffs)

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

@@ -20 +20 @@
 };
 
-//! A default singleton class.
+//! The physicsEngine handles and stores Systems and Emitters.
+/**
+   It is responsible for driving on the Particles (tick)
+   It draw particles (draw)
+   and it emitts particles into the system
+*/
 class ParticleEngine : public BaseObject {
 
@@ -48 +53 @@
  private:
   ParticleEngine(void);
-  static ParticleEngine* singletonRef;
+  static ParticleEngine* singletonRef;        //!< The reference to the engine.
 
-  tList<ParticleSystem>* systemList;
-  tList<ParticleEmitter>* emitterList;
+  tList<ParticleSystem>* systemList;          //!< A list of Systems handled by the ParticleEngine.
+  tList<ParticleEmitter>* emitterList;        //!< A list of Emitters handled by the ParticleEngine.
 
-  tList<ParticleConnection>* connectionList;
+  tList<ParticleConnection>* connectionList;  //!< A list of Connections between Systems and Emitters.
 };
 

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

@@ -57 +57 @@
 };
 
-//! A class to handle particle Systems
+//! A class to handle ParticleSystems
 class ParticleSystem : public PhysicsInterface {
-  friend class ParticleEmitter;
 
  public:
@@ -100 +99 @@
   virtual void applyField(Field* field, float dt);
 
+  void addParticle(const Vector& position, const Vector& velocity, unsigned int data = 0);
+
   void tick(float dt);
   void draw(void) const;
@@ -132 +133 @@
 
   GLuint* glID;              //!< A List of different gl-List-ID's
-  GLuint dialectCount;       //!< How many different types of particles are there in the Particle System
-
-  void addParticle(const Vector& position, const Vector& velocity, unsigned int data = 0);
-  
+  GLuint dialectCount;       //!< How many different types of particles are there in the Particle System  
 };
 

orxonox/trunk/src/lib/physics/fields/field.cc

@@ -18 +18 @@
 #include "field.h"
 
+#include "physics_engine.h"
+
 using namespace std;
 
@@ -30 +32 @@
    this->setMagnitude(1);
    this->setAttenuation(0);
+   
+   PhysicsEngine::getInstance()->addField(this);
 }
 
@@ -39 +43 @@
 Field::~Field () 
 {
-  // delete what has to be deleted here
+   PhysicsEngine::getInstance()->removeField(this);
 }
 

orxonox/trunk/src/lib/physics/physics_connection.h

@@ -21 +21 @@
 
 //! A class that Handles Physical Connection between subjects
-class PhysicsConnection : virtual public BaseObject
+class PhysicsConnection : public BaseObject
 {
 

orxonox/trunk/src/lib/physics/physics_engine.cc

@@ -34 +34 @@
    this->connections = new tList<PhysicsConnection>;
    this->interfaces = new tList<PhysicsInterface>;
+   this->fields = new tList<Field>;
 }
 
@@ -81 +82 @@
 {
   this->interfaces->remove(physicsInterface);  
+}
+
+/**
+   \brief adds a Field to the list of handeled fields
+   \param field the field to add
+
+   this is normally done in the constructor of any Field
+*/
+void PhysicsEngine::addField(Field* field)
+{
+  this->fields->add(field);
+}
+
+/**
+   \brief removes a Field from the list of handeled fields
+   \param field the field to remove
+
+   this is normally done in the destructor of any Field
+*/
+void PhysicsEngine::removeField(Field* field)
+{
+  this->fields->remove(field);
 }
 

orxonox/trunk/src/lib/physics/physics_engine.h

@@ -12 +12 @@
 #include "physics_connection.h"
 #include "physics_interface.h"
+#include "field.h"
 
 // Forward Declaration
@@ -27 +28 @@
   void removePhysicsInterface(PhysicsInterface* physicsInterface);
 
+  void addField(Field* field);
+  void removeField(Field* field);
 
   void addConnection(PhysicsConnection* connection);
@@ -40 +43 @@
 
   tList<PhysicsInterface>* interfaces;     //!< a list of physically based objects
+  tList<Field>* fields;                    //!< a list of physicsl fields.
   tList<PhysicsConnection>* connections;   //!< a list of physical connections
 };