Changeset 3678 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 30, 2005, 6:55:15 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: deleted class primitive, because model has the same ability now

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• orxonox.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (2 diffs)
• world_entities/primitive.cc (deleted)
• world_entities/primitive.h (deleted)
• world_entities/projectile.cc (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -44 +44 @@
                  world_entities/skysphere.cc \
                  world_entities/terrain.cc \
-                 world_entities/primitive.cc \
                  world_entities/weapon.cc \
                  world_entities/projectile.cc \
@@ -95 +94 @@
                  world_entities/power_up.h \
                  world_entities/terrain.h \
-                 world_entities/primitive.h \
                  world_entities/weapon.h \
                  world_entities/projectile.h \

orxonox/trunk/src/Makefile.in

@@ -59 +59 @@
         story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
         world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
-        skysphere.$(OBJEXT) terrain.$(OBJEXT) primitive.$(OBJEXT) \
-        weapon.$(OBJEXT) projectile.$(OBJEXT) \
-        character_attributes.$(OBJEXT) test_gun.$(OBJEXT) ai.$(OBJEXT) \
-        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        skysphere.$(OBJEXT) terrain.$(OBJEXT) weapon.$(OBJEXT) \
+        projectile.$(OBJEXT) character_attributes.$(OBJEXT) \
+        test_gun.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
+        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
         data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
         fontset.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
@@ -92 +92 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/primitive.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/player.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
@@ -250 +250 @@
                  world_entities/skysphere.cc \
                  world_entities/terrain.cc \
-                 world_entities/primitive.cc \
                  world_entities/weapon.cc \
                  world_entities/projectile.cc \
@@ -301 +300 @@
                  world_entities/power_up.h \
                  world_entities/terrain.h \
-                 world_entities/primitive.h \
                  world_entities/weapon.h \
                  world_entities/projectile.h \
@@ -435 +433 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
@@ -595 +592 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o terrain.obj `if test -f 'world_entities/terrain.cc'; then $(CYGPATH_W) 'world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/terrain.cc'; fi`
-
-primitive.o: world_entities/primitive.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive.o -MD -MP -MF "$(DEPDIR)/primitive.Tpo" -c -o primitive.o `test -f 'world_entities/primitive.cc' || echo '$(srcdir)/'`world_entities/primitive.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive.Tpo" "$(DEPDIR)/primitive.Po"; else rm -f "$(DEPDIR)/primitive.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/primitive.cc' object='primitive.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive.Po' tmpdepfile='$(DEPDIR)/primitive.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 primitive.o `test -f 'world_entities/primitive.cc' || echo '$(srcdir)/'`world_entities/primitive.cc
-
-primitive.obj: world_entities/primitive.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive.obj -MD -MP -MF "$(DEPDIR)/primitive.Tpo" -c -o primitive.obj `if test -f 'world_entities/primitive.cc'; then $(CYGPATH_W) 'world_entities/primitive.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/primitive.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive.Tpo" "$(DEPDIR)/primitive.Po"; else rm -f "$(DEPDIR)/primitive.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/primitive.cc' object='primitive.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive.Po' tmpdepfile='$(DEPDIR)/primitive.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 primitive.obj `if test -f 'world_entities/primitive.cc'; then $(CYGPATH_W) 'world_entities/primitive.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/primitive.cc'; fi`
 
 weapon.o: world_entities/weapon.cc

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -41 +41 @@
 {
    this->setClassName ("GLMenuImageScreen");
-   this->backMat = NULL;
+   this->init();
 }
 

orxonox/trunk/src/orxonox.cc

@@ -341 +341 @@
 #include "player.h"
 #include "base_object.h"
-#include "primitive.h"
 #include <asm/msr.h>
 #include <linux/timex.h>
@@ -397 +396 @@
       printf(" Generate a WorldEntity object:\t\t%11.2f\n", mi);
       
-      mittel = 0;
-      for(i = 0; i < ITERATIONS; ++i)
-        {
-          rdtscl(ini);
-          
-          WorldEntity* w = new Primitive(P_SPHERE);
-          
-          rdtscl(end);
-          delete w;
-          mittel += (end - ini - dt);
-        }
-      mi = mittel / (float)ITERATIONS;
-      printf(" Generate a Primitive  object:\t\t%11.2f\n", mi);
-
+      /*
+        mittel = 0;
+        for(i = 0; i < ITERATIONS; ++i)
+        {
+        rdtscl(ini);
+        
+        WorldEntity* w = new Primitive(P_SPHERE);
+        
+        rdtscl(end);
+        delete w;
+        mittel += (end - ini - dt);
+        }
+        mi = mittel / (float)ITERATIONS;
+        printf(" Generate a Primitive  object:\t\t%11.2f\n", mi);
+      */
 
       mittel = 0;
@@ -500 +500 @@
  
       
-      
-      mittel = 0;
-      w = new Primitive(P_SPHERE);
-      for(i = 0; i < ITERATIONS; ++i)
-        {
-          rdtscl(ini);
-          
-          w->tick(0.0f);
-           
-          rdtscl(end);
-          mittel += (end - ini - dt);
-        }
-      mi = mittel / (float)ITERATIONS;
-      printf(" Call function tick() of Prim:\t\t%11.2f\n", mi);
-      
+      /*
+        mittel = 0;
+        w = new Primitive(P_SPHERE);
+        for(i = 0; i < ITERATIONS; ++i)
+        {
+        rdtscl(ini);
+        
+        w->tick(0.0f);
+        
+        rdtscl(end);
+        mittel += (end - ini - dt);
+        }
+        mi = mittel / (float)ITERATIONS;
+        printf(" Call function tick() of Prim:\t\t%11.2f\n", mi);
+      */
       
     }

orxonox/trunk/src/story_entities/world.cc

@@ -29 +29 @@
 #include "camera.h"
 #include "environment.h"
-#include "primitive.h"
 #include "skysphere.h"
 #include "terrain.h"
@@ -388 +387 @@
             Vector* es = new Vector (20, 0, 0);
             Quaternion* qs = new Quaternion ();
-            WorldEntity* pr = new Primitive(P_SPHERE);
-            pr->setName("primitive");
-            this->spawn(pr, this->localPlayer, es, qs, PNODE_ROTATE_AND_MOVE);
 
             lightMan->getLight(0)->setParent(trackManager->getTrackNode());

orxonox/trunk/src/world_entities/projectile.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "null_parent.h"
-#include "objModel.h"
-#include "primitive.h"
+#include "model.h"
 #include "vector.h"