Changeset 4382 in orxonox.OLD

Timestamp:

May 29, 2005, 9:04:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: BaseObject virtual public in PNode and Player(for test).
This is, so only one Object of type BaseObject is being created when deriving with multiple inheritance

@patrick: read it in a book at the lake today

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.h (modified) (1 diff)
• lib/lang/base_object.h (modified) (3 diffs)
• lib/physics/physics_interface.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• world_entities/player.h (modified) (2 diffs)
• world_entities/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/lib/coord/p_node.h

@@ -45 +45 @@
 
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
-class PNode : public BaseObject {
+class PNode : virtual public BaseObject {
 
  public:

orxonox/trunk/src/lib/lang/base_object.h

@@ -1 +1 @@
 /*! 
-    \file proto_class.h
-    \brief Definition of the proto class template, used quickly start work
+    \file base_object.h
+    \brief Definition of the base object class. that is a global handler for all classes.
 */
 
@@ -10 +10 @@
 #include "class_list.h"
 
+//! A class all other classes are derived from
 class BaseObject {
 
@@ -20 +21 @@
   void setClassID(int id, const char* className);
 
+  /** \returns the className of the corresponding Object */
   inline const char* getClassName(void) const { return this->className;};
+  /** \returns the classID of the corresponding Object */
   inline int getClassID(void) const { return this->id; }
   bool isA (char* className);
 
+  /** \returns if the object is finalized */
   inline bool isFinalized() { return this->finalized; }
   void finalize();

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

@@ -17 +17 @@
    here can be some longer description of this class
 */
-class PhysicsInterface : public BaseObject
+class PhysicsInterface : virtual public BaseObject
 {
 

orxonox/trunk/src/story_entities/world.cc

@@ -381 +381 @@
       while( element != NULL)
         {
-          WorldEntity* created = (WorldEntity*) loader->fabricate( element);
+          WorldEntity* created = dynamic_cast<WorldEntity*>( loader->fabricate( element));
           if( created != NULL) this->spawn( created);
           // if we load a 'Player' we use it as localPlayer

orxonox/trunk/src/world_entities/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+#include "physics_interface.h"
 
 template<class T> class tList;
@@ -16 +17 @@
 
 //! Basic controllable WorldEntity
-class Player : public WorldEntity 
+class Player : public WorldEntity, public PhysicsInterface
 {
   friend class World;

orxonox/trunk/src/world_entities/test_gun.cc

@@ -144 +144 @@
     }
 
-  Projectile* pj = (TestBullet*)ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET);
+  Projectile* pj = dynamic_cast<TestBullet*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
 
   //printf( "object ref %p\n", ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));