Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3750 in orxonox.OLD


Ignore:
Timestamp:
Apr 7, 2005, 7:37:25 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: made some sattelite object just for fun and to show on the convention tomarrow

Location:
orxonox/trunk/src
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r3710 r3750  
    4646                 world_entities/weapon.cc \
    4747                 world_entities/projectile.cc \
     48                 world_entities/satellite.cc \
    4849                 world_entities/character_attributes.cc \
    4950                 world_entities/test_gun.cc \
    … …  
    9798                 world_entities/weapon.h \
    9899                 world_entities/projectile.h \
     100                 world_entities/satellite.h \
    99101                 world_entities/character_attributes.h \
    100102                 world_entities/test_gun.h \

  • orxonox/trunk/src/Makefile.in

    r3710 r3750  
    6060        world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
    6161        skysphere.$(OBJEXT) terrain.$(OBJEXT) weapon.$(OBJEXT) \
    62         projectile.$(OBJEXT) character_attributes.$(OBJEXT) \
    63         test_gun.$(OBJEXT) test_bullet.$(OBJEXT) ai.$(OBJEXT) \
    64         p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
     62        projectile.$(OBJEXT) satellite.$(OBJEXT) \
     63        character_attributes.$(OBJEXT) test_gun.$(OBJEXT) \
     64        test_bullet.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
     65        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
    6566        data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
    6667        fontset.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    … …  
    9697@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
    9798@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
     99@AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po \
    98100@AMDEP_TRUE@    ./$(DEPDIR)/simple_animation.Po \
    99101@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
    … …  
    253255                 world_entities/weapon.cc \
    254256                 world_entities/projectile.cc \
     257                 world_entities/satellite.cc \
    255258                 world_entities/character_attributes.cc \
    256259                 world_entities/test_gun.cc \
    … …  
    304307                 world_entities/weapon.h \
    305308                 world_entities/projectile.h \
     309                 world_entities/satellite.h \
    306310                 world_entities/character_attributes.h \
    307311                 world_entities/test_gun.h \
    … …  
    439443@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
    440444@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@
     445@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/satellite.Po@am__quote@
    441446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/simple_animation.Po@am__quote@
    442447@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
    … …  
    628633@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    629634@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`
     635
     636satellite.o: world_entities/satellite.cc
     637@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT satellite.o -MD -MP -MF "$(DEPDIR)/satellite.Tpo" -c -o satellite.o `test -f 'world_entities/satellite.cc' || echo '$(srcdir)/'`world_entities/satellite.cc; \
     638@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/satellite.Tpo" "$(DEPDIR)/satellite.Po"; else rm -f "$(DEPDIR)/satellite.Tpo"; exit 1; fi
     639@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='satellite.o' libtool=no @AMDEPBACKSLASH@
     640@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/satellite.Po' tmpdepfile='$(DEPDIR)/satellite.TPo' @AMDEPBACKSLASH@
     641@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     642@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o satellite.o `test -f 'world_entities/satellite.cc' || echo '$(srcdir)/'`world_entities/satellite.cc
     643
     644satellite.obj: world_entities/satellite.cc
     645@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT satellite.obj -MD -MP -MF "$(DEPDIR)/satellite.Tpo" -c -o satellite.obj `if test -f 'world_entities/satellite.cc'; then $(CYGPATH_W) 'world_entities/satellite.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/satellite.cc'; fi`; \
     646@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/satellite.Tpo" "$(DEPDIR)/satellite.Po"; else rm -f "$(DEPDIR)/satellite.Tpo"; exit 1; fi
     647@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/satellite.cc' object='satellite.obj' libtool=no @AMDEPBACKSLASH@
     648@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/satellite.Po' tmpdepfile='$(DEPDIR)/satellite.TPo' @AMDEPBACKSLASH@
     649@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     650@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o satellite.obj `if test -f 'world_entities/satellite.cc'; then $(CYGPATH_W) 'world_entities/satellite.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/satellite.cc'; fi`
    630651
    631652character_attributes.o: world_entities/character_attributes.cc

  • orxonox/trunk/src/defs/debug.h

    r3688 r3750  
    6565#define DEBUG_MODULE_LOAD               0
    6666
    67 #define DEBUG_MODULE_IMPORTER           0
     67#define DEBUG_MODULE_IMPORTER           2
    6868#define DEBUG_MODULE_TRACK_MANAGER      0
    6969#define DEBUG_MODULE_GARBAGE_COLLECTOR  0

  • orxonox/trunk/src/lib/graphics/importer/model.cc

    r3657 r3750  
    124124      if (counter == groupNumber)
    125125        {
    126           PRINTF(4)("Drawing model number %i named %s\n", counter, walker->name);
     126          PRINTF(2)("Drawing model number %i named %s\n", counter, walker->name);
    127127          glCallList (walker->listNumber);
    128128          return;

  • orxonox/trunk/src/simple_animation.h

    r3744 r3750  
    4242*/
    4343typedef struct Animation {
     44
    4445  WorldEntity* object;
     46  Vector* lastPosition;
     47  Vector* tmpVect;
     48  float deltaT;
     49  float localTime;
     50
     51  tList<KeyFrame>* frames;
    4552  KeyFrame* currentFrame;
    4653  KeyFrame* lastFrame;
    47   Vector* lastPosition;
    48   Vector* tmpVect;
    49   tList<KeyFrame>* frames;
     54
     55  bool bRunning;
     56
    5057  animationMode animMode;
    5158  movementMode movMode;
    52   bool bRunning;
    53   float deltaT;
    54   float localTime;
    5559};
    5660

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

    r3745 r3750  
    3030#include "environment.h"
    3131#include "skysphere.h"
     32#include "satellite.h"
    3233#include "terrain.h"
    3334#include "light.h"
    … …  
    442443
    443444
    444 
    445             /*
    446             WorldEntity* a = new Environment();
    447             this->localPlayer->addChild(a);
    448             a->setRelCoor(new Vector(10.0, 2.0, 1.0));
    449             this->spawn(a);
    450             */
     445            WorldEntity* baseNode = new Satellite(Vector(1,0,1), 1.2);
     446            this->localPlayer->addChild(baseNode);
     447            baseNode->setRelCoor(new Vector(10.0, 2.0, 1.0));
     448            this->spawn(baseNode);
     449
     450            WorldEntity* secondNode = new Satellite(Vector(0,0,1), 1.0);
     451            baseNode->addChild(secondNode);
     452            secondNode->setRelCoor(new Vector(0.0, 3.0, 0.0));
     453            this->spawn(secondNode);
     454
     455
     456            WorldEntity* thirdNode = new Satellite(Vector(0,0,1), 2.0);
     457            secondNode->addChild(thirdNode);
     458            thirdNode->setRelCoor(new Vector(2.0, 0.0, 0.0));
     459            this->spawn(thirdNode);
     460
     461
    451462
    452463            WorldEntity* b = new Environment();
    … …  
    462473           
    463474           
    464             this->simpleAnimation = SimpleAnimation::getInstance();
    465 
    466             /*
    467               frame->position = point;
    468               frame->orientation = orientation;
    469               frame->time = time;
    470               frame->mode = DEFAULT_ANIMATION_MODE;
    471             */
    472 
    473475            KeyFrame* f1 = new KeyFrame;
    474476            f1->position = new Vector(-1.1, 0.0, 2.6);
    … …  
    506508            this->simpleAnimation->addKeyFrame(f4);
    507509            this->simpleAnimation->start();
    508             //this->simpleAnimation->addKeyFrame(f3);
    509             //this->simpleAnimation->addKeyFrame(f2);
    510510            this->simpleAnimation->animatorEnd();
    511511

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

    r3686 r3750  
    4646  */
    4747  this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
     48  //this->model = (Model*)ResourceManager::getInstance()->load("models/weapon_packet.obj", OBJ, RP_CAMPAIGN);
    4849  travelSpeed = 15.0;
    4950  velocity = new Vector();
    … …  
    147148  this->model->draw();
    148149  glPopMatrix();
     150
     151  this->activeWeapon->draw();
    149152}
    150153

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

    r3710 r3750  
    4242  :  Weapon (parent, coordinate, direction)
    4343{
     44  this->model = (Model*)ResourceManager::getInstance()->load("models/weapon_packet.obj", OBJ, RP_CAMPAIGN);
    4445  this->idleTime = 0.2f;
    4546}
    … …  
    146147*/
    147148void TestGun::draw ()
    148 {}
     149{
     150  glMatrixMode(GL_MODELVIEW);
     151  glPushMatrix();
     152  float matrix[4][4];
     153 
     154  /* translate */
     155  glTranslatef (this->getAbsCoor ().x,
     156                this->getAbsCoor ().y,
     157                this->getAbsCoor ().z);
     158  /* rotate */
     159  this->getAbsDir ().matrix (matrix);
     160  glMultMatrixf((float*)matrix);
     161 
     162  this->model->draw(2);
     163  glPopMatrix();
     164}
    149165
Note: See TracChangeset for help on using the changeset viewer.