Changeset 9709 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/factory.cc

Timestamp:

Aug 31, 2006, 10:51:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: new_class ID working, adapdet many classes, and reinvented some of the ClassID stuff

File:

• branches/new_class_id/src/lib/util/loading/factory.cc (modified) (6 diffs)

branches/new_class_id/src/lib/util/loading/factory.cc

@@ -28 +28 @@
  * set everything to zero and define factoryName
  */
-Factory::Factory (const std::string& factoryName, int classID)
-    : _classID(classID), _className(factoryName)
+Factory::Factory (const NewClassID& classID)
+    : _classID(classID)
 {
-  this->registerObject(this, Factory::_objectList);
-  this->setName(factoryName);
+  printf("Factory::create(%s::%d)\n", classID.name().c_str(), classID.id());
+  //this->registerObject(this, Factory::_objectList);
+  this->setName(classID.name());
 
   if( Factory::_factoryList == NULL)
@@ -79 +80 @@
 }
 
-/**
- * @brief Compares the Factories Name against a given ClassName
- * @param className the Name of the Class to Query
- * @returns true on match, false otherwise.
- */
-bool Factory::operator==(const char* className) const
-{
-  return (className != NULL && this->_className == className);
-}
 
 /**
@@ -96 +88 @@
 bool Factory::operator==(const std::string& className) const
 {
-  return (this->_className == className);
+  return (this->_classID.name() == className);
 }
 
@@ -143 +135 @@
 }
 
-
 /**
  * @brief Creates a new Object of type classID
@@ -149 +140 @@
  * @returns a new Object of Type classID on match, NULL otherwise
  */
-BaseObject* Factory::fabricate(int classID)
+BaseObject* Factory::fabricate(const NewClassID& classID)
 {
   if (Factory::_factoryList == NULL)
@@ -157 +148 @@
   for (factory = Factory::_factoryList->begin(); factory != Factory::_factoryList->end(); factory++)
     if (*(*factory) == classID)
-    {
-      PRINTF(4)("Create a new Object of type %s\n", (*factory)->getCName());
-      return (*factory)->fabricateObject(NULL);
+  {
+    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getCName());
+    return (*factory)->fabricateObject(NULL);
 
-    }
-  PRINTF(2)("Could not Fabricate an Object of ClassID '0x%h'\n", classID);
+  }
+  PRINTF(2)("Could not Fabricate an Object of ClassID '%d'\n", classID.id());
   return NULL;
 }
-
-
-/**
- * @brief Creates a new Object of type classID
- * @param classID the ClassID to match for the newly created Object
- * @returns a new Object of Type classID on match, NULL otherwise
- */
-BaseObject* Factory::fabricate(const NewClassID& classID)
-{
-  return Factory::fabricate(classID.id());
-}