Changeset 3556 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 15, 2005, 2:34:44 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: trackNode not static anymore

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• track_manager.cc (modified) (2 diffs)
• track_manager.h (modified) (2 diffs)
• track_node.cc (modified) (4 diffs)
• track_node.h (modified) (1 diff)

orxonox/trunk/src/story_entities/world.cc

@@ -248 +248 @@
 
             //      trackManager->setBindSlave(env);
-            TrackNode* tn = TrackNode::getInstance();
+            PNode* tn = trackManager->getTrackNode();
             tn->addChild(myPlayer);
 
             //localCamera->setParent(TrackNode::getInstance());
-            TrackNode::getInstance()->addChild (this->localCamera);
+            tn->addChild (this->localCamera);
             //Vector* cameraOffset = new Vector (0, 5, -10);
             Vector* cameraOffset = new Vector (-10, 5, 0);
@@ -703 +703 @@
       this->display ();
 
-      (TrackNode::getInstance()->getAbsCoor() - localPlayer->getAbsCoor()).debug();
-  
       for( int i = 0; i < 5000000; i++) {}
       /* \todo this is to slow down the program for openGl Software emulator computers, reimplement*/

orxonox/trunk/src/track_manager.cc

@@ -217 +217 @@
   this->maxTime = 0;
   this->trackElemCount = 1;
-  this->bindSlave = TrackNode::getInstance();
+  this->bindSlave = this->trackNode = new TrackNode();
 }
 
@@ -701 +701 @@
 void TrackManager::setBindSlave(PNode* 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");
-}
-
+  this->bindSlave = bindSlave;
+}
+
+/**
+   \returns the main TrackNode
+*/
+PNode* TrackManager::getTrackNode(void)
+{
+  return this->trackNode;
+}
 
 // DEBUG //

orxonox/trunk/src/track_manager.h

@@ -115 +115 @@
   int trackElemCount;                 //!< The count of TrackElements that exist.
   PNode* bindSlave;                   //!< The node that is slave to the TrackManager. This node will be moved while update the TrackManager, and must NOT move itself.
+  PNode* trackNode;                   //!< The main TrackNode of this Track.
   
   void initChildren(unsigned int childCount);
@@ -151 +152 @@
 
   void setBindSlave(PNode* bindSlave);
+  PNode* getTrackNode(void);
 
   // DEBUG //

orxonox/trunk/src/track_node.cc

@@ -25 +25 @@
 using namespace std;
 
-TrackNode* TrackNode::singletonRef = 0;
-
-TrackNode* TrackNode::getInstance ()
-{
-  if (!singletonRef)
-    singletonRef = new TrackNode ();
-  return singletonRef;
-}
-
 /**
    \brief standard constructor
@@ -43 +34 @@
   this->setClassName("TrackNode");
   this->setName("TrackNode"); /* absolete but still used... */
-  singletonRef = this;
 
   NullParent::getInstance()->addChild(this);
   this->trackManager = TrackManager::getInstance();
-  this->mode = ALL;
+  this->setMode(ALL);
 }
 
@@ -55 +45 @@
   this->parent = NullParent::getInstance();
   this->trackManager = TrackManager::getInstance();
-  this->mode = ALL;
+  this->setMode(ALL);
   this->absCoordinate = *absCoordinate;
 }
@@ -67 +57 @@
 TrackNode::~TrackNode () 
 {
-  singletonRef = NULL;
+
 }

orxonox/trunk/src/track_node.h

@@ -20 +20 @@
 
  public:
-  static TrackNode* getInstance ();
+  TrackNode ();
+  TrackNode (Vector* absCoordinate);
+
   virtual ~TrackNode ();
 
  private:
-  TrackNode ();
-  TrackNode (Vector* absCoordinate);
-
-  static TrackNode* singletonRef;
   TrackManager* trackManager;