Changeset 6278 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 24, 2005, 7:14:06 PM (18 years ago)

Author:

bensch

Message:

trunk: christmas commit…. fixed baseObject

Location:

trunk/src/lib/lang

Files:

• base_object.cc (modified) (1 diff)
• class_list.cc (modified) (3 diffs)
• class_list.h (modified) (2 diffs)

trunk/src/lib/lang/base_object.cc

@@ -79 +79 @@
   this->className = className;
 
-  ClassList::addToClassList(this, classID, className);
-}
-
-/**
-  \brief set the name of the Object
+  ClassList::addToClassList(this, classID, this->classID, className);
+}
+
+/**
+ * @briefbrief set the name of the Object
  */
 void BaseObject::setName (const char* objectName)

trunk/src/lib/lang/class_list.cc

@@ -37 +37 @@
  *  Creates a new ClassList
 */
-ClassList::ClassList(ClassID classID, const char* className)
+ClassList::ClassList(ClassID classID, unsigned long classIDFull, const char* className)
 {
   this->className = className;
   this->classID = classID;
+  this->classIDFull = classIDFull;
 }
 
@@ -66 +67 @@
  * !! Before unsing the ClassList, as it creates the ClassLits
  */
-void ClassList::addToClassList(BaseObject* objectPointer, ClassID classID, const char* className)
+void ClassList::addToClassList(BaseObject* objectPointer, ClassID classID, unsigned long classIDFull, const char* className)
 {
   if (unlikely(classList == NULL))
@@ -78 +79 @@
   else
   {
-    ClassList::classList->push_back(ClassList(classID, className));
+    ClassList::classList->push_back(ClassList(classID, classIDFull, className));
     ClassList::classList->back().objectList.push_back(objectPointer);
   }

trunk/src/lib/lang/class_list.h

@@ -31 +31 @@
  */
 class ClassList {
-
   public:
-    ClassList(ClassID classID, const char* className);
+    ClassList(ClassID classID, unsigned long classIDFull, const char* className);
     virtual ~ClassList();
 
-    // STATIC FUNCTIONS
-    static void                           addToClassList(BaseObject* objectPointer, ClassID classID, const char* className);
+    /* MAINTENANCE FUNCTIONS THESE ARE !!ONLY FOR BASEOBJECT !! */
+    static void                           addToClassList(BaseObject* objectPointer, ClassID classID, unsigned long classIDFull, const char* className);
     static void                           removeFromClassList(BaseObject* objectPointer);
+
+
 
     static const std::list<BaseObject*>*  getList(ClassID classID = CL_NULL);// { return (ClassList* fl = ClassList::getClassList(classID) != NULL)? &(fl->objectList) : NULL; };
@@ -59 +60 @@
 
   private:
-
     static ClassList*                     getClassList(ClassID classID);
     static ClassList*                     getClassList(const char* className);
 
   private:
+    ClassID                         classID;                //!< ClassID stored in this ClassList
+    unsigned long                   classIDFull;            //!< The Full ClassID of this Class.
 
-    ClassID                         classID;                //!< ClassID stored in this ClassList
     const char*                     className;              //!< Name of the Class Stored here