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

Timestamp:

May 14, 2005, 12:28:44 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: simple definition of a PhisicsConnection

Location:

orxonox/branches/physics/src/util/physics

Files:

• fields/field.cc (modified) (1 diff)
• physics_connection.cc (copied) (copied from orxonox/branches/physics/src/proto/proto_class.cc) (4 diffs)
• physics_connection.h (copied) (copied from orxonox/branches/physics/src/proto/proto_class.h) (1 diff)

orxonox/branches/physics/src/util/physics/fields/field.cc

@@ -28 +28 @@
 {
    this->setClassName ("Field");
+   this->setMagnitude(1);
+   this->setAttenuation(0);
 }
 

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "physics_connection.h"
+
 
 using namespace std;
@@ -23 +24 @@
 /**
    \brief standard constructor
-   \todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass () 
+PhysicsConnection::PhysicsConnection () 
 {
-   this->setClassName ("ProtoClass");
+   this->setClassName ("PhysicsConnection");
+   connection = NULL;
 }
 
@@ -35 +36 @@
 
 */
-ProtoClass::~ProtoClass () 
+PhysicsConnection::~PhysicsConnection () 
 {
-  // delete what has to be deleted here
+  if (this->connection)
+    delete this->connection;
 }
+
+
+
+
+
+
+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;
+    }
+}

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

@@ -1 +1 @@
 /*! 
-    \file proto_class.h
-    \brief Definition of ...
-
+    \file physics_connection.h
+    \brief Definition of The Physical Connection Class.
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _PHYSICS_CONNECTION_H 
+#define _PHYSICS_CONNECTION_H
 
 #include "base_object.h"
 
-// FORWARD DEFINITION
+//! An enumerator for different ConnectionTypes
+typedef enum PCON_Type { PCON_IPhysIPhys = 0,
+                         PCON_IPhysField = 1,
+                         PCON_ParticlesField = 2 };
 
 
+// Forward Declaration
+class Field;
+class IPhysics;
+class ParticleSystem;
 
-//! A class for ...
-class ProtoClass : public BaseObject {
+
+typedef struct PhysConnection
+{
+  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
+  
+  Field* field;                      //!< The field to connect either subject of ParticleSystem to.
+};
+
+//! A class that Handles Physical Connection between subjects
+class PhysicsConnection : public BaseObject {
 
  public:
-  ProtoClass();
-  virtual ~ProtoClass();
+  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 /* _PROTO_CLASS_H */
+#endif /* _PHYSICS_CONNECTION_H */