Changeset 9691 in orxonox.OLD for branches/new_class_id/src/lib/lang

Timestamp:

Aug 22, 2006, 11:45:21 PM (18 years ago)

Author:

bensch

Message:

new_class_id: adapted Network

Location:

branches/new_class_id/src/lib/lang

Files:

• base_object.cc (modified) (2 diffs)
• base_object.h (modified) (4 diffs)
• new_class_id.h (modified) (2 diffs)
• new_object_list.h (modified) (1 diff)

branches/new_class_id/src/lib/lang/base_object.cc

@@ -21 +21 @@
 #include "util/loading/load_param.h"
 
+NewObjectListDefinition(BaseObject);
+
 /**
  * @brief sets the name from a LoadXML-Element
@@ -26 +28 @@
  */
 BaseObject::BaseObject(const std::string& objectName)
+  : _leafClassID(&BaseObject::classID())
 {
   this->className = "BaseObject";

branches/new_class_id/src/lib/lang/base_object.h

@@ -26 +26 @@
 class BaseObject : public sigslot::has_slots<>
 {
-
+  NewObjectListDeclaration(BaseObject);
 public:
   BaseObject (const std::string& objectName = "");
@@ -49 +49 @@
 
   /** @returns the ID of the Topmost object of the ClassStack */
-  inline int getLeafClassID() const { return _classes.front()._objectList->id(); }
+  inline const int& getLeafClassID() const { return _leafClassID->id(); }
 
   bool isA(const NewObjectListBase& objectList) const;
@@ -88 +88 @@
   std::string                         className;    //!< the name of the class
   ClassList                           _classes;     //!< All Classes this object is part of.
-
+  const NewClassID*                       _leafClassID;  //!< Topmost ClassID.
 };
 
@@ -104 +104 @@
 inline void BaseObject::registerObject(T* object, NewObjectList<T>& objectList)
 {
+  this->_leafClassID = &objectList.identity();
   this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object)));
 }

branches/new_class_id/src/lib/lang/new_class_id.h

@@ -17 +17 @@
   NewClassID(int id, const std::string& name) : _id(id), _name(name) { };
   // the copy constructor is also defined.
-  int id() const { return _id; };
+  const int& id() const { return _id; };
   const std::string& name() const { return _name; };
 
@@ -23 +23 @@
   bool operator==(int id) const { return _id == id; };
   bool operator==(const std::string& name) const { return _name == name; };
+  bool operator!=(NewClassID id) const { return _id != id._id && _name != id._name; };
+  bool operator!=(int id) const { return _id != id; };
+  bool operator!=(const std::string& name) const { return _name != name; };
 
 private:

branches/new_class_id/src/lib/lang/new_object_list.h

@@ -25 +25 @@
   public: \
    static inline const NewObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
-   static inline const NewClassID classID() { return ClassName::_objectList.identity(); }; \
+   static inline const NewClassID& classID() { return ClassName::_objectList.identity(); }; \
   private: \
    static NewObjectList<ClassName> _objectList