Changeset 5629 in orxonox.OLD for branches

Timestamp:

Nov 18, 2005, 12:32:35 PM (19 years ago)

Author:

bensch

Message:

we: added grid for ObjectManager

Location:

branches/world_entities/src/util

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)
• fast_factory.cc (modified) (1 diff)
• object_manager.cc (copied) (copied from branches/world_entities/src/proto/proto_singleton.cc) (3 diffs)
• object_manager.h (copied) (copied from branches/world_entities/src/proto/proto_singleton.h) (2 diffs)

branches/world_entities/src/util/Makefile.am

@@ -5 +5 @@
 
 libORXutils_a_SOURCES = fast_factory.cc \
+                        object_manager.cc \
                         loading/factory.cc \
                         garbage_collector.cc \
@@ -18 +19 @@
                         track/pilot_node.cc \
                         track/track_manager.cc \
-                        track/track_node.cc
+                        track/track_node.cc 
 
 noinst_HEADERS =        fast_factory.h \
+                        object_manager.h \
                         garbage_collector.h \
                         state.h \

branches/world_entities/src/util/Makefile.in

@@ -54 +54 @@
 libORXutils_a_AR = $(AR) $(ARFLAGS)
 libORXutils_a_LIBADD =
-am_libORXutils_a_OBJECTS = fast_factory.$(OBJEXT) factory.$(OBJEXT) \
+am_libORXutils_a_OBJECTS = fast_factory.$(OBJEXT) \
+        object_manager.$(OBJEXT) factory.$(OBJEXT) \
         garbage_collector.$(OBJEXT) state.$(OBJEXT) \
         user_control.$(OBJEXT) animation3d.$(OBJEXT) \
@@ -190 +191 @@
 noinst_LIBRARIES = libORXutils.a
 libORXutils_a_SOURCES = fast_factory.cc \
+                        object_manager.cc \
                         loading/factory.cc \
                         garbage_collector.cc \
@@ -203 +205 @@
                         track/pilot_node.cc \
                         track/track_manager.cc \
-                        track/track_node.cc
+                        track/track_node.cc 
 
 noinst_HEADERS = fast_factory.h \
+                        object_manager.h \
                         garbage_collector.h \
                         state.h \
@@ -278 +281 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_param.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_param_description.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pilot_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@

branches/world_entities/src/util/fast_factory.cc

@@ -13 +13 @@
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_OBJECT_MANAGER
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_LOAD
 
 #include "fast_factory.h"

branches/world_entities/src/util/object_manager.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "proto_singleton.h"
+#include "object_manager.h"
 
 using namespace std;
@@ -24 +24 @@
  * standard constructor
  */
-ProtoSingleton::ProtoSingleton ()
+ObjectManager::ObjectManager ()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoSingleton");
-   this->setName("ProtoSingleton");
-
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
-   !!!!!!!!!! IMPORTANT FOR SINGLETON !!!!!!!!!!!!!!!!
-        3. SingleTon MUST be CL_NEW_CLASS = 0x00000fxx
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
+   this->setClassID(CL_OBJECT_MANAGER, "ObjectManager");
+   this->setName("ObjectManager");
 }
 
@@ -46 +33 @@
  *  the singleton reference to this class
  */
-ProtoSingleton* ProtoSingleton::singletonRef = NULL;
+ObjectManager* ObjectManager::singletonRef = NULL;
 
 /**
    @brief standard deconstructor
  */
-ProtoSingleton::~ProtoSingleton ()
+ObjectManager::~ObjectManager ()
 {
-  ProtoSingleton::singletonRef = NULL;
+  ObjectManager::singletonRef = NULL;
 }

branches/world_entities/src/util/object_manager.h

@@ -1 +1 @@
 /*!
- * @file proto_singleton.h
+ * @file object_manager.h
  * @brief Definition of the ... singleton Class
 */
 
-#ifndef _PROTO_SINGLETON_H
-#define _PROTO_SINGLETON_H
+#ifndef _OBJECT_MANAGER_H
+#define _OBJECT_MANAGER_H
 
 #include "base_object.h"
@@ -12 +12 @@
 
 //! A default singleton class.
-class ProtoSingleton : public BaseObject {
+class ObjectManager : public BaseObject {
 
  public:
-  virtual ~ProtoSingleton(void);
+  virtual ~ObjectManager(void);
   /** @returns a Pointer to the only object of this Class */
-  inline static ProtoSingleton* getInstance(void) { if (!singletonRef) singletonRef = new ProtoSingleton();  return singletonRef; };
+  inline static ObjectManager* getInstance(void) { if (!ObjectManager::singletonRef) ObjectManager::singletonRef = new ObjectManager();  return ObjectManager::singletonRef; };
 
  private:
-  ProtoSingleton(void);
-  static ProtoSingleton* singletonRef;
+  ObjectManager(void);
+  static ObjectManager* singletonRef;
 };
 
-#endif /* _PROTO_SINGLETON_H */
+#endif /* _OBJECT_MANAGER_H */