Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3276 in orxonox.OLD


Ignore:
Timestamp:
Dec 25, 2004, 12:54:57 AM (19 years ago)
Author:
patrick
Message:

orxonox/branche/parenting: added nullparent as the center of all parents.

Location:
orxonox/branches/parenting/src
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/parenting/src/Makefile.am

    r3246 r3276  
    2828                 importer/material.cc \
    2929                 list.cc \
    30                  p_node.cc
     30                 p_node.cc \
     31                 null_parent.cc
    3132
    3233noinst_HEADERS = ability.h \
    … …  
    6263                 game_loader.h \
    6364                 campaign.h \
    64                  p_node.h
     65                 p_node.h \
     66                 null_parent.h
     67
    6568
    6669## orxonox.conf will be used from home-dir instead.

  • orxonox/branches/parenting/src/Makefile.in

    r3246 r3276  
    6060        campaign.$(OBJEXT) story_entity.$(OBJEXT) \
    6161        environment.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
    62         material.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT)
     62        material.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT) \
     63        null_parent.$(OBJEXT)
    6364orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6465orxonox_LDADD = $(LDADD)
    … …  
    7576@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
    7677@AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \
    77 @AMDEP_TRUE@    ./$(DEPDIR)/object.Po ./$(DEPDIR)/orxonox.Po \
    78 @AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \
    79 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/track.Po \
    80 @AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/world.Po \
    81 @AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
     78@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/object.Po \
     79@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
     80@AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/story_entity.Po \
     81@AMDEP_TRUE@    ./$(DEPDIR)/track.Po ./$(DEPDIR)/vector.Po \
     82@AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
    8283CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    8384        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    218219                 importer/material.cc \
    219220                 list.cc \
    220                  p_node.cc
     221                 p_node.cc \
     222                 null_parent.cc
    221223
    222224noinst_HEADERS = ability.h \
    … …  
    252254                 game_loader.h \
    253255                 campaign.h \
    254                  p_node.h
     256                 p_node.h \
     257                 null_parent.h
    255258
    256259EXTRA_DIST = orxonox.conf
    … …  
    343346@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
    344347@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     348@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
    345349@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
    346350@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@

  • orxonox/branches/parenting/src/p_node.cc

    r3269 r3276  
    1717   \todo Null-Parent => center of the coord system - singleton
    1818   \todo Smooth-Parent: delay, speed
     19   \todo destroy the stuff again, delete...
    1920*/
    2021

  • orxonox/branches/parenting/src/p_node.h

    r3269 r3276  
    6464  void debug ();
    6565
    66  private:
    6766  long timeStamp;   //! this the timeStamp of when the abs{Coordinat, Direction} has been calculated
    6867  bool bAbsCoorChanged;

  • orxonox/branches/parenting/src/world.cc

    r3269 r3276  
    2424#include "environment.h"
    2525#include "p_node.h"
     26#include "null_parent.h"
    2627
    2728using namespace std;
    … …  
    8182
    8283  /* this is only for test purposes */
    83   this->debug ();
     84  //this->debug ();
    8485}
    8586
    … …  
    145146            // !\todo old track-system has to be removed
    146147
     148            //this->nullParent = new NullParent ();
     149
    147150            // create a player
    148151            WorldEntity* myPlayer = new Player();
    … …  
    576579{
    577580  printf ("World::debug() - starting debug\n");
    578   PNode* p1 = new PNode ();
     581  PNode* p1 = new NullParent ();
    579582  PNode* p2 = new PNode (new Vector(2, 2, 2), p1);
    580583  PNode* p3 = new PNode (new Vector(4, 4, 4), p1);
    581584  PNode* p4 = new PNode (new Vector(6, 6, 6), p2);
    582 
    583   p1->setMode (ALL);
    584 
    585   //p1->addChild (p2);
    586   // p1->addChild (p3);
    587   //p2->addChild (p4);
    588585
    589586  p1->debug ();

  • orxonox/branches/parenting/src/world.h

    r3236 r3276  
    1515class WorldEntity;
    1616class Camera;
     17class PNode;
    1718
    1819//! The game environment
    … …  
    7576
    7677  WorldEntity* localPlayer;
    77  
     78 
     79  PNode* nullParent;
     80 
    7881  void mainLoop ();
    7982  void synchronize ();
Note: See TracChangeset for help on using the changeset viewer.