Changeset 3276 in orxonox.OLD for orxonox

Timestamp:

Dec 25, 2004, 12:54:57 AM (20 years ago)

Author:

patrick

Message:

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

Location:

orxonox/branches/parenting/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• null_parent.cc (added)
• null_parent.h (added)
• p_node.cc (modified) (1 diff)
• p_node.h (modified) (1 diff)
• world.cc (modified) (4 diffs)
• world.h (modified) (2 diffs)

orxonox/branches/parenting/src/Makefile.am

@@ -28 +28 @@
                  importer/material.cc \
                  list.cc \
-                 p_node.cc
+                 p_node.cc \
+                 null_parent.cc
 
 noinst_HEADERS = ability.h \
@@ -62 +63 @@
                  game_loader.h \
                  campaign.h \
-                 p_node.h
+                 p_node.h \
+                 null_parent.h
+
 
 ## orxonox.conf will be used from home-dir instead.

orxonox/branches/parenting/src/Makefile.in

@@ -60 +60 @@
         campaign.$(OBJEXT) story_entity.$(OBJEXT) \
         environment.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
-        material.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT)
+        material.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT) \
+        null_parent.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -75 +76 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/object.Po ./$(DEPDIR)/orxonox.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/track.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/world.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/object.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/player.Po ./$(DEPDIR)/story_entity.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/track.Po ./$(DEPDIR)/vector.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -218 +219 @@
                  importer/material.cc \
                  list.cc \
-                 p_node.cc
+                 p_node.cc \
+                 null_parent.cc
 
 noinst_HEADERS = ability.h \
@@ -252 +254 @@
                  game_loader.h \
                  campaign.h \
-                 p_node.h
+                 p_node.h \
+                 null_parent.h
 
 EXTRA_DIST = orxonox.conf
@@ -343 +346 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@

orxonox/branches/parenting/src/p_node.cc

@@ -17 +17 @@
    \todo Null-Parent => center of the coord system - singleton
    \todo Smooth-Parent: delay, speed
+   \todo destroy the stuff again, delete...
 */
 

orxonox/branches/parenting/src/p_node.h

@@ -64 +64 @@
   void debug ();
 
- private:
   long timeStamp;   //! this the timeStamp of when the abs{Coordinat, Direction} has been calculated
   bool bAbsCoorChanged;

orxonox/branches/parenting/src/world.cc

@@ -24 +24 @@
 #include "environment.h"
 #include "p_node.h"
+#include "null_parent.h"
 
 using namespace std;
@@ -81 +82 @@
 
   /* this is only for test purposes */
-  this->debug ();
+  //this->debug ();
 }
 
@@ -145 +146 @@
             // !\todo old track-system has to be removed
 
+            //this->nullParent = new NullParent ();
+
             // create a player
             WorldEntity* myPlayer = new Player();
@@ -576 +579 @@
 {
   printf ("World::debug() - starting debug\n");
-  PNode* p1 = new PNode ();
+  PNode* p1 = new NullParent ();
   PNode* p2 = new PNode (new Vector(2, 2, 2), p1);
   PNode* p3 = new PNode (new Vector(4, 4, 4), p1);
   PNode* p4 = new PNode (new Vector(6, 6, 6), p2);
-
-  p1->setMode (ALL);
-
-  //p1->addChild (p2);
-  // p1->addChild (p3);
-  //p2->addChild (p4);
 
   p1->debug ();

orxonox/branches/parenting/src/world.h

@@ -15 +15 @@
 class WorldEntity;
 class Camera;
+class PNode;
 
 //! The game environment
@@ -75 +76 @@
 
   WorldEntity* localPlayer;
-  
+ 
+  PNode* nullParent;
+ 
   void mainLoop ();
   void synchronize ();