Changeset 4392 in orxonox.OLD for orxonox/trunk/src/lib/physics

Timestamp:

May 30, 2005, 1:30:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: physicsInterfaces now check in at constuctiontime with the PhysicsEngine

Location:

orxonox/trunk/src/lib/physics

Files:

• Makefile.in (modified) (1 diff)
• physics_engine.cc (modified) (3 diffs)
• physics_engine.h (modified) (3 diffs)
• physics_interface.cc (modified) (3 diffs)

orxonox/trunk/src/lib/physics/Makefile.in

@@ -218 +218 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/physics/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/physics/Makefile
+          $(AUTOMAKE) --gnu  src/lib/physics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

@@ -33 +33 @@
 
    this->connections = new tList<PhysicsConnection>;
+   this->interfaces = new tList<PhysicsInterface>;
 }
 
@@ -57 +58 @@
 {
   PhysicsEngine::singletonRef = NULL;
+}
+
+
+/**
+   \brief adds a PhysicsInterface to the list of handeled physicsInterfaces
+   \param physicsInterface the interface to add
+
+   this is normally done in the constructor of any PhysicsInterface
+*/
+void PhysicsEngine::addPhysicsInterface(PhysicsInterface* physicsInterface)
+{
+  this->interfaces->add(physicsInterface);
+}
+
+/**
+   \brief removes a PhysicsInterface from the list of handeled physicsInterfaces
+   \param physicsInterface the interface to remove
+
+   this is normally done in the destructor of any PhysicsInterface
+*/
+void PhysicsEngine::removePhysicsInterface(PhysicsInterface* physicsInterface)
+{
+  this->interfaces->remove(physicsInterface);  
 }
 
@@ -114 +138 @@
   PRINT(0)("====================================\n");
   PRINT(0)(" reference: %p\n", this);
-  PRINT(0)(" numbers of Connections: %d\n", this->connections->getSize());
+  PRINT(0)(" number of Interfaces: %d\n", this->interfaces->getSize());
+  PRINT(0)(" number of Connections: %d\n", this->connections->getSize());
 
   PRINT(0)("==============================PHYS==\n");

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

@@ -9 +9 @@
 
 #include "base_object.h"
+
 #include "physics_connection.h"
+#include "physics_interface.h"
 
 // Forward Declaration
@@ -22 +24 @@
   virtual ~PhysicsEngine(void);
 
+  void addPhysicsInterface(PhysicsInterface* physicsInterface);
+  void removePhysicsInterface(PhysicsInterface* physicsInterface);
+
+
   void addConnection(PhysicsConnection* connection);
   void removeConnection(PhysicsConnection* connection);
-  
-
 
   void tick(float dt);
@@ -33 +37 @@
  private:
   PhysicsEngine(void);
-  static PhysicsEngine* singletonRef;
+  static PhysicsEngine* singletonRef;      //!< the singleton reference of the PhysicsEngine
 
-  tList<PhysicsConnection>* connections;
+  tList<PhysicsInterface>* interfaces;     //!< a list of physically based objects
+  tList<PhysicsConnection>* connections;   //!< a list of physical connections
 };
 

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

@@ -21 +21 @@
 
 #include "physics_interface.h"
+#include "physics_engine.h"
 
 #include "field.h"
@@ -41 +42 @@
    this->massChildren = 0;
    this->forceSum = Vector(0, 0, 0);
+
+   PhysicsEngine::getInstance()->addPhysicsInterface(this);
 }
 
@@ -50 +53 @@
 PhysicsInterface::~PhysicsInterface () 
 {
-  // delete what has to be deleted here
+   PhysicsEngine::getInstance()->removePhysicsInterface(this);
 }