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

Timestamp:

Mar 16, 2005, 3:06:15 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented skeleton for animatino player. added classes weapon and projectile, the base classes for future guns and rocket lunchers or whatever you will be wanting to implement. PS: animation player rules…

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (9 diffs)
• simple_animation.cc (added)
• simple_animation.h (added)
• story_entities/world.cc (modified) (1 diff)
• world_entities/environment.h (modified) (1 diff)
• world_entities/projectile.cc (added)
• world_entities/projectile.h (added)
• world_entities/shoot_laser.cc (deleted)
• world_entities/shoot_laser.h (deleted)
• world_entities/shoot_rocket.cc (deleted)
• world_entities/shoot_rocket.h (deleted)
• world_entities/weapon.cc (added)
• world_entities/weapon.h (added)

orxonox/trunk/src/Makefile.am

@@ -35 +35 @@
                  track_node.cc \
                  light.cc \
+                 simple_animation.cc \
                  story_entities/story_entity.cc \
                  story_entities/campaign.cc \
@@ -44 +45 @@
                  world_entities/terrain.cc \
                  world_entities/primitive.cc \
+                 world_entities/weapon.cc \
+                 world_entities/projectile.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -76 +79 @@
                  track_manager.h \
                  track_node.h \
+                 simple_animation.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -85 +89 @@
                  world_entities/environment.h \
                  world_entities/skysphere.h \
-                 world_entities/shoot_laser.h \
-                 world_entities/shoot_rocket.h \
                  world_entities/power_up.h \
                  world_entities/terrain.h \
                  world_entities/primitive.h \
+                 world_entities/weapon.h \
+                 world_entities/projectile.h \
                  ai/ai.h \
                  network/synchronisable.h \

orxonox/trunk/src/Makefile.in

@@ -56 +56 @@
         command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
         track_manager.$(OBJEXT) track_node.$(OBJEXT) light.$(OBJEXT) \
-        story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
-        world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
-        skysphere.$(OBJEXT) terrain.$(OBJEXT) primitive.$(OBJEXT) \
-        ai.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
-        helper_parent.$(OBJEXT) data_tank.$(OBJEXT) fontset.$(OBJEXT) \
-        array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \
-        material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
-        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
-        vector.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \
-        glmenu_imagescreen.$(OBJEXT)
+        simple_animation.$(OBJEXT) story_entity.$(OBJEXT) \
+        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
+        player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
+        terrain.$(OBJEXT) primitive.$(OBJEXT) weapon.$(OBJEXT) \
+        projectile.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
+        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        data_tank.$(OBJEXT) fontset.$(OBJEXT) array.$(OBJEXT) \
+        objModel.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
+        texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
+        ini_parser.$(OBJEXT) list.$(OBJEXT) vector.$(OBJEXT) \
+        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -87 +88 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/orxonox.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/primitive.Po ./$(DEPDIR)/skysphere.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/primitive.Po ./$(DEPDIR)/projectile.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/simple_animation.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/texture.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/weapon.Po ./$(DEPDIR)/world.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -230 +234 @@
                  track_node.cc \
                  light.cc \
+                 simple_animation.cc \
                  story_entities/story_entity.cc \
                  story_entities/campaign.cc \
@@ -239 +244 @@
                  world_entities/terrain.cc \
                  world_entities/primitive.cc \
+                 world_entities/weapon.cc \
+                 world_entities/projectile.cc \
                  ai/ai.cc \
                  lib/coord/p_node.cc \
@@ -271 +278 @@
                  track_manager.h \
                  track_node.h \
+                 simple_animation.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -280 +288 @@
                  world_entities/environment.h \
                  world_entities/skysphere.h \
-                 world_entities/shoot_laser.h \
-                 world_entities/shoot_rocket.h \
                  world_entities/power_up.h \
                  world_entities/terrain.h \
                  world_entities/primitive.h \
+                 world_entities/weapon.h \
+                 world_entities/projectile.h \
                  ai/ai.h \
                  network/synchronisable.h \
@@ -405 +413 @@
 @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)/projectile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_animation.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
@@ -412 +422 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weapon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world_entity.Po@am__quote@
@@ -574 +585 @@
 @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
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.o -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.o `test -f 'world_entities/weapon.cc' || echo '$(srcdir)/'`world_entities/weapon.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='weapon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon.Po' tmpdepfile='$(DEPDIR)/weapon.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 weapon.o `test -f 'world_entities/weapon.cc' || echo '$(srcdir)/'`world_entities/weapon.cc
+
+weapon.obj: world_entities/weapon.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT weapon.obj -MD -MP -MF "$(DEPDIR)/weapon.Tpo" -c -o weapon.obj `if test -f 'world_entities/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapon.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/weapon.Tpo" "$(DEPDIR)/weapon.Po"; else rm -f "$(DEPDIR)/weapon.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/weapon.cc' object='weapon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/weapon.Po' tmpdepfile='$(DEPDIR)/weapon.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 weapon.obj `if test -f 'world_entities/weapon.cc'; then $(CYGPATH_W) 'world_entities/weapon.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapon.cc'; fi`
+
+projectile.o: world_entities/projectile.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.o -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.o `test -f 'world_entities/projectile.cc' || echo '$(srcdir)/'`world_entities/projectile.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='projectile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.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 projectile.o `test -f 'world_entities/projectile.cc' || echo '$(srcdir)/'`world_entities/projectile.cc
+
+projectile.obj: world_entities/projectile.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT projectile.obj -MD -MP -MF "$(DEPDIR)/projectile.Tpo" -c -o projectile.obj `if test -f 'world_entities/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/projectile.Tpo" "$(DEPDIR)/projectile.Po"; else rm -f "$(DEPDIR)/projectile.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/projectile.cc' object='projectile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/projectile.Po' tmpdepfile='$(DEPDIR)/projectile.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 projectile.obj `if test -f 'world_entities/projectile.cc'; then $(CYGPATH_W) 'world_entities/projectile.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/projectile.cc'; fi`
 
 ai.o: ai/ai.cc

orxonox/trunk/src/story_entities/world.cc

@@ -44 +44 @@
 {
   this->init(name, -1);
-  NullParent* np = NullParent::getInstance();
+  //NullParent* np = NullParent::getInstance();
 }
 

orxonox/trunk/src/world_entities/environment.h

@@ -8 +8 @@
 {
   friend class World;
-
- private:
-  float xCor;
-  float yCor;
-  float zCor;
-
-  float mountainTest[10][10];
 
  public: