Changeset 4182 in orxonox.OLD for orxonox/branches/physics/src/util

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/util/physics

Files:

• physics_connection.cc (modified) (2 diffs)
• physics_connection.h (modified) (3 diffs)

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 */