Changeset 3528 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 13, 2005, 9:09:25 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: TrackNode gets initialized by TrackManager now.

Location:

orxonox/trunk/src

Files:

• Makefile.in (modified) (6 diffs)
• lib/Makefile.in (modified) (1 diff)
• lib/graphics/Makefile.in (modified) (1 diff)
• lib/graphics/importer/Makefile.in (modified) (1 diff)
• lib/gui/Makefile.in (modified) (1 diff)
• lib/gui/console/Makefile.in (modified) (1 diff)
• lib/gui/gui/Makefile.in (modified) (1 diff)
• track_manager.cc (modified) (5 diffs)
• track_node.cc (modified) (2 diffs)

orxonox/trunk/src/Makefile.in

@@ -55 +55 @@
 am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
         command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
-        track_manager.$(OBJEXT) light.$(OBJEXT) story_entity.$(OBJEXT) \
-        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
-        player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \
-        primitive.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \
-        null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
+        track_manager.$(OBJEXT) track_node.$(OBJEXT) light.$(OBJEXT) \
+        story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
+        world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
+        skysphere.$(OBJEXT) primitive.$(OBJEXT) ai.$(OBJEXT) \
+        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
         data_tank.$(OBJEXT) fontset.$(OBJEXT) array.$(OBJEXT) \
         objModel.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
@@ -88 +88 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/primitive.Po ./$(DEPDIR)/skysphere.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/texture.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po ./$(DEPDIR)/vector.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -223 +224 @@
                  camera.cc \
                  track_manager.cc \
+                 track_node.cc \
                  light.cc \
                  story_entities/story_entity.cc \
@@ -262 +264 @@
                  message_structures.h \
                  light.h \
+                 track_manager.h \
+                 track_node.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -315 +319 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/Makefile
+          $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -399 +403 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world.Po@am__quote@

orxonox/trunk/src/lib/Makefile.in

@@ -181 +181 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/Makefile
+          $(AUTOMAKE) --gnu  src/lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/graphics/Makefile.in

@@ -175 +175 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/graphics/importer/Makefile.in

@@ -215 +215 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/gui/Makefile.in

@@ -177 +177 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/gui/console/Makefile.in

@@ -203 +203 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/lib/gui/gui/Makefile.in

@@ -236 +236 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/track_manager.cc

@@ -19 +19 @@
 #include "p_node.h"
 
+#include "track_node.h"
+
 #include <stdarg.h>
-#include "p_node.h"
 
 using namespace std;
@@ -206 +207 @@
 {
   this->setClassName ("TrackManager");
+  
+  singletonRef = this;
 
   PRINTF(3)("Initializing the TrackManager\n");
@@ -214 +217 @@
   this->maxTime = 0;
   this->trackElemCount = 1;
-  this->bindSlave = NULL;
+  this->bindSlave = TrackNode::getInstance();
 }
 
@@ -242 +245 @@
 TrackManager* TrackManager::getInstance(void) 
 {
-  if (TrackManager::singletonRef)
-    return TrackManager::singletonRef;
-  else
-    return TrackManager::singletonRef = new TrackManager();
+  if (!singletonRef)
+    singletonRef = new TrackManager();
+  return singletonRef;
 }
 
@@ -694 +696 @@
 void TrackManager::setBindSlave(PNode* bindSlave)
 {
-  if (!this->bindSlave)
+  if (this->bindSlave == TrackNode::getInstance() || bindSlave == TrackNode::getInstance())
     this->bindSlave = bindSlave;
+  else
+    PRINTF(2)("Already a Bindslave set that is not the TrackNode itself. Not updating\n");
 }
 

orxonox/trunk/src/track_node.cc

@@ -29 +29 @@
 TrackNode* TrackNode::getInstance ()
 {
-  if (singletonRef == NULL)
+  if (!singletonRef)
     singletonRef = new TrackNode ();
   return singletonRef;
@@ -41 +41 @@
 TrackNode::TrackNode () 
 {
+  this->setClassName("TrackNode");
+  singletonRef = this;
+
   NullParent::getInstance()->addChild(this);
   this->trackManager = TrackManager::getInstance();