Changeset 9924 in orxonox.OLD

Timestamp:

Nov 9, 2006, 7:16:15 PM (17 years ago)

Author:

bensch

Message:

network: removed obsolete class_id_DEPRECATED.h and adapted the objectList… now the compile bugs have to be fixed

Location:

branches/network/src

Files:

• Makefile.am (modified) (1 diff)
• defs/class_id_DEPRECATED.h (deleted)
• lib/graphics/light.cc (modified) (1 diff)
• lib/graphics/render2D/image_plane.cc (modified) (1 diff)
• lib/lang/object_list.cc (modified) (6 diffs)
• lib/lang/object_list.h (modified) (5 diffs)

branches/network/src/Makefile.am

@@ -59 +59 @@
                 defs/globals.h \
                 defs/compiler.h \
-                defs/class_id_DEPRECATED.h \
                 subprojects/benchmark.h
 

branches/network/src/lib/graphics/light.cc

@@ -26 +26 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(Light, CL_LIGHT);
+ObjectListDefinition(Light);
 CREATE_FACTORY(Light);
 

branches/network/src/lib/graphics/render2D/image_plane.cc

@@ -23 +23 @@
 #include "p_node.h"
 
-
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
+ObjectListDefinition(ImagePlane);
 CREATE_FACTORY(ImagePlane);
 

branches/network/src/lib/lang/object_list.cc

@@ -25 +25 @@
  * @return a new NewObejctList
  */
-ObjectListBase::ObjectListBase(const std::string& className, int id)
+ObjectListBase::ObjectListBase(const std::string& className)
     : _name(className)
 {
@@ -36 +36 @@
   assert(!ObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
 
-  if (id == -1)
-  {
-    id = ObjectListBase::_classesByID->size();
-    // searching for a free ID
-    while (ObjectListBase::classIDExists(id)) ++id;
-  }
+  int id = ObjectListBase::_classesByID->size();
+  // searching for a free ID
+  while (ObjectListBase::classIDExists(id)) ++id;
+
   assert(!ObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
 
@@ -342 +340 @@
     assert( false && "size of str2id does not match" );
   }
-  
+
   IDMap * map = new IDMap();
-  
+
   std::map< std::string, int >::const_iterator it;
   for ( it = str2id.begin(); it != str2id.end(); it++ )
@@ -352 +350 @@
     (*map)[ it->second ]->_id = it->second;
   }
-  
+
   delete _classesByID;
   _classesByID = map;
@@ -358 +356 @@
 
 /**
- * 
- * @return 
+ *
+ * @return
  */
 std::map< std::string, int > * ObjectListBase::createStrToId( )
 {
   std::map< std::string, int > * res = new std::map< std::string, int >();
-  
+
   NameMap::const_iterator it;
   for ( it = _classesByName->begin(); it != _classesByName->end(); it++ )
@@ -378 +376 @@
       }
     }
-    
+
     assert( id != -1 );
     (*res)[ it->first ] = id;
   }
-  
+
   return res;
 }

branches/network/src/lib/lang/object_list.h

@@ -32 +32 @@
  * @brief Use this macro to easily define a Class to store its own ObjectListDefinition
  * @param ClassName: the Name of the Class.
- * @param ID: optional set a Fixed ID.
- */
-#define ObjectListDefinitionID(ClassName, ID) \
-   ObjectList<ClassName> ClassName::_objectList(#ClassName, ID)
-
-/**
- * @brief Use this macro to easily define a Class to store its own ObjectListDefinition
- * @param ClassName: the Name of the Class.
  */
 #define ObjectListDefinition(ClassName) \
-    ObjectListDefinitionID(ClassName, -1)
+    ObjectList<ClassName> ClassName::_objectList(#ClassName)
 
 class BaseObject;
@@ -109 +101 @@
 
 protected:
-  ObjectListBase(const std::string& className, int id = -1);
+  ObjectListBase(const std::string& className);
   virtual ~ObjectListBase();
 
@@ -133 +125 @@
   static NameMap*               _classesByName;     //!< A Map of all the classes in existance.
   static std::list<std::string> _classNames;        //!< A list of all the registered ClassNames.
-  
+
 public:
   static void replaceIDMap( const std::map<std::string, int>& str2id );
@@ -203 +195 @@
 
 public:
-  ObjectList(const std::string& name, int id = -1);
+  ObjectList(const std::string& name);
   ~ObjectList();
 
@@ -260 +252 @@
  */
 template <class T>
-ObjectList<T>::ObjectList(const std::string& name, int id)
-    : ObjectListBase(name, id)
+ObjectList<T>::ObjectList(const std::string& name)
+    : ObjectListBase(name)
 {}