Changeset 4571 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 10, 2005, 12:58:27 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: no more HelperParent. this was one useless peace of sh

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• defs/class_list.h (modified) (5 diffs)
• lib/coord/helper_parent.cc (deleted)
• lib/coord/helper_parent.h (deleted)
• lib/coord/p_node.cc (modified) (1 diff)
• lib/coord/p_node.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -63 +63 @@
                   lib/coord/p_node.cc \
                   lib/coord/null_parent.cc \
-                  lib/coord/helper_parent.cc \
                   lib/graphics/graphics_engine.cc \
                   lib/graphics/light.cc \
@@ -126 +125 @@
                  lib/coord/p_node.h \
                  lib/coord/null_parent.h \
-                 lib/coord/helper_parent.h \
                  lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \

orxonox/trunk/src/Makefile.in

@@ -65 +65 @@
         satellite.$(OBJEXT) character_attributes.$(OBJEXT) \
         test_gun.$(OBJEXT) test_bullet.$(OBJEXT) test_entity.$(OBJEXT) \
-        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        p_node.$(OBJEXT) null_parent.$(OBJEXT) \
         graphics_engine.$(OBJEXT) light.$(OBJEXT) \
         text_engine.$(OBJEXT) base_object.$(OBJEXT) \
@@ -88 +88 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/light.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po \
@@ -289 +288 @@
                   lib/coord/p_node.cc \
                   lib/coord/null_parent.cc \
-                  lib/coord/helper_parent.cc \
                   lib/graphics/graphics_engine.cc \
                   lib/graphics/light.cc \
@@ -352 +350 @@
                  lib/coord/p_node.h \
                  lib/coord/null_parent.h \
-                 lib/coord/helper_parent.h \
                  lib/graphics/graphics_engine.h \
                  lib/graphics/light.h \
@@ -460 +457 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glmenu_imagescreen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
@@ -1017 +1013 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.obj `if test -f 'lib/coord/null_parent.cc'; then $(CYGPATH_W) 'lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/null_parent.cc'; fi`
-
-helper_parent.o: lib/coord/helper_parent.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT helper_parent.o -MD -MP -MF "$(DEPDIR)/helper_parent.Tpo" -c -o helper_parent.o `test -f 'lib/coord/helper_parent.cc' || echo '$(srcdir)/'`lib/coord/helper_parent.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/helper_parent.Tpo" "$(DEPDIR)/helper_parent.Po"; else rm -f "$(DEPDIR)/helper_parent.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/helper_parent.cc' object='helper_parent.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/helper_parent.Po' tmpdepfile='$(DEPDIR)/helper_parent.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 helper_parent.o `test -f 'lib/coord/helper_parent.cc' || echo '$(srcdir)/'`lib/coord/helper_parent.cc
-
-helper_parent.obj: lib/coord/helper_parent.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT helper_parent.obj -MD -MP -MF "$(DEPDIR)/helper_parent.Tpo" -c -o helper_parent.obj `if test -f 'lib/coord/helper_parent.cc'; then $(CYGPATH_W) 'lib/coord/helper_parent.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/helper_parent.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/helper_parent.Tpo" "$(DEPDIR)/helper_parent.Po"; else rm -f "$(DEPDIR)/helper_parent.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/coord/helper_parent.cc' object='helper_parent.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/helper_parent.Po' tmpdepfile='$(DEPDIR)/helper_parent.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 helper_parent.obj `if test -f 'lib/coord/helper_parent.cc'; then $(CYGPATH_W) 'lib/coord/helper_parent.cc'; else $(CYGPATH_W) '$(srcdir)/lib/coord/helper_parent.cc'; fi`
 
 graphics_engine.o: lib/graphics/graphics_engine.cc

orxonox/trunk/src/defs/class_list.h

@@ -1 @@
-/*! 
+/*!
     \file class_list.h
     \brief list of orxonox classes
@@ -11 +11 @@
 
 //! list of all classes to be loadable in via the ObjectManager
-typedef enum classList 
+typedef enum classList
 {
   CL_ORXONOX,
 
   CL_PARENT,
-  CL_HELPER_PARENT,
   CL_NULL_PARENT,
   CL_CAMERA,
@@ -69 +68 @@
   CL_KEY_MAPPER,
 
-  CL_GRAPHICS_ENGINE,  
+  CL_GRAPHICS_ENGINE,
   CL_TEXT_ENGINE,
   CL_TEXT,
@@ -80 +79 @@
   CL_OBJMODEL,
   CL_PROMITIVE_MODEL,
-  
+
   CL_PARTICLE_EMITTER,
   CL_PARTICLE_ENGINE,
   CL_PARTICLE_SYSTEM,
-  
+
   CL_CD_ENGINE,
   CL_COLLISION,
@@ -94 +93 @@
   CL_OBB,
   CL_BOUNDING_SPHERE,
-  
+
 
   CL_NUMBER

orxonox/trunk/src/lib/coord/p_node.cc

@@ -447 +447 @@
    \brief displays some information about this pNode
 */
-void PNode::debug()
+void PNode::debug(unsigned int depth) const
 {
   PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n",

orxonox/trunk/src/lib/coord/p_node.h

@@ -94 +94 @@
   void update (float dt);
 
-  void debug ();
+  void debug (unsigned int depth = 1) const;
   void debugDraw(float size = 1.0) const;
 

orxonox/trunk/src/story_entities/world.cc

@@ -26 +26 @@
 #include "p_node.h"
 #include "null_parent.h"
-#include "helper_parent.h"
 #include "pilot_node.h"
 #include "track_node.h"