Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3500 in orxonox.OLD for orxonox/branches/trackManager


Ignore:
Timestamp:
Mar 11, 2005, 3:04:25 PM (20 years ago)
Author:
bensch
Message:

orxonox/branches/trackManager: tried to add the trackNode, but to no avail.

Location:
orxonox/branches/trackManager/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/trackManager/src/Makefile.am

    r3498 r3500  
    3333                 camera.cc \
    3434                 track_manager.cc \
     35                 track_node.cc \
    3536                 light.cc \
    3637                 story_entities/story_entity.cc \
  • orxonox/branches/trackManager/src/Makefile.in

    r3498 r3500  
    5555am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
    5656        command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
    57         track_manager.$(OBJEXT) light.$(OBJEXT) story_entity.$(OBJEXT) \
    58         campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
    59         player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
    60         ai.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
    61         helper_parent.$(OBJEXT) data_tank.$(OBJEXT) fontset.$(OBJEXT) \
    62         array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \
    63         material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
    64         base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
    65         vector.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \
    66         glmenu_imagescreen.$(OBJEXT)
     57        track_manager.$(OBJEXT) track_node.$(OBJEXT) light.$(OBJEXT) \
     58        story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
     59        world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
     60        skysphere.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
     61        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
     62        data_tank.$(OBJEXT) fontset.$(OBJEXT) array.$(OBJEXT) \
     63        objModel.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
     64        texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \
     65        ini_parser.$(OBJEXT) list.$(OBJEXT) vector.$(OBJEXT) \
     66        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
    6767orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6868orxonox_LDADD = $(LDADD)
     
    8888@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
    8989@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/texture.Po \
    90 @AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po ./$(DEPDIR)/vector.Po \
     90@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
     91@AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
    9192@AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
    9293CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     
    223224                 camera.cc \
    224225                 track_manager.cc \
     226                 track_node.cc \
    225227                 light.cc \
    226228                 story_entities/story_entity.cc \
     
    396398@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
    397399@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
     400@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@
    398401@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
    399402@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world.Po@am__quote@
  • orxonox/branches/trackManager/src/story_entities/world.cc

    r3498 r3500  
    2929#include "light.h"
    3030#include "fontset.h"
     31#include "track_node.h"
    3132
    3233using namespace std;
     
    238239            this->glmis->step();
    239240
    240             trackManager->setBindSlave(env);
     241            trackManager->setBindSlave(TrackNode::getInstance());
     242            env->setParent(TrackNode::getInstance());
    241243
    242244            break;
     
    814816        }
    815817      //this->timeSlice (dt);
    816      
     818      printf("testing trackNode: x:%f\n", TrackNode::getInstance()->absCoordinate.x);
     819
    817820      /* function to let all entities tick (iterate through list) */
    818821      WorldEntity* entity;
  • orxonox/branches/trackManager/src/track_node.cc

    r3463 r3500  
    6666}
    6767
    68 /**
    69    \brief updates the absCoordinate/absDirection
    70 
    71    this is used to go through the parent-tree to update all the absolute coordinates
    72    and directions. this update should be done by the engine, so you don't have to
    73    worry, normaly...
    74 */
    75 void TrackNode::update (float timeStamp)
    76 {
    77   this->absCoordinate = trackManager->calcPos();
    78   this->absDirection = Quaternion(trackManager->calcDir(), Vector(0,1,0));
    79  
    80   PNode* pn = this->children->enumerate ();
    81   while( pn != NULL)
    82     {
    83       /* if this node has changed, make sure, that all children are updated also */
    84       if( this->bRelCoorChanged || this->bAbsCoorChanged)
    85         pn->parentCoorChanged ();
    86       if( this->bRelDirChanged || this->bAbsDirChanged)
    87         pn->parentDirChanged ();
    88       pn->update (timeStamp);
    89       pn = this->children->nextElement ();
    90     }
    91 
    92   this->timeStamp = timeStamp;
    93   this->bRelCoorChanged = false;
    94   this->bAbsCoorChanged = false;
    95   this->bRelDirChanged = false;
    96   this->bAbsDirChanged = false;
    97 }
  • orxonox/branches/trackManager/src/track_node.h

    r3463 r3500  
    2323  ~TrackNode ();
    2424 
    25   virtual void update (float timeStamp);
    2625
    2726 private:
Note: See TracChangeset for help on using the changeset viewer.