Changeset 4182 in orxonox.OLD for orxonox/branches

Timestamp:

May 14, 2005, 1:15:25 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: connection of Physical effects should work on ParticleSystems

Location:

orxonox/branches/physics/src

Files:

• lib/graphics/particles/particle_system.cc (modified) (4 diffs)
• lib/graphics/particles/particle_system.h (modified) (3 diffs)
• util/physics/physics_connection.cc (modified) (2 diffs)
• util/physics/physics_connection.h (modified) (3 diffs)

orxonox/branches/physics/src/lib/graphics/particles/particle_system.cc

@@ -23 +23 @@
 #include "material.h"
 
+#include "field.h"
+
 using namespace std;
 
@@ -34 +36 @@
 ParticleSystem::ParticleSystem (unsigned int maxCount, PARTICLE_TYPE type)
 {
-   this->setClassName ("ParticleSystem");
-   this->material = NULL;
-   this->name = NULL;
-   this->maxCount = maxCount;
-   this->count = 0;
-   this->particles = NULL;
-   this->deadList = NULL;
-   this->setConserve(1);
-   this->setLifeSpan(1);
-   this->setInheritSpeed(0);
-   this->glID = NULL;
-   this->setRadius(1.0, 1.0, 0.0);
-   this->setType(type, 1);
-   ParticleEngine::getInstance()->addSystem(this);
+  this->setClassName ("ParticleSystem");
+  this->material = NULL;
+  this->name = NULL;
+  this->maxCount = maxCount;
+  this->count = 0;
+  this->particles = NULL;
+  this->deadList = NULL;
+  this->setConserve(1);
+  this->setLifeSpan(1);
+  this->setInheritSpeed(0);
+  this->glID = NULL;
+  this->setRadius(1.0, 1.0, 0.0);
+  this->setType(type, 1);
+  ParticleEngine::getInstance()->addSystem(this);
 }
 
@@ -207 +209 @@
       tickPart->radius += tickPart->radiusIt * dt;
 
+      // applying force to the System.
+      tickPart->velocity += tickPart->extForce * tickPart->mass;
+      tickPart->extForce = Vector(0,0,0);
+
       // many more to come
-
 
       if (this->conserve < 1.0)
@@ -240 +245 @@
     }
 }
+
+/** 
+    \brief applies some force to a Particle.
+ */
+void ParticleSystem::applyField(Field* field)
+{
+  Particle* tickPart = particles;
+  while (tickPart)
+    {
+      tickPart->extForce += field->calcForce(tickPart->position);
+      tickPart = tickPart->next;
+    }
+}
+
 
 /**

orxonox/branches/physics/src/lib/graphics/particles/particle_system.h

@@ -31 +31 @@
 class Material;
 class ParticleEmitter;
-
+class Field;
 
 //! A struct for one Particle
@@ -39 +39 @@
   Vector position;            //!< The current position of this particle.
   Vector velocity;            //!< The current velocity of this particle.
+  Vector extForce;            //!< The external Force that influences this Particle.
   Quaternion rotation;        //!< The current rotation of this particle.
   float mass;                 //!< The mass of this particle.
@@ -68 +69 @@
   void setConserve(float conserve);
   void setMass(float mass, float randomMass);
+
+  void applyField(Field* field);
 
   void tick(float dt);

orxonox/branches/physics/src/util/physics/physics_connection.cc

@@ -17 +17 @@
 
 #include "physics_connection.h"
-
+#include "field.h"
+#include "particle_system.h"
 
 using namespace std;
 
 
-/**
-   \brief standard constructor
-*/
-PhysicsConnection::PhysicsConnection () 
+
+PhysicsConnection::PhysicsConnection(ParticleSystem* particleSystem, Field* field)
 {
-   this->setClassName ("PhysicsConnection");
-   connection = NULL;
+  this->type = PCON_ParticlesField;
+  this->particleSystem = particleSystem;
+  this->field = field;
 }
 
@@ -38 +38 @@
 PhysicsConnection::~PhysicsConnection () 
 {
-  if (this->connection)
-    delete this->connection;
+
 }
 
+/** 
+    \brief applies the Force to some Object.
+*/
+void PhysicsConnection::apply(void) const
+{
+  switch(this->type)
+    {
+    case PCON_IPhysField:
+      
+      break;
 
+    case PCON_ParticlesField:
+      this->particleSystem->applyField(this->field);
 
+      break;
+      
+    case PCON_IPhysIPhys:
 
-
-
-bool PhysicsConnection::addConnection(ParticleSystem* particleSystem, Field* field)
-{
-  if (!this->connection)
-    {
-      this->connection = new PhysConnection;
-      this->connection->type = PCON_ParticlesField;
-      this->connection->particleSystem = particleSystem;
-      this->connection->field = field;
+      break;
     }
 }

orxonox/branches/physics/src/util/physics/physics_connection.h

@@ -6 +6 @@
 #ifndef _PHYSICS_CONNECTION_H 
 #define _PHYSICS_CONNECTION_H
-
-#include "base_object.h"
 
 //! An enumerator for different ConnectionTypes
@@ -20 +18 @@
 class ParticleSystem;
 
+//! A class that Handles Physical Connection between subjects
+class PhysicsConnection {
 
-typedef struct PhysConnection
-{
+ public:
+  PhysicsConnection(IPhysics* partnerOne, IPhysics* partnerTwo);
+  PhysicsConnection(IPhysics* subject, Field* field);
+  PhysicsConnection(ParticleSystem* particleSystem, Field* field);
+
+  virtual ~PhysicsConnection();
+
+  void apply(void) const;
+
+ private:
   PCON_Type type;                    //!< What kind of connection this is.
-
+  
   IPhysics* subject;                 //!< The main Subject of this Connection.
   IPhysics* partner2;                //!< The second partner of this Connection.
-
+  
   ParticleSystem* particleSystem;    //!< A ParticleSystem in this Connection
   
@@ -33 +41 @@
 };
 
-//! A class that Handles Physical Connection between subjects
-class PhysicsConnection : public BaseObject {
-
- public:
-  PhysicsConnection();
-  virtual ~PhysicsConnection();
-
-  bool addConnection(IPhysics* partnerOne, IPhysics* partnerTwo);
-  bool addConnection(IPhysics* subject, Field* field);
-  bool addConnection(ParticleSystem* particleSystem, Field* field);
-
-  inline PhysConnection* getConnection(void) const {return this->connection;}
-
- private:
-  PhysConnection* connection;        //!< The Physical Connection.
-};
-
 #endif /* _PHYSICS_CONNECTION_H */