Changeset 9676 in orxonox.OLD for trunk/src/lib/lang/new_object_list.h

Timestamp:

Aug 21, 2006, 11:09:53 PM (18 years ago)

Author:

bensch

Message:

trunk: Better ID handling, now it is possible, to use pre-defined ID's, as it was with the old appreach

File:

• trunk/src/lib/lang/new_object_list.h (modified) (6 diffs)

trunk/src/lib/lang/new_object_list.h

@@ -37 +37 @@
   bool operator==(const std::string& name) const { return _name == name; };
 
-
-  /// Comparing operators.
-//   struct CompareID  {
-//     bool operator()(const NewObjectListBase* less, const NewObjectListBase* more) { return less->id() < more->id(); };
-//   };
-//   struct CompareName{
-//     bool operator()(const NewObjectListBase* less, const NewObjectListBase* more) { return less->name() < more->name(); };
-//   };
-
   virtual void debug() const = 0;
 
-  static unsigned int                   classCount() { return _idCounter; };
+  static unsigned int                   classCount();
   static const std::string&             IDToString(int classID);
   static int                            StringToID(const std::string& className);
@@ -57 +48 @@
 
 protected:
-  NewObjectListBase(const std::string& className);
+  NewObjectListBase(const std::string& className, int id = -1);
   virtual ~NewObjectListBase();
 
@@ -63 +54 @@
   NewObjectListBase(const NewObjectListBase&);
 
+  static bool classIDExists(int id);
   static bool classNameExists(const std::string& className);
 
@@ -73 +65 @@
 
 private:
-
-  static int                    _idCounter;         //!< A counter, that gives all classes a Unique ClassID. Access to this Variable is to be Thread-Safe.
   static classIDMap*            _classesByID;       //!< A Map of all the classes in existance.
   static classNameMap*          _classesByName;     //!< A Map of all the classes in existance.
@@ -110 +100 @@
 
 public:
-  NewObjectList(const std::string& name);
+  NewObjectList(const std::string& name, int id = -1);
   ~NewObjectList();
 
@@ -137 +127 @@
 /////////////////////////
 template <class T>
-NewObjectList<T>::NewObjectList(const std::string& name)
-    : NewObjectListBase(name)
+NewObjectList<T>::NewObjectList(const std::string& name, int id)
+    : NewObjectListBase(name, id)
 {}