Changeset 4315 in orxonox.OLD for orxonox/trunk

Timestamp:

May 26, 2005, 11:38:39 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: removed deprecated class base_entity and updated the class_list

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• class_list.h (added)
• lib/lang/base_entity.cc (deleted)
• lib/lang/base_entity.h (deleted)
• util/object_manager.h (modified) (2 diffs)

orxonox/trunk/src/Makefile.am

@@ -88 +88 @@
                  lib/graphics/particles/particle_system.cc \
                  lib/graphics/particles/particle_emitter.cc \
-                 lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
@@ -158 +157 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
-                 lib/lang/base_entity.h \
                  lib/lang/base_object.h \
                  util/common/list.h \

orxonox/trunk/src/Makefile.in

@@ -73 +73 @@
         material.$(OBJEXT) texture.$(OBJEXT) particle_engine.$(OBJEXT) \
         particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
-        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
-        ini_parser.$(OBJEXT) substring.$(OBJEXT) vector.$(OBJEXT) \
-        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
+        base_object.$(OBJEXT) ini_parser.$(OBJEXT) substring.$(OBJEXT) \
+        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
         benchmark.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
@@ -85 +84 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/animation3d.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/animation_player.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_entity.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_object.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/benchmark.Po ./$(DEPDIR)/camera.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
@@ -305 +303 @@
                  lib/graphics/particles/particle_system.cc \
                  lib/graphics/particles/particle_emitter.cc \
-                 lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
@@ -375 +372 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
-                 lib/lang/base_entity.h \
                  lib/lang/base_object.h \
                  util/common/list.h \
@@ -472 +468 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animation_player.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark.Po@am__quote@
@@ -1276 +1271 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_emitter.obj `if test -f 'lib/graphics/particles/particle_emitter.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_emitter.cc'; fi`
-
-base_entity.o: lib/lang/base_entity.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_entity.o -MD -MP -MF "$(DEPDIR)/base_entity.Tpo" -c -o base_entity.o `test -f 'lib/lang/base_entity.cc' || echo '$(srcdir)/'`lib/lang/base_entity.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_entity.Tpo" "$(DEPDIR)/base_entity.Po"; else rm -f "$(DEPDIR)/base_entity.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/lang/base_entity.cc' object='base_entity.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_entity.Po' tmpdepfile='$(DEPDIR)/base_entity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_entity.o `test -f 'lib/lang/base_entity.cc' || echo '$(srcdir)/'`lib/lang/base_entity.cc
-
-base_entity.obj: lib/lang/base_entity.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT base_entity.obj -MD -MP -MF "$(DEPDIR)/base_entity.Tpo" -c -o base_entity.obj `if test -f 'lib/lang/base_entity.cc'; then $(CYGPATH_W) 'lib/lang/base_entity.cc'; else $(CYGPATH_W) '$(srcdir)/lib/lang/base_entity.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/base_entity.Tpo" "$(DEPDIR)/base_entity.Po"; else rm -f "$(DEPDIR)/base_entity.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/lang/base_entity.cc' object='base_entity.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/base_entity.Po' tmpdepfile='$(DEPDIR)/base_entity.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_entity.obj `if test -f 'lib/lang/base_entity.cc'; then $(CYGPATH_W) 'lib/lang/base_entity.cc'; else $(CYGPATH_W) '$(srcdir)/lib/lang/base_entity.cc'; fi`
 
 base_object.o: lib/lang/base_object.cc

orxonox/trunk/src/util/object_manager.h

@@ -11 +11 @@
     TO ADD SUPPORT FOR A CLASS do the following steps:
     1. include the hader file : #include "class_header.h"
-    2. add the class to the type enum classList {};
+    2. add the class to the type enum classList {}; in class_list.h
     3. define a function void mCache( ClassName ) in class ObjectManager
 
@@ -24 +24 @@
 #include "list.h"
 
-#define OM_
-
-
-//! list of all classes to be loadable in via the ObjectManager
-typedef enum classList 
-{
-  CL_PROJECTILE,
-  CL_TEST_BULLET,
-
-  CL_NUMBER
-};
+#include "class_list.h"