Changeset 3860 in orxonox.OLD

Timestamp:

Apr 17, 2005, 6:20:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved likely to compiler.h in defs
also reset all the UNLIKELY_IF functions to how they should look.

the old approach is still valid, but depricated.

@patrick: i hope this is ok for you, for it is LINUX-standard.
and i think windows is also able to handle likely/unlikely because it is a compiler issue not a system issue

Location:

orxonox/trunk/src

Files:

• animation.cc (modified) (2 diffs)
• animation.h (modified) (4 diffs)
• animation_player.cc (modified) (2 diffs)
• defs/compiler.h (added)
• defs/stdincl.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (9 diffs)
• lib/math/vector.cc (modified) (3 diffs)
• lib/math/vector.h (modified) (2 diffs)
• lib/util/list.h (modified) (6 diffs)
• t_animation.h (modified) (1 diff)

orxonox/trunk/src/animation.cc

@@ -29 +29 @@
   this->bHasKeys = false;
   this->bHandled = true;
+  this->bDelete = false;
   this->baseObject = NULL;
 
@@ -84 +85 @@
       break;
     case ANIM_INF_DELETE: // this will possibly never be made
-      //this->bDelete;
+      this->bDelete = true;
       break;
     }

orxonox/trunk/src/animation.h

@@ -11 +11 @@
 
 // FORWARD DEFINITION
-
-#define DELTA_X 0.05  //!< the percentag of the distance that doesnt have to be done by neg_exp (asymptotical) ~ maschinendelta
 
 //! An enumerator of Functions to describe the flow of the Animation
@@ -47 +45 @@
  * Animation Functions
  * virtual tick
+ * addKeyFrame
  * List of keyFrames
  * currentKeyFrame/nextKeyFrame
@@ -73 +72 @@
   BaseObject* getBaseObject(void) const {return baseObject;}
 
+  /** \returns if the Animation should be deleted */
+  inline bool ifDelete(void) {return bDelete;}
+
  protected:
   Animation(void);
@@ -85 +87 @@
   bool bHandled;                  //!< If this Animation is handled by the AnimationPlayer.
   bool bRunning;                  //!< If the animation is running
-  //  bool bDelete;                   //!< If true, the animation will be deleted through the AnimationPlayer.
+  bool bDelete;                   //!< If true, the animation will be deleted through the AnimationPlayer.
 };
 

orxonox/trunk/src/animation_player.cc

@@ -17 +17 @@
 
 #include "animation_player.h"
+
+#include "compiler.h"
 
 using namespace std;
@@ -120 +122 @@
         {
           anim->tick(timePassed);
+          if(unlikely(anim->ifDelete()))
+          {
+            this->animationList->remove(anim);
+            delete anim;
+          }
           anim = animIt->nextElement();
         }

orxonox/trunk/src/defs/stdincl.h

@@ -29 +29 @@
 #include "debug.h"
 
-
-/* performance tweaking stuff */
-#ifdef __unix__
- #include <linux/compiler.h>
- #define __LIKELY_IF(condition)  if( likely(condition))
- #define __UNLIKELY_IF(condition) if( unlikely(condition))
-#else
- #define __LIKELY_IF(condition)  if( condition)
- #define __UNLIKELY_IF(condition) if( condition)
-#endif
+#include "compiler.h"
 
 #endif /* _STDINCL_H */

orxonox/trunk/src/lib/coord/p_node.cc

@@ -22 +22 @@
 #include "p_node.h"
 #include "stdincl.h"
+#include "compiler.h"
 
 #include "error.h"
@@ -61 +62 @@
   *this->absCoordinate = absCoordinate;
 
-  __LIKELY_IF(parent != NULL)
+  if (likely(parent != NULL))
   {
     *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
@@ -208 +209 @@
 {
 
-  __UNLIKELY_IF( this->bAbsCoorChanged)
+  if( unlikely(this->bAbsCoorChanged))
     {
       *this->absCoordinate = *this->absCoordinate + shift;
@@ -316 +317 @@
 void PNode::addChild (PNode* pNode, int parentingMode)
 {
-  __LIKELY_IF( pNode->parent != NULL)
+  if( likely(pNode->parent != NULL))
     {
       PRINTF(3)("PNode::addChild() - reparenting node: removing it and adding it again\n");
@@ -436 +437 @@
 
 
-  __LIKELY_IF( this->mode & PNODE_MOVEMENT)
+  if( likely(this->mode & PNODE_MOVEMENT))
     {
-      __UNLIKELY_IF(this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( unlikely(this->bAbsCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
-      __LIKELY_IF(this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
 
         {
@@ -449 +450 @@
 
           /*
-          __UNLIKELY_IF( this->parent == NULL)
+          if( unlikely(this->parent == NULL))
             {
               *this->absCoordinate = *this->relCoordinate;
@@ -460 +461 @@
   if( this->mode & PNODE_LOCAL_ROTATE)
     {
-      __UNLIKELY_IF( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( unlikely(this->bAbsDirChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relDirection = *this->absDirection - parent->getAbsDir();
         }
-      else __LIKELY_IF( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      else if( likely(this->bRelDirChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* update the current absDirection - remember * means rotation around sth.*/
@@ -474 +475 @@
   if( this->mode & PNODE_ROTATE_MOVEMENT)
     {
-      __UNLIKELY_IF( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( unlikely(this->bAbsCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
-      else __LIKELY_IF( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      else if( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /*this is bad style... must be deleted later - just for testing*/
@@ -496 +497 @@
     { 
       /* if this node has changed, make sure, that all children are updated also */
-      __LIKELY_IF( this->bRelCoorChanged || this->bAbsCoorChanged)
+      if( likely(this->bRelCoorChanged || this->bAbsCoorChanged))
         pn->parentCoorChanged ();
-      __LIKELY_IF( this->bRelDirChanged || this->bAbsDirChanged)
+      if( likely(this->bRelDirChanged || this->bAbsDirChanged))
         pn->parentDirChanged ();
 

orxonox/trunk/src/lib/math/vector.cc

@@ -1 @@
-
-
 /* 
    orxonox - the future of 3D-vertical-scrollers
@@ -66 +64 @@
 Vector Vector::operator/ (float f) const
 {
-  __UNLIKELY_IF( f == 0.0)
+  if( unlikely(f == 0.0))
   {
     // Prevent divide by zero
@@ -105 +103 @@
 {
   float l = len();
-  __UNLIKELY_IF(l != 1.0)
+  if(unlikely(l != 1.0))
     {
       return this;
     }
-  else __UNLIKELY_IF(l == 0.0)
+  else if(unlikely(l == 0.0))
     {
       return 0;

orxonox/trunk/src/lib/math/vector.h

@@ -10 +10 @@
 
 #include <math.h>
-#include "stdincl.h"
+#include "compiler.h"
 //! PI the circle-constant
 #define PI 3.14159265359f
@@ -41 +41 @@
   inline void normalize() { 
                       float l = len(); 
-                      __UNLIKELY_IF( l == 0.0) 
+                      if( unlikely(l == 0.0)) 
                         { 
                           // Prevent divide by zero

orxonox/trunk/src/lib/util/list.h

@@ -3 +3 @@
 #define _LIST_H
 
-#include "stdincl.h"
+#include "compiler.h"
+#ifndef NULL
+#define NULL 0
+#endif
 
 //! An enum to list all the modes available when adding an object to a List
@@ -38 +41 @@
     listElement* next;
   };
-  Uint32 size;
+  unsigned int size;
   listElement* first;
   listElement* last;
@@ -118 +121 @@
 
  private:
-  Uint32 size;
+  unsigned int size;
   listElement<T>* first;
   listElement<T>* last;
@@ -153 +156 @@
 inline void tList<T>::add(T* entity)
 {
-  __UNLIKELY_IF( entity == NULL) return;
+  if( unlikely(entity == NULL)) return;
   listElement<T>* el = new listElement<T>;
   el->prev = this->last;
@@ -161 +164 @@
   this->last = el;
 
-  __UNLIKELY_IF(el->prev == NULL) this->first = el; /* if first element */
+  if( unlikely(el->prev == NULL)) this->first = el; /* if first element */
   else el->prev->next = el;
   this->size++;
@@ -174 +177 @@
   while( this->currentEl != NULL)
     {
-      __UNLIKELY_IF( this->currentEl->curr == entity)
+      if( unlikely(this->currentEl->curr == entity))
         { 
-          __UNLIKELY_IF( this->currentEl->prev  == NULL ) this->first = this->currentEl->next;
+          if( unlikely(this->currentEl->prev  == NULL)) this->first = this->currentEl->next;
           else this->currentEl->prev->next = this->currentEl->next;
 
-          __UNLIKELY_IF( this->currentEl->next == NULL) this->last = this->currentEl->prev;
+          if( unlikely(this->currentEl->next == NULL)) this->last = this->currentEl->prev;
           else this->currentEl->next->prev = this->currentEl->prev;
 

orxonox/trunk/src/t_animation.h

@@ -22 +22 @@
 
 #include "animation.h"
+
+#define DELTA_X 0.05  //!< the percentag of the distance that doesnt have to be done by neg_exp (asymptotical) ~ maschinendelta
 
 //! A Class to handle some animation for single floated values.