Changeset 4742 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 30, 2005, 4:38:33 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: BaseObject now only knows setClassID → standartisation

Location:

orxonox/trunk/src

Files:

• defs/class_id.h (moved) (moved from orxonox/trunk/src/defs/class_list.h) (4 diffs)
• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/coord/p_node.cc (modified) (1 diff)
• lib/lang/base_object.cc (modified) (2 diffs)
• lib/lang/base_object.h (modified) (4 diffs)
• lib/physics/fields/gravity.cc (modified) (1 diff)
• lib/physics/fields/gravity.h (modified) (1 diff)
• lib/physics/fields/point_gravity.cc (modified) (3 diffs)
• lib/physics/fields/twirl.cc (modified) (3 diffs)

orxonox/trunk/src/defs/class_id.h

@@ -17 +17 @@
 
 /*!
-    \file class_list.h
-    \brief list of orxonox classes
+    \file class_id.h
+    \brief list of orxonox classID's
 
     this File is used to identify an Object with its class and also with its sub/super-classes.
@@ -31 +31 @@
 */
 
-#ifndef _CLASS_LIST_H
-#define _CLASS_LIST_H
-
-
-#define ClassDefinition(CLASS_DEFINITION, CLASS_VALUE, CLASS_NAME) \
-                  CLASS_DEFINITION
+#ifndef _CLASS_ID_H
+#define _CLASS_ID_H
 
 //! list of all classes to be loadable in via the ObjectManager
@@ -130 +126 @@
   // Physics stuff (range from 0x00000600 to 0x000007ff)
   CL_PHYSICS_CONNECTION   =    0x00000601,
+  CL_FIELD_GRAVITY        =    0x00000610,
+  CL_FIELD_POINT_GRAVITY  =    0x00000611,
+  CL_FIELD_TWIRL          =    0x00000612,
+
+
   // Collision
   CL_COLLISION            =    0x00000611,
@@ -177 +178 @@
 
 
-#endif /* _CLASS_LIST_H */
+#endif /* _CLASS_ID_H */

orxonox/trunk/src/lib/collision_detection/cd_engine.cc

@@ -31 +31 @@
 CDEngine::CDEngine ()
 {
-   this->setClassName("CDEngine");
    this->setClassID(CL_CD_ENGINE, "CDEngine");
 

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

@@ -101 +101 @@
 void PNode::init(PNode* parent)
 {
-  this->setClassID(CL_PARENT_NODE);
+  this->setClassID(CL_PARENT_NODE, "PNode");
   this->children = new tList<PNode>();
   this->bRelCoorChanged = true;

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

@@ -68 +68 @@
 void BaseObject::setClassID(long classID, const char* className)
 {
-  this->setClassID(classID);
-  this->setClassName(className);
-}
-
-
-/**
-   \brief sets the class identifier
-   \param id a number for the class from class_list.h enumeration
-*/
-void BaseObject::setClassID (long classID)
-{
   this->classID |= classID;
-}
-
-
-/**
-   \brief sets the class identifiers
-   \param className the class name
-*/
-void BaseObject::setClassName(const char* className)
-{
   this->className = className;
 }
@@ -95 +75 @@
   \brief set the name of the Object
  */
-             void BaseObject::setName (const char* objectName)
+void BaseObject::setName (const char* objectName)
 {
   if (this->objectName)

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

@@ -4 +4 @@
 
     This is a global handler for all classes.
-
-    \todo isA()
 */
 
@@ -12 +10 @@
 #define _BASE_OBJECT_H
 
-#include "class_list.h"
+#include "class_id.h"
 #ifndef NULL
 #define NULL 0x0        //!< NULL
@@ -45 +43 @@
 
  protected:
-  void setClassID(long classID);
-  void setClassName(const char* className);
   void setClassID(long classID, const char* className);
 
@@ -52 +48 @@
   void finalize(void) { this->finalized = true; };
 
- private:
-  const char*    className;        //!< the name of the class
-  long           classID;          //!< this is the id from the class_list.h enumeration
-  char*          objectName;       //!< The name of this object
+  private:
+    static void addToClassList(BaseObject* object, ClassID id, const char* className);
 
-  bool           finalized;        //!< is true if the object is ready to be garbage collected
+  private:
+    const char*        className;        //!< the name of the class
+    long               classID;          //!< this is the id from the class_list.h enumeration
+    char*              objectName;       //!< The name of this object
+
+    bool               finalized;        //!< is true if the object is ready to be garbage collected
+
+//    static ClassList*  classList;
 };
 

orxonox/trunk/src/lib/physics/fields/gravity.cc

@@ -25 +25 @@
 CREATE_FACTORY(Gravity);
 
-/**
-   \brief standard constructor
-   \todo this constructor is not jet implemented - do it
-*/
-Gravity::Gravity ()
-{
-   this->setClassName("Gravity");
-}
-
 Gravity::Gravity(const TiXmlElement* root)
 {
-  this->setClassName("Gravity");
+  this->setClassID(CL_FIELD_GRAVITY, "Gravity");
 
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }
 

orxonox/trunk/src/lib/physics/fields/gravity.h

@@ -18 +18 @@
 
  public:
-  Gravity();
-  Gravity(const TiXmlElement* root);
+  Gravity(const TiXmlElement* root = NULL);
   virtual ~Gravity();
 

orxonox/trunk/src/lib/physics/fields/point_gravity.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -25 +25 @@
    \todo this constructor is not jet implemented - do it
 */
-PointGravity::PointGravity () 
+PointGravity::PointGravity ()
 {
-   this->setClassName ("PointGravity");
+   this->setClassID(CL_FIELD_POINT_GRAVITY, "PointGravity");
 }
 
@@ -35 +35 @@
 
 */
-PointGravity::~PointGravity () 
+PointGravity::~PointGravity ()
 {
   // delete what has to be deleted here

orxonox/trunk/src/lib/physics/fields/twirl.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -25 +25 @@
    \todo this constructor is not jet implemented - do it
 */
-Twirl::Twirl () 
+Twirl::Twirl ()
 {
-   this->setClassName ("Twirl");
+   this->setClassID(CL_FIELD_TWIRL, "Twirl");
 }
 
@@ -35 +35 @@
 
 */
-Twirl::~Twirl () 
+Twirl::~Twirl ()
 {
   // delete what has to be deleted here