Changeset 3463 in orxonox.OLD

Timestamp:

Mar 9, 2005, 10:50:20 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: backloop-check created

Location:

orxonox/branches/trackManager/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (5 diffs)
• track_manager.cc (modified) (3 diffs)
• track_manager.h (modified) (1 diff)
• track_node.cc (copied) (copied from orxonox/branches/trackManager/src/null_parent.cc) (4 diffs)
• track_node.h (copied) (copied from orxonox/branches/trackManager/src/null_parent.h) (1 diff)
• world.cc (modified) (2 diffs)
• world.h (modified) (1 diff)

orxonox/branches/trackManager/src/Makefile.am

@@ -31 +31 @@
                  p_node.cc \
                  null_parent.cc \
+                 track_node.cc \
                  base_object.cc \
                  helper_parent.cc \
@@ -37 +38 @@
                  curve.cc \
                  glmenu_imagescreen.cc \
-                 skysphere.cc
+                 skysphere.cc 
 
 noinst_HEADERS = ability.h \

orxonox/branches/trackManager/src/Makefile.in

@@ -61 +61 @@
         objModel.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
         texture.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT) \
-        null_parent.$(OBJEXT) base_object.$(OBJEXT) \
-        helper_parent.$(OBJEXT) track_manager.$(OBJEXT) \
-        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
-        skysphere.$(OBJEXT)
+        null_parent.$(OBJEXT) track_node.$(OBJEXT) \
+        base_object.$(OBJEXT) helper_parent.$(OBJEXT) \
+        track_manager.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \
+        glmenu_imagescreen.$(OBJEXT) skysphere.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -87 +87 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/player.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) \
@@ -240 +241 @@
                  p_node.cc \
                  null_parent.cc \
+                 track_node.cc \
                  base_object.cc \
                  helper_parent.cc \
@@ -246 +248 @@
                  curve.cc \
                  glmenu_imagescreen.cc \
-                 skysphere.cc
+                 skysphere.cc 
 
 noinst_HEADERS = ability.h \
@@ -396 +398 @@
 @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/branches/trackManager/src/track_manager.cc

@@ -88 +88 @@
 
 
+/**
+   \brief checks if there are any BackLoops in the Track
+   \param trackElem the trackElement to check about
+   it simply does this by looking if the current trackElem is found again somewhere else in the Track
+*/
+bool TrackElement::backLoopCheck(TrackElement* trackElem)
+{
+  if (this->childCount == 0)
+    return true;
+  else
+    {
+      for (int i = 0; i < this->childCount; i++)
+        if(!this->children[i]->backLoopCheck(trackElem))
+          return false;
+      
+      return true;
+    }
+}
 
 
@@ -137 +155 @@
 TrackManager* TrackManager::getInstance(void) 
 {
-  if (singletonRef)
-    return singletonRef;
+  if (TrackManager::singletonRef)
+    return TrackManager::singletonRef;
   else
-    return singletonRef = new TrackManager();
+    return TrackManager::singletonRef = new TrackManager();
 }
 
@@ -370 +388 @@
 {
   printf("Joining %d tracks and merging to Track %d\n", count, trackIDs[0]);
+
+  // checking if there is a back-loop-connection and ERROR if it is.
+  TrackElement* tmpTrackElem = this->findTrackElementByID(trackIDs[0]);
+  if (!tmpTrackElem->backLoopCheck(tmpTrackElem))
+    PRINTF(1)("Backloop connection detected at joining trackElements\n");
 
   // chanching work-on to temporary value. going back at the end.

orxonox/branches/trackManager/src/track_manager.h

@@ -35 +35 @@
 
   TrackElement* findByID(unsigned int trackID);
+  bool backLoopCheck(TrackElement* trackElem);
 
   bool isFresh;              //!< If no Points where added until now

orxonox/branches/trackManager/src/track_node.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
 
 
+#include "track_node.h"
+
 #include "null_parent.h"
 
+#include "track_manager.h"
 
 using namespace std;
 
-NullParent* NullParent::singletonRef = 0;
+TrackNode* TrackNode::singletonRef = 0;
 
-NullParent* NullParent::getInstance ()
+TrackNode* TrackNode::getInstance ()
 {
-  if( singletonRef == NULL)
-    singletonRef = new NullParent ();
+  if (singletonRef == NULL)
+    singletonRef = new TrackNode ();
   return singletonRef;
 }
@@ -36 +39 @@
    \todo this constructor is not jet implemented - do it
 */
-NullParent::NullParent () 
+TrackNode::TrackNode () 
 {
-  this->parent = this;
+  this->setParent(NullParent::getInstance());
+  this->trackManager = TrackManager::getInstance();
   this->mode = ALL;
 }
 
 
-NullParent::NullParent (Vector* absCoordinate)
+TrackNode::TrackNode (Vector* absCoordinate)
 {
-  this->parent = this;
+  this->parent = NullParent::getInstance();
+  this->trackManager = TrackManager::getInstance();
   this->mode = ALL;
   this->absCoordinate = *absCoordinate;
@@ -56 +61 @@
    \todo this deconstructor is not jet implemented - do it
 */
-NullParent::~NullParent () 
+TrackNode::~TrackNode () 
 {
-  delete singletonRef;
   singletonRef = NULL;
 }
-
-
-
 
 /**
@@ -72 +73 @@
    worry, normaly...
 */
-void NullParent::update (float timeStamp)
+void TrackNode::update (float timeStamp)
 {
-  this->absCoordinate = this->relCoordinate;
-  this->absDirection = parent->getAbsDir () * this->relDirection;
+  this->absCoordinate = trackManager->calcPos();
+  this->absDirection = Quaternion(trackManager->calcDir(), Vector(0,1,0));
   
   PNode* pn = this->children->enumerate ();

orxonox/branches/trackManager/src/track_node.h

@@ -1 +1 @@
 /*! 
-    \file proto_class.h
-    \brief Definition of the proto class template, used quickly start work
+    \file track_node.h
+    \brief Definition of the TrackNode are located here
+    
+    the TrackNode is the node, that follows the Track (and the TrackManager) 
+    through the level.
+    Under normal confitions the Plyaer(s) are 
 */
 
 
-#ifndef _NULL_PARENT_H
-#define _NULL_PARENT_H
+#ifndef _TRACK_NODE_H
+#define _TRACK_NODE_H
 
-#include "stdincl.h"
 #include "p_node.h"
 
+/* FORWARD DEFINITION */
+class TrackManager;
 
-class NullParent : public PNode {
+class TrackNode : public PNode {
 
  public:
-  static NullParent* getInstance ();
-  ~NullParent ();
+  static TrackNode* getInstance ();
+  ~TrackNode ();
   
-  static NullParent* singletonRef;
-
   virtual void update (float timeStamp);
 
  private:
-  NullParent ();
-  NullParent (Vector* absCoordinate);
+  TrackNode ();
+  TrackNode (Vector* absCoordinate);
+
+  static TrackNode* singletonRef;
+  TrackManager* trackManager;
 
 };
 
-#endif /* _NULL_PARENT_H */
+#endif /* _TRACK_NODE_H */

orxonox/branches/trackManager/src/world.cc

@@ -28 +28 @@
 #include "glmenu_imagescreen.h"
 #include "skysphere.h"
+#include "track_node.h"
 
 using namespace std;
@@ -294 +295 @@
             env->setName ("env");
             this->spawn(env, es, qs);
-            trackManager->setBindSlave(env);
+            
+            trackNode = TrackNode::getInstance();
+
+            env->setParent(trackNode);
+
+            trackManager->setBindSlave(trackNode);
 
             break;

orxonox/branches/trackManager/src/world.h

@@ -80 +80 @@
  
   PNode* nullParent;
+  PNode* trackNode;
  
   void mainLoop ();