Changeset 3601 in orxonox.OLD for orxonox

Timestamp:

Mar 18, 2005, 2:22:57 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: no more movement at the end of the Track

Location:

orxonox/trunk

Files:

• ChangeLog (modified) (1 diff)
• src/defs/debug.h (modified) (16 diffs)
• src/track_manager.cc (modified) (3 diffs)

orxonox/trunk/ChangeLog

@@ +1 @@
+2005-03-16      orxonox
+        Finished work on version 0.2.1-pre-alpha released 0.2.2-pre-alpha
+
 2005-03-15      Patrick Boenzli <patrick@orxonox.ethz.ch>
         parenting finished

orxonox/trunk/src/defs/debug.h

@@ -17 +17 @@
     \file debug.h
     \brief Handles output to console for different Verbose-Modes.
+
+    There are two main modes HARD and SOFT. HARD is precessed during compileTime where SOFT is for runtime.
+    \li HARD: One can choose between different modes. see: // DEFINE_MODULES \\
+    \li SOFT: If you want each module can have its own variable for processing. just pass it to DEBUG_MODULE_SOFT
 */ 
 
@@ -38 +42 @@
 extern int verbose;
 
+//definitions
 #ifndef MODULAR_DEBUG
 #define HARD_DEBUG_LEVEL DEBUG
+#define SOFT_DEBUG_LEVEL verbose
 #else /* MODULAR_DEBUG */
+#ifndef DEBUG_MODULE_SOFT 
+#define SOFT_DEBUG_LEVEL verbose
+#else /* DEBUG_MODULE_SOFT */
+#define SOFT_DEBUG_LEVEL DEBUG_MODULE_SOFT
+#endif /* DEBUG_MODULE_SOFT */
+
 #ifndef DEBUG_SPECIAL_MODULE
 #define HARD_DEBUG_LEVEL DEBUG
@@ -74 +86 @@
 #if HARD_DEBUG_LEVEL >= ERR
 #define PRINTF1 \
-    if (verbose >= ERR) \
+    if (SOFT_DEBUG_LEVEL >= ERR) \
       printf("ERROR::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -82 +94 @@
 #if HARD_DEBUG_LEVEL >= WARN
 #define PRINTF2 \
-     if (verbose >= WARN) \
+     if (SOFT_DEBUG_LEVEL >= WARN) \
        printf("WARNING::%s:%d:", __FILE__, __LINE__) && printf
          
@@ -91 +103 @@
 #if HARD_DEBUG_LEVEL >= INFO
 #define PRINTF3 \
-     if (verbose >= INFO) \
+     if (SOFT_DEBUG_LEVEL >= INFO) \
        printf("INFO::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -99 +111 @@
 #if HARD_DEBUG_LEVEL >= DEBUGING
 #define PRINTF4 \
-     if (verbose >= DEBUGING) \
+     if (SOFT_DEBUG_LEVEL >= DEBUGING) \
        printf("DEBUG::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -107 +119 @@
 #if HARD_DEBUG_LEVEL >= vDEBUGING
 #define PRINTF5 \
-     if (verbose >= vDEBUGING) \
+     if (SOFT_DEBUG_LEVEL >= vDEBUGING) \
        printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -130 +142 @@
 #if HARD_DEBUG_LEVEL >= ERR
 #define PRINT1  \
-  if (verbose >= ERR)   \
+  if (SOFT_DEBUG_LEVEL >= ERR)  \
     printf
 #else 
@@ -138 +150 @@
 #if HARD_DEBUG_LEVEL >= WARN
 #define PRINT2 \
-  if (verbose >= WARN) \
+  if (SOFT_DEBUG_LEVEL >= WARN) \
     printf
 
@@ -147 +159 @@
 #if HARD_DEBUG_LEVEL >= INFO
 #define PRINT3 \
-  if (verbose >= INFO) \
+  if (SOFT_DEBUG_LEVEL >= INFO) \
     printf
 #else 
@@ -155 +167 @@
 #if HARD_DEBUG_LEVEL >= DEBUGING
 #define PRINT4 \
-  if (verbose >= DEBUGING) \
+  if (SOFT_DEBUG_LEVEL >= DEBUGING) \
     printf
 #else 
@@ -163 +175 @@
 #if HARD_DEBUG_LEVEL >= vDEBUGING
 #define PRINT5 \
-     if (verbose >= vDEBUGING) \
+     if (SOFT_DEBUG_LEVEL >= vDEBUGING) \
        printf("VERYDEBUG::%s:%d:", __FILE__, __LINE__) && printf
 #else 
@@ -186 +198 @@
 #if HARD_DEBUG_LEVEL >= 1
 #define COUT1 \
-    if (verbose >= 1 ) \
+    if (SOFT_DEBUG_LEVEL >= 1 ) \
       cout
 #else 
@@ -194 +206 @@
 #if HARD_DEBUG_LEVEL >= 2
 #define COUT2 \
-     if (verbose >= 2 ) \
+     if (SOFT_DEBUG_LEVEL >= 2 ) \
        cout
 
@@ -203 +215 @@
 #if HARD_DEBUG_LEVEL >= 3
 #define COUT3 \
-     if (verbose >= 3 ) \
+     if (SOFT_DEBUG_LEVEL >= 3 ) \
        cout
 #else
@@ -211 +223 @@
 #if HARD_DEBUG_LEVEL >= 4
 #define COUT4 \
-     if (verbose >= 4 ) \
+     if (SOFT_DEBUG_LEVEL >= 4 ) \
        cout
 #else 

orxonox/trunk/src/track_manager.cc

@@ -732 +732 @@
               enumElem = tmpElem->children->nextElement();
             }
-          
-          
-        }
-    }
+        }
+    }
+  for (int i = 1; i <=trackElemCount;i++)
+    if (this->findTrackElementByID(i)->endTime > this->maxTime)
+      this->maxTime = findTrackElementByID(i)->endTime; // very bad implemented :/
 }
 
@@ -747 +748 @@
 Vector TrackManager::calcPos() const
 {
-  //  PRINTF(0)("TrackElement:%d, localTime: %f\n",this->currentTrackElem->ID, this->localTime);
   return this->currentTrackElem->curve->calcPos((this->localTime-this->currentTrackElem->startingTime)/this->currentTrackElem->duration);
 }
@@ -780 +780 @@
   if (this->localTime <= this->firstTrackElem->duration)
     this->jumpTo(this->localTime);
-  this->localTime += dt;
+  if (this->localTime <= this->maxTime)
+    this->localTime += dt;
   if (this->localTime > this->currentTrackElem->endTime
       && this->currentTrackElem->children)