Changeset 4375 in orxonox.OLD for orxonox/trunk

Timestamp:

May 29, 2005, 11:55:57 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: renamed iphysics to physics_interface

Location:

orxonox/trunk/src/lib/physics

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• physics_connection.cc (modified) (3 diffs)
• physics_connection.h (modified) (3 diffs)
• physics_engine.h (modified) (2 diffs)
• physics_interface.cc (moved) (moved from orxonox/trunk/src/lib/physics/i_physics.cc) (7 diffs)
• physics_interface.h (moved) (moved from orxonox/trunk/src/lib/physics/i_physics.h) (3 diffs)

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

@@ -32 +32 @@
 noinst_LIBRARIES = libORXphysics.a 
 
-libORXphysics_a_SOURCES = i_physics.cc \
+libORXphysics_a_SOURCES = physics_interface.cc \
                           physics_connection.cc \
                           physics_engine.cc \
@@ -40 +40 @@
                           fields/twirl.cc
 
-noinst_HEADERS= i_physics.h \
+noinst_HEADERS= physics_interface.h \
                 physics_connection.h \
                 physics_engine.h \

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

@@ -54 +54 @@
 libORXphysics_a_AR = $(AR) $(ARFLAGS)
 libORXphysics_a_LIBADD =
-am_libORXphysics_a_OBJECTS = i_physics.$(OBJEXT) \
+am_libORXphysics_a_OBJECTS = physics_interface.$(OBJEXT) \
         physics_connection.$(OBJEXT) physics_engine.$(OBJEXT) \
         field.$(OBJEXT) gravity.$(OBJEXT) point_gravity.$(OBJEXT) \
@@ -63 +63 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/field.Po ./$(DEPDIR)/gravity.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/i_physics.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/physics_connection.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/physics_engine.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/physics_interface.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/point_gravity.Po ./$(DEPDIR)/twirl.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -189 +189 @@
 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/physics -I$(MAINSRCDIR)/lib/physics/fields -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/util/track -I$(MAINSRCDIR)/subprojects
 noinst_LIBRARIES = libORXphysics.a 
-libORXphysics_a_SOURCES = i_physics.cc \
+libORXphysics_a_SOURCES = physics_interface.cc \
                           physics_connection.cc \
                           physics_engine.cc \
@@ -197 +197 @@
                           fields/twirl.cc
 
-noinst_HEADERS = i_physics.h \
+noinst_HEADERS = physics_interface.h \
                 physics_connection.h \
                 physics_engine.h \
@@ -254 +254 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/field.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gravity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i_physics.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_connection.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_engine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_interface.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/point_gravity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twirl.Po@am__quote@

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

@@ -19 +19 @@
 
 #include "physics_engine.h"
+
+#include "field.h"
+#include "particle_system.h"
+#include "physics_interface.h"
 
 using namespace std;
@@ -51 +55 @@
   switch(this->type)
     {
-    case PCON_IPhysField:
+    case PCON_PhysIField:
       
       break;
@@ -60 +64 @@
       break;
       
-    case PCON_IPhysIPhys:
+    case PCON_PhysIPhysI:
 
       break;

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

@@ -7 +7 @@
 #define _PHYSICS_CONNECTION_H
 
-#include "field.h"
-#include "particle_system.h"
-#include "i_physics.h"
+// Forward Declaration
+class PhysicsInterface;
+class ParticleSystem;
+class Field;
 
 //! An enumerator for different ConnectionTypes
-typedef enum PCON_Type { PCON_IPhysIPhys = 0,
-                         PCON_IPhysField = 1,
+typedef enum PCON_Type { PCON_PhysIPhysI = 0,
+                         PCON_PhysIField = 1,
                          PCON_ParticlesField = 2 };
 
@@ -23 +24 @@
 
  public:
-  PhysicsConnection(IPhysics* partnerOne, IPhysics* partnerTwo);
-  PhysicsConnection(IPhysics* subject, Field* field);
+  PhysicsConnection(PhysicsInterface* partnerOne, PhysicsInterface* partnerTwo);
+  PhysicsConnection(PhysicsInterface* subject, Field* field);
   PhysicsConnection(ParticleSystem* particleSystem, Field* field);
 
@@ -34 +35 @@
   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.
+  PhysicsInterface* subject;         //!< The main Subject of this Connection.
+  PhysicsInterface* partner2;        //!< The second partner of this Connection.
   
   ParticleSystem* particleSystem;    //!< A ParticleSystem in this Connection

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

@@ -10 +10 @@
 #include "base_object.h"
 #include "physics_connection.h"
-#include "fields.h"
 
 // Forward Declaration
@@ -25 +24 @@
   void addConnection(PhysicsConnection* connection);
   void removeConnection(PhysicsConnection* connection);
+  
+
 
   void tick(float dt);

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

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
+   co-programmer: Benjamin Grauer
+   
+   bensch: renamed the file
 */
 
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
 
-#include "i_physics.h"
+#include "physics_interface.h"
 #include "list.h"
 #include "string.h"
@@ -29 +31 @@
    \brief standard constructor
 */
-IPhysics::IPhysics () 
+PhysicsInterface::PhysicsInterface () 
 {
-   this->setClassName ("IPhysics");
+   this->setClassName ("PhysicsInterface");
    this->mass = 0;
    this->massChildren = 0;
@@ -42 +44 @@
 
 */
-IPhysics::~IPhysics () 
+PhysicsInterface::~PhysicsInterface () 
 {
   // delete what has to be deleted here
 }
 
-void IPhysics::recalcMass()
+void PhysicsInterface::recalcMass()
 {
         float massSum = 0;
@@ -55 +57 @@
         while( pn != NULL) 
     { 
-        // todo: find out if children are IPhysics in an efficient way
-        if (strcmp( pn->getClassName(), "IPhysics")) {
-                        massSum += ((IPhysics*)pn)->getTotalMass();
+        // todo: find out if children are PhysicsInterface in an efficient way
+        if (strcmp( pn->getClassName(), "PhysicsInterface")) {
+                        massSum += ((PhysicsInterface*)pn)->getTotalMass();
         }
       pn = iterator->nextElement();
@@ -65 +67 @@
         if (massSum != this->massChildren ) {
                 this->massChildren = massSum;
-                if (strcmp( parent->getClassName(), "IPhysics"))
-                        ((IPhysics*)parent)->recalcMass();
+                if (strcmp( parent->getClassName(), "PhysicsInterface"))
+                        ((PhysicsInterface*)parent)->recalcMass();
         } else {
                 this->massChildren = massSum;
@@ -73 +75 @@
         
         
-void IPhysics::addForce( Vector force )
+void PhysicsInterface::addForce( Vector force )
 {
         forceSum += force;
 }
 
-void IPhysics::addForce(Vector force, Vector grip)
+void PhysicsInterface::addForce(Vector force, Vector grip)
 {
         // add central force
@@ -86 +88 @@
 }
         
-void IPhysics::tick( float dt )
+void PhysicsInterface::tick( float dt )
 {
         Vector acc = forceSum / ( massChildren + mass );

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

@@ -1 +1 @@
 /*! 
-    \file i_physics.h
+    \file physics_interface.h
     \brief a physics interface simulating a body with a mass
 */
 
-#ifndef _I_PHYSICS_H
-#define _I_PHYSICS_H
+#ifndef _PHYSICS_INTERFACE_H
+#define _PHYSICS_INTERFACE_H
 
 #include "p_node.h"
@@ -13 +13 @@
    here can be some longer description of this class
 */
-class IPhysics : public PNode {
+class PhysicsInterface : public PNode {
 
  public:
-  IPhysics();
-  virtual ~IPhysics();
+  PhysicsInterface();
+  virtual ~PhysicsInterface();
   
   inline void setMass( float mass ) { this->mass = mass; };                                     //!< Set the mass of this node
@@ -38 +38 @@
 };
 
-#endif /* _I_PHYSICS_H */
+#endif /* _PHYSICS_INTERFACE_H */