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

Timestamp:

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

Author:

bensch

Message:

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

Location:

branches/new_class_id/src/lib/util

Files:

• Makefile.am (modified) (5 diffs)
• loading/dynamic_loader.cc (modified) (1 diff)
• loading/factory.cc (modified) (6 diffs)
• loading/factory.h (modified) (5 diffs)
• loading/fast_factory.cc (moved) (moved from branches/new_class_id/src/util/fast_factory.cc)
• loading/fast_factory.h (moved) (moved from branches/new_class_id/src/util/fast_factory.h) (1 diff)

branches/new_class_id/src/lib/util/Makefile.am

@@ -2 +2 @@
 include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXlibutil.a
+noinst_LIBRARIES = \
+                libORXlibutil.a \
+                libORXexecutor.a
+
+libORXexecutor_a_SOURCES = \
+                executor/executor.cc \
+                executor/executor_functional.cc \
+                executor/executor_lua.cc
 
 libORXlibutil_a_SOURCES = \
@@ -9 +16 @@
                 helper_functions.cc \
                 multi_type.cc \
-                executor/executor.cc \
-                executor/executor_functional.cc \
-                executor/executor_lua.cc \
                 \
                 loading/resource_manager.cc \
@@ -19 +23 @@
                 loading/load_param_description.cc \
                 loading/factory.cc \
-                loading/dynamic_loader.cc \
+                loading/fast_factory.cc \
                 \
                 filesys/file.cc \
@@ -28 +32 @@
                 threading.cc \
                 timer.cc
+
+#               loading/dynamic_loader.cc
 
 
@@ -55 +61 @@
                 loading/load_param_description.h \
                 loading/factory.h \
+                loading/fast_factory.h \
                 loading/dynamic_loader.h \
                 \

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

@@ -31 +31 @@
 */
 DynamicLoader::DynamicLoader (const std::string& libName)
-    : Factory(NULL, 0)
+    : Factory(libName)
 {
   this->registerObject(this, DynamicLoader::_objectList);

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());
-}

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

@@ -20 +20 @@
 
 
-#ifndef _FACTORY_H
-#define _FACTORY_H
+#ifndef __FACTORY_H
+#define __FACTORY_H
 
 class BaseObject;
@@ -27 +27 @@
 #include "parser/tinyxml/tinyxml.h"
 #include "base_object.h"
-#include <vector>
 #include <list>
 
@@ -34 +33 @@
  * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
  */
-#define CREATE_FACTORY(CLASS_NAME, CLASS_ID) \
-    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(#CLASS_NAME, CLASS_ID)
+#define CREATE_FACTORY(CLASS_NAME) \
+    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(CLASS_NAME::classID())
 
 //! The Factory is a loadable object handler
@@ -48 +47 @@
   static  BaseObject* fabricate(const std::string& className);
   static  BaseObject* fabricate(const NewClassID& classID);
-  static  BaseObject* fabricate(int classID);
-  static  BaseObject* fabricate(const TiXmlElement* root = NULL);
+  static  BaseObject* fabricate(const TiXmlElement* root);
 
 
   bool operator==(int classID) const;
-  bool operator==(const char* className) const;
   bool operator==(const std::string& className) const;
+  bool operator==(const NewClassID& classID) const { return _classID == classID; };
 
 protected:
-  Factory (const std::string& factoryName, int classID);
+  Factory (const NewClassID& id);
   virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
 
+private:
+  Factory (const Factory&) {};
+
 protected:
-  const int                     _classID;              //!< The Class-Identifyer of the Factory.
-  const std::string             _className;            //!< The name of the Class.
+  const NewClassID              _classID;              //!< The Class-Identifyer of the Factory.
   static std::list<Factory*>*   _factoryList;          //!< List of Registered Factories
 };
@@ -78 +78 @@
    * @param classID the ID of the Class to be created.
    */
-  tFactory (const char* factoryName, int classID)
-      : Factory(factoryName, classID)
+  tFactory (const NewClassID& classID)
+      : Factory(classID)
   {  }
 
 private:
+  tFactory (const tFactory&) {};
   /**
    * @brief fabricates an Object of type T, with the constructor T::T(const TiXmlElemnt*)

branches/new_class_id/src/lib/util/loading/fast_factory.h

@@ -122 +122 @@
 {
 public:
-  static tFastFactory<T>* getFastFactory(const NewClassID& classID, const std::string& fastFactoryName = NULL);
+  static tFastFactory<T>* getFastFactory(const NewClassID& classID, const std::string& fastFactoryName);
 
 private: