Changeset 4377 in orxonox.OLD

Timestamp:

May 29, 2005, 1:24:40 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ParticleSystem is now a PhysicsInterface

Location:

orxonox/trunk/src/lib

Files:

• graphics/particles/particle_system.cc (modified) (1 diff)
• graphics/particles/particle_system.h (modified) (3 diffs)
• physics/physics_connection.cc (modified) (2 diffs)
• physics/physics_connection.h (modified) (3 diffs)
• physics/physics_interface.cc (modified) (2 diffs)
• physics/physics_interface.h (modified) (3 diffs)

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

@@ -289 +289 @@
 /** 
     \brief applies some force to a Particle.
+    \param field the Field to apply.
+    \param dt The time over which the field gets applied
  */
-void ParticleSystem::applyField(float dt, Field* field)
+void ParticleSystem::applyField(Field* field, float dt)
 {
   Particle* tickPart = particles;

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

@@ -8 +8 @@
 
 #include "base_object.h"
+#include "physics_interface.h"
+
 #include "vector.h"
 
@@ -55 +57 @@
 
 //! A class to handle particle Systems
-class ParticleSystem : public BaseObject {
+class ParticleSystem : public PhysicsInterface {
   friend class ParticleEmitter;
 
@@ -95 +97 @@
   inline float getMass(void) const { return this->initialMass; };
 
-  void applyField(float dt, Field* field);
+  void applyField(Field* field, float dt);
 
   void tick(float dt);

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

@@ -28 +28 @@
 
 
-PhysicsConnection::PhysicsConnection(ParticleSystem* particleSystem, Field* field)
+PhysicsConnection::PhysicsConnection(PhysicsInterface* subject, Field* field)
 {
-  this->type = PCON_ParticlesField;
-  this->particleSystem = particleSystem;
+  this->type = PCON_PhysIField;
+  this->subject = subject;
   this->field = field;
 
@@ -59 +59 @@
       break;
 
-    case PCON_ParticlesField:
-      this->particleSystem->applyField(dt, this->field);
-
-      break;
-      
     case PCON_PhysIPhysI:
-
+      this->subject->applyField(this->field, dt);
       break;
     }

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

@@ -14 +14 @@
 //! An enumerator for different ConnectionTypes
 typedef enum PCON_Type { PCON_PhysIPhysI = 0,
-                         PCON_PhysIField = 1,
-                         PCON_ParticlesField = 2 };
+                         PCON_PhysIField = 1};
 
 
@@ -24 +23 @@
 
  public:
+  PhysicsConnection(PhysicsInterface* subject, Field* field);
   PhysicsConnection(PhysicsInterface* partnerOne, PhysicsInterface* partnerTwo);
-  PhysicsConnection(PhysicsInterface* subject, Field* field);
-  PhysicsConnection(ParticleSystem* particleSystem, Field* field);
 
   virtual ~PhysicsConnection();
@@ -38 +36 @@
   PhysicsInterface* partner2;        //!< The second partner of this Connection.
   
-  ParticleSystem* particleSystem;    //!< A ParticleSystem in this Connection
-  
   Field* field;                      //!< The field to connect either subject of ParticleSystem to.
 };

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

@@ -22 +22 @@
 #include "physics_interface.h"
 
+#include "field.h"
 #include "p_node.h"
 
@@ -84 +85 @@
         
         
-void PhysicsInterface::applyForce( Vector force )
+void PhysicsInterface::applyField(Field* field, float dt)
 {
-  this->forceSum += force;
+  //  this->forceSum += force;
 }
 

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

@@ -8 +8 @@
 
 #include "vector.h"
+#include "base_object.h"
+
+// Forward Declaration
+class Field;
 
 //! A Physics interface
@@ -13 +17 @@
    here can be some longer description of this class
 */
-class PhysicsInterface {
+class PhysicsInterface : public BaseObject
+{
 
  public:
@@ -25 +30 @@
   inline float getTotalMass( void ) const { return mass + massChildren; };
 
-  virtual void applyForce( Vector force );                                      //!< Add a central force on this rigid body
-  virtual void tickPhys( float dt );                                            //!< Update kinematics, reset force sum
+  virtual void applyField(Field* field, float dt);
+  virtual void tickPhys( float dt );
 
  protected: