Changeset 3799 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 13, 2005, 5:51:48 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: using G_LIKELY() as Atilla suggested, seems only to work on linux, so its in ifdef

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (6 diffs)
• world_entities/world_entity.h (modified) (1 diff)

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

@@ -29 +29 @@
 #include "null_parent.h"
 
+#ifdef __unix__
+ #include <glib-2.0/glib/gmacros.h>
+#endif
 
 //#include "vector.h"
@@ -48 +51 @@
   np->addChild(this);
 }
+
 
 
@@ -60 +64 @@
 
   *this->absCoordinate = *absCoordinate;
-  if (parent != NULL)
+#ifdef __unix__
+  if ( G_UNLIKELY(parent != NULL))
+#else 
+  if ( parent != NULL)
+#endif
     {
       *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
@@ -244 +252 @@
 void PNode::shiftCoor (Vector* shift)
 {
+#ifdef __unix__
+  if( G_UNLIKELY(this->bAbsCoorChanged))
+#else
   if( this->bAbsCoorChanged)
+#endif
     {
       *this->absCoordinate = *this->absCoordinate + *shift;
@@ -279 +291 @@
 void PNode::shiftCoor (Vector shift)
 {
+#ifdef __unix__
+  if( G_UNLIKELY(this->bAbsCoorChanged))
+#else
   if( this->bAbsCoorChanged)
+#endif
     {
       *this->absCoordinate = *this->absCoordinate + shift;
@@ -421 +437 @@
 float PNode::getSpeed()
 {
+#ifdef __unix__
+  if( G_UNLIKELY(this->time == 0))
+#else
   if(this->time == 0)
+#endif
     return 1000;
   Vector diff;

orxonox/trunk/src/world_entities/world_entity.h

@@ -27 +27 @@
 
 
-
-  
   //void setCollision (CollisionCluster* newhull);