Changeset 4931 in orxonox.OLD

Timestamp:

Jul 22, 2005, 2:26:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more elaborate (see last commit)
also a flush…. have to go to sleep… i am f tired

Location:

orxonox/trunk/src

Files:

• util/object_manager.cc (modified) (1 diff)
• util/object_manager.h (modified) (5 diffs)
• world_entities/weapons/test_gun.cc (modified) (1 diff)

orxonox/trunk/src/util/object_manager.cc

@@ -108 +108 @@
 }
 
+
+
 /**
  *  constructor

orxonox/trunk/src/util/object_manager.h

@@ -21 +21 @@
 
 #include "base_object.h"
+#include "class_id.h"
 
 template<class T> class tList;
@@ -57 +58 @@
 
 /**
- * Creates a factory to a Loadable Class.
- * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
+ * Creates a factory to a Loadable FastObject.
  */
-#define CREATE_FAST_FACTORY(CLASS_NAME, CLASS_ID) \
-    tObject<CLASS_NAME>* global_##CLASS_NAME##_Object = new tObject<CLASS_NAME>(#CLASS_NAME, CLASS_ID)
+#define CREATE_FAST_OBJECT(CLASS_NAME, CLASS_ID) \
+    tFastObject<CLASS_NAME>* global_##CLASS_NAME##_FastObject = new tFastObject<CLASS_NAME>(#CLASS_NAME, CLASS_ID)
 
-//! The Factory is a loadable object handler
+//! The FastObject is a loadable object handler
 class FastObject : public BaseObject {
 
@@ -75 +75 @@
     /** sets the Next factory in the list @param nextFactory the next factory */
     inline void setNext( FastObject* nextFastObject) { this->next = nextFastObject; };
-    /** @returns the first factory */
+    /** @returns the first FastObject */
     static FastObject* getFirst() { return FastObject::first; };
-    /** @returns the next factory */
+    /** @returns the next FastObject */
     FastObject* getNext() const { return this->next; };
 
+  protected:
+    ClassID              storedClassID;        //!< The classID of the specified class.
+
   private:
-    FastObject*          next;                 //!< pointer to the next factory.
-    static FastObject*   first;                //!< A pointer to the first factory.
-    ClassID              storedClassID;        //!< The classID of the specified class.
+    FastObject*          next;                 //!< pointer to the next FastObject.
+    static FastObject*   first;                //!< A pointer to the first FastObject.
 };
 
 /**
- *  a factory that is able to load any kind of Object
-   (this is a Functor)
+ *  a FastObject that is able to load any kind of Object
+ * (this is a Functor)
  */
 template<class T> class tFastObject : public FastObject
@@ -100 +102 @@
 
 /**
- * construnts a factory with
- * @param factoryName the name of the factory
+ * construnts a FastObject with
+ * @param fastObjectName the name of the FastObject
+ * @param fastObject the ID of the class
  */
 template<class T>
@@ -112 +115 @@
 BaseObject* tFastObject<T>::fabricate(ClassID fastObject)
 {
-  if(this->classID == fastObject)
-    return new T ( root);
-  else if( getNext() != NULL)
-    return getNext()->fabricate( root);
-  else
+//  if(this->classID == fastObject)
+    //return new T ();
+  //else if( getNext() != NULL)
+//    return getNext()->fabricate();
+//  else
     return NULL;
 }

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -34 +34 @@
 
 #include "object_manager.h"
+
+CREATE_FAST_OBJECT(TestGun, CL_TEST_GUN);
 
 using namespace std;