Changeset 3651 in orxonox.OLD

Timestamp:

Mar 24, 2005, 11:25:09 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now got the trick with inline functions. they have to be placed at the same place as the header files are. modified BaseObject to be more performant, now isFinalized needs only 0.5 cycles! next stop, vector class

Location:

orxonox/trunk/src

Files:

• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (1 diff)
• orxonox.cc (modified) (6 diffs)

orxonox/trunk/src/lib/lang/base_object.cc

@@ -60 +60 @@
 }
 
-
+/*
 bool BaseObject::isFinalized()
 {
-  return this->finalized;
+  
 }
-
+*/
 
 void BaseObject::finalize()

orxonox/trunk/src/lib/lang/base_object.h

@@ -21 +21 @@
   bool isA (char* className);
 
-  bool isFinalized();
+  inline bool isFinalized() { return this->finalized; }
   void finalize();
 

orxonox/trunk/src/orxonox.cc

@@ -334 +334 @@
 #include "vector.h"
 #include "player.h"
+#include "base_object.h"
 #include "primitive.h"
 #include <asm/msr.h>
@@ -469 +470 @@
 
       
+      mittel = 0;
+      BaseObject* bo = new BaseObject();
+      for(i = 0; i < ITERATIONS; ++i)
+        {
+          rdtscl(ini);
+          
+          bo->isFinalized();
+           
+          rdtscl(end);
+          mittel += (end - ini - dt);
+          }
+      //delete w;
+      mi = mittel / (float)ITERATIONS;
+      printf(" Inl funct BaseObject::isFinazlized(): \t%11.2f\n", mi);
+
+      
       tList<WorldEntity>* list = new tList<WorldEntity>();
 
@@ -545 +562 @@
           float mi;
           int i = 0;
+          // quaternion generieren mit spez konstruktor
+          mittel = 0;
+          Vector* qa = new Vector(4.6, 9.3, 0.4);
+          Vector* qb = new Vector(3.5, 6.1, 4.3);
+          for(i = 0; i < VECTOR_MAX; ++i)
+            {
+              rdtscl(ini);
+              
+              Quaternion* qu = new Quaternion(*qa, *qb);
+              
+              rdtscl(end);
+              delete qu;
+              mittel += (end - ini - dt);
+            }
+          delete a;
+          delete b;
+          mi = mittel / (float)VECTOR_MAX;
+          printf(" Gen. quatern. betw. two vectors:\t%11.2f\n", mi);
+
+
           // multiplication
           mittel = 0;
@@ -557 +594 @@
             }
           mi = mittel / (float)VECTOR_MAX;
-          printf(" Multiplying two quat. (=rot):\t\t%11.2f\n", mi);
-
-
-          // multiplication
+          printf(" Multiplying two quat.(=rot): a * b\t%11.2f\n", mi);
+          
+
+
+          // rotating a vector by a quaternion
           mittel = 0;
           for(i = 0; i < VECTOR_MAX; ++i)
@@ -566 +604 @@
               rdtscl(ini);
               
-              *c = *a * *b;
+              *qa = a->apply(*qb);
               
               rdtscl(end);
@@ -572 +610 @@
             }
           mi = mittel / (float)VECTOR_MAX;
-          printf(" Multiplying two quat.(=rot):\t\t%11.2f\n", mi);
-          
-          
+          printf(" Rot a vec by a quat: q->apply(v)\t%11.2f\n", mi);
+          
+          
+
+          // generate rotation matrix
+          mittel = 0;
+          float matrix[4][4];
+          for(i = 0; i < VECTOR_MAX; ++i)
+            {
+              rdtscl(ini);
+              
+              a->matrix(matrix);
+              
+              rdtscl(end);
+              mittel += (end - ini - dt);
+            }
+          mi = mittel / (float)VECTOR_MAX;
+          printf(" Generate rot matrix: q->matrix(m)\t%11.2f\n", mi);
+          
+          
+
+          
+
         }