Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3710 in orxonox.OLD


Ignore:
Timestamp:
Apr 1, 2005, 2:05:10 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: added the TestBullet to framework, made some doxygen, works

Location:
orxonox/trunk/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r3678 r3710  
    4848                 world_entities/character_attributes.cc \
    4949                 world_entities/test_gun.cc \
     50                 world_entities/test_bullet.cc \
    5051                 ai/ai.cc \
    5152                 lib/coord/p_node.cc \
    … …  
    9899                 world_entities/character_attributes.h \
    99100                 world_entities/test_gun.h \
     101                 world_entities/test_bullet.h \
    100102                 ai/ai.h \
    101103                 network/synchronisable.h \

  • orxonox/trunk/src/Makefile.in

    r3678 r3710  
    6161        skysphere.$(OBJEXT) terrain.$(OBJEXT) weapon.$(OBJEXT) \
    6262        projectile.$(OBJEXT) character_attributes.$(OBJEXT) \
    63         test_gun.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
    64         null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
     63        test_gun.$(OBJEXT) test_bullet.$(OBJEXT) ai.$(OBJEXT) \
     64        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
    6565        data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
    6666        fontset.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    … …  
    9999@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
    100100@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \
    101 @AMDEP_TRUE@    ./$(DEPDIR)/test_gun.Po ./$(DEPDIR)/texture.Po \
     101@AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
     102@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po \
    102103@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
    103104@AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
    … …  
    254255                 world_entities/character_attributes.cc \
    255256                 world_entities/test_gun.cc \
     257                 world_entities/test_bullet.cc \
    256258                 ai/ai.cc \
    257259                 lib/coord/p_node.cc \
    … …  
    304306                 world_entities/character_attributes.h \
    305307                 world_entities/test_gun.h \
     308                 world_entities/test_bullet.h \
    306309                 ai/ai.h \
    307310                 network/synchronisable.h \
    … …  
    440443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
    441444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
     445@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bullet.Po@am__quote@
    442446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gun.Po@am__quote@
    443447@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
    … …  
    656660@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    657661@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_gun.obj `if test -f 'world_entities/test_gun.cc'; then $(CYGPATH_W) 'world_entities/test_gun.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_gun.cc'; fi`
     662
     663test_bullet.o: world_entities/test_bullet.cc
     664@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_bullet.o -MD -MP -MF "$(DEPDIR)/test_bullet.Tpo" -c -o test_bullet.o `test -f 'world_entities/test_bullet.cc' || echo '$(srcdir)/'`world_entities/test_bullet.cc; \
     665@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_bullet.Tpo" "$(DEPDIR)/test_bullet.Po"; else rm -f "$(DEPDIR)/test_bullet.Tpo"; exit 1; fi
     666@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='test_bullet.o' libtool=no @AMDEPBACKSLASH@
     667@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_bullet.Po' tmpdepfile='$(DEPDIR)/test_bullet.TPo' @AMDEPBACKSLASH@
     668@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     669@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.o `test -f 'world_entities/test_bullet.cc' || echo '$(srcdir)/'`world_entities/test_bullet.cc
     670
     671test_bullet.obj: world_entities/test_bullet.cc
     672@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT test_bullet.obj -MD -MP -MF "$(DEPDIR)/test_bullet.Tpo" -c -o test_bullet.obj `if test -f 'world_entities/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.cc'; fi`; \
     673@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/test_bullet.Tpo" "$(DEPDIR)/test_bullet.Po"; else rm -f "$(DEPDIR)/test_bullet.Tpo"; exit 1; fi
     674@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/test_bullet.cc' object='test_bullet.obj' libtool=no @AMDEPBACKSLASH@
     675@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/test_bullet.Po' tmpdepfile='$(DEPDIR)/test_bullet.TPo' @AMDEPBACKSLASH@
     676@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     677@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o test_bullet.obj `if test -f 'world_entities/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/test_bullet.cc'; fi`
    658678
    659679ai.o: ai/ai.cc

  • orxonox/trunk/src/story_entities/world.cc

    r3708 r3710  
    351351            tn->addChild(this->localCamera);
    352352            //      localCamera->lookAt(tn);
    353             this->localPlayer->setMode(PNODE_ROTATE_MOVEMENT);
     353            this->localPlayer->setMode(PNODE_ALL);
    354354            //Vector* cameraOffset = new Vector (0, 5, -10);
    355355            trackManager->condition(2, LEFTRIGHT, this->localPlayer);

  • orxonox/trunk/src/track_manager.cc

    r3675 r3710  
    868868void TrackManager::drawGraph(float dt) const
    869869{
    870 
    871870  for (int i = 1; i <= trackElemCount; i++)
    872871    {
    … …  
    880879            glVertex3f(tmpVector.x, tmpVector.y, tmpVector.z);
    881880          }
    882   glEnd();
     881      glEnd();
    883882    }
    884883}

  • orxonox/trunk/src/world_entities/projectile.h

    r3708 r3710  
    22    \projectile.h
    33    \brief a projectile, that is been shooted by a weapon
     4
     5    You can use this class to make some shoots, but this isn't the real idea. If you want to just test, if the
     6    shooting funcions work, use the Projectile class. But if you want to implement your own shoots its
     7    different:<br>
     8    Make a new class and derive it from Projectile. To have a weapon work well, reimplement the functions
     9    - void tick()
     10    - void draw()
     11    - void hit() (only if you have working collision detection)
     12    When you have implemented these functions you have just to add the projectiles to your weapon. You ll want
     13    to make this by looking into the function
     14    - Weapon::fire()
     15    there you just change the line:
     16    Projectile* pj = new Projectile();    TO     Projectile* pj = new MyOwnProjectileClass();
     17    and schwups it works... :)
    418*/
    519
    … …  
    3044  virtual void draw ();
    3145
    32  private:
     46 protected:
    3347  //physical attriutes like: force, speed, acceleration etc.
    3448  float speed;                         //!< this is the speed of the projectile

  • orxonox/trunk/src/world_entities/test_bullet.cc

    r3709 r3710  
    3131   \brief standard constructor
    3232*/
    33 TestBullet::TestBullet (Weapon* weapon) : WorldEntity()
     33TestBullet::TestBullet (Weapon* weapon) : Projectile(weapon)
    3434{}
    3535

  • orxonox/trunk/src/world_entities/test_bullet.h

    r3709 r3710  
    77#define _TEST_BULLET_H
    88
    9 #include "world_entity.h"
     9#include "projectile.h"
    1010
    1111class Vector;

  • orxonox/trunk/src/world_entities/test_gun.cc

    r3708 r3710  
    2626#include "world_entity.h"
    2727#include "model.h"
    28 #include "projectile.h"
     28#include "test_bullet.h"
    2929
    3030#include "vector.h"
    … …  
    8989      return;
    9090    }
    91   Projectile* pj = new Projectile(this);
     91  Projectile* pj = new TestBullet(this);
    9292
    9393  pj->setAbsCoor(this->getAbsCoor());
Note: See TracChangeset for help on using the changeset viewer.