Changeset 3607 in orxonox.OLD

Timestamp:

Mar 20, 2005, 10:38:59 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: stdincl was still included everywhere. removed it out of the stdincl.h file to enable the possibility of compile-speedup. added some testclasses for vector/quaternion.

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• camera.cc (modified) (1 diff)
• defs/stdincl.h (modified) (2 diffs)
• lib/coord/helper_parent.h (modified) (1 diff)
• lib/coord/null_parent.cc (modified) (3 diffs)
• lib/coord/null_parent.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (20 diffs)
• lib/coord/p_node.h (modified) (3 diffs)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (1 diff)
• lib/math/quaternion.h (added)
• lib/math/vector.cc (modified) (1 diff)
• lib/math/vector_new.h (added)
• track_node.cc (modified) (1 diff)
• world_entities/primitive.cc (modified) (4 diffs)
• world_entities/skysphere.cc (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -112 +112 @@
                  lib/util/ini_parser.h \
                  lib/math/vector.h \
+                 lib/math/vector_new.h \
+                 lib/math/quaternion.h \
                  lib/math/curve.h \
                  glmenu/glmenu_imagescreen.h 

orxonox/trunk/src/Makefile.in

@@ -313 +313 @@
                  lib/util/ini_parser.h \
                  lib/math/vector.h \
+                 lib/math/vector_new.h \
+                 lib/math/quaternion.h \
                  lib/math/curve.h \
                  glmenu/glmenu_imagescreen.h 

orxonox/trunk/src/camera.cc

@@ -240 +240 @@
 
   // ===== second camera control calculation option
-  
-  gluLookAt(this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z, 
+
+  Vector r = this->getAbsCoor();
+  gluLookAt(r.x, r.y, r.z, 
             this->parent->getAbsCoor ().x, this->parent->getAbsCoor ().y, this->parent->getAbsCoor ().z,
             0.0, 1.0, 0.0);

orxonox/trunk/src/defs/stdincl.h

@@ -11 +11 @@
 #define null 0   //!< null
 
+
 typedef unsigned char byte;
 
@@ -22 +23 @@
 #endif
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>

orxonox/trunk/src/lib/coord/helper_parent.h

@@ -8 +8 @@
 #define _HELPER_PARENT_H
 
-#include "stdincl.h"
+
 #include "p_node.h"
 

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

@@ -19 +19 @@
 
 #include "null_parent.h"
+#include "stdincl.h"
 
 
@@ -51 +52 @@
   this->parent = this;
   this->mode = PNODE_ALL;
-  this->absCoordinate = *absCoordinate;
+  *this->absCoordinate = *absCoordinate;
   this->setName("NullParent");
 }
@@ -77 +78 @@
 {
 
-  PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
-  this->absCoordinate = this->relCoordinate;
-  this->absDirection = parent->getAbsDir () * this->relDirection;
+  PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
+  *this->absCoordinate = *this->relCoordinate;
+  *this->absDirection = parent->getAbsDir () * *this->relDirection;
   
   PNode* pn = this->children->enumerate ();

orxonox/trunk/src/lib/coord/null_parent.h

@@ -8 +8 @@
 #define _NULL_PARENT_H
 
-#include "stdincl.h"
+
 #include "p_node.h"
 

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

@@ -21 +21 @@
 
 #include "p_node.h"
+#include "stdincl.h"
 
 #include "null_parent.h"
-#include "vector.h"
+//#include "vector.h"
+//#include "quaternion.h"
 
 using namespace std;
@@ -51 +53 @@
   this->init(parent);
 
-  this->absCoordinate = *absCoordinate;
+  *this->absCoordinate = *absCoordinate;
   if (parent != NULL)
     {
-      this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+      *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
       parent->addChild (this);
     }
   else 
-    this->relCoordinate = Vector(0,0,0);
+    this->relCoordinate = new Vector(0,0,0);
 }
 
@@ -92 +94 @@
 }
 
+
 void PNode::init(PNode* parent)
 {
@@ -101 +104 @@
   this->parent = parent; 
   this->objectName = NULL;
+
+  this->absCoordinate = new Vector();
+  this->relCoordinate = new Vector();
+  this->absDirection = new Quaternion();
+  this->relDirection = new Quaternion();
 }
 
@@ -130 +138 @@
 Vector PNode::getRelCoor ()
 {
-  Vector r = this->relCoordinate; /* return a copy, so it can't be modified */
+  Vector r = *this->relCoordinate; /* return a copy, so it can't be modified */
   return r;
 }
@@ -146 +154 @@
 {
   this->bRelCoorChanged = true;
-  this->relCoordinate = *relCoord;
+  *this->relCoordinate = *relCoord;
 }
 
@@ -156 +164 @@
 Vector PNode::getAbsCoor ()
 {
-  return this->absCoordinate;
+  return *this->absCoordinate;
 }
 
@@ -170 +178 @@
 {
   this->bAbsCoorChanged = true;
-  this->absCoordinate = *absCoord;
+  *this->absCoordinate = *absCoord;
 }
 
@@ -198 +206 @@
   if( this->bAbsCoorChanged)
     {
-      this->absCoordinate = this->absCoordinate + *shift;
+      *this->absCoordinate = *this->absCoordinate + *shift;
     }
   else 
     {
-      this->relCoordinate = this->relCoordinate + *shift;
+      *this->relCoordinate = *this->relCoordinate + *shift;
       this->bRelCoorChanged = true;
     }
@@ -215 +223 @@
 Quaternion PNode::getRelDir ()
 {
-  return this->relDirection;
+  return *this->relDirection;
 }
 
@@ -230 +238 @@
 {
   this->bRelCoorChanged = true;
-  this->relDirection = *relDir;
+  *this->relDirection = *relDir;
 }
 
@@ -240 +248 @@
 Quaternion PNode::getAbsDir ()
 {
-  return this->absDirection;
+  return *this->absDirection;
 }
 
@@ -255 +263 @@
 {
   this->bAbsDirChanged = true;
-  this->absDirection = *absDir;
+  *this->absDirection = *absDir;
 }
 
@@ -410 +418 @@
 void PNode::update ()
 {
-  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
   // printf("%s", this->objectName);
   if(this->mode & PNODE_MOVEMENT )
@@ -417 +425 @@
         {
           /* if you have set the absolute coordinates this overrides all other changes */
-          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+          *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
       else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -424 +432 @@
           if( this->parent == NULL)
             {
-              this->absCoordinate = this->relCoordinate;
+              *this->absCoordinate = *this->relCoordinate;
             }
           else
-            this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;         /* update the current absCoordinate */
+            *this->absCoordinate = parent->getAbsCoor() + *this->relCoordinate;       /* update the current absCoordinate */
         }
     }
@@ -436 +444 @@
         {
           /* if you have set the absolute coordinates this overrides all other changes */
-          this->relDirection = this->absDirection - parent->getAbsDir();
+          *this->relDirection = *this->absDirection - parent->getAbsDir();
         }
       else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* update the current absDirection - remember * means rotation around sth.*/
-          this->absDirection = parent->getAbsDir() * this->relDirection;
+          *this->absDirection = parent->getAbsDir() * *this->relDirection;
         }
     }
@@ -450 +458 @@
         {
           /* if you have set the absolute coordinates this overrides all other changes */
-          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+          *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
       else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -456 +464 @@
           /*this is bad style... must be deleted later - just for testing*/
           if( this->parent == NULL)
-            this->absCoordinate = this->relCoordinate;
+            *this->absCoordinate = *this->relCoordinate;
           else
-            this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);              /* update the current absCoordinate */
+            *this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(*this->relCoordinate);            /* update the current absCoordinate */
         }
     }
@@ -505 +513 @@
 {
   PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n", 
-         this->absCoordinate.x, 
-         this->absCoordinate.y,
-         this->absCoordinate.z);
+         this->absCoordinate->x, 
+         this->absCoordinate->y,
+         this->absCoordinate->z);
 }
 

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

@@ -23 +23 @@
 
 #include "base_object.h"
+#include "vector.h"
 
 // FORWARD DEFINITION \\
@@ -28 +29 @@
 class Quaternion;
 class Vector;
+template<class T> class tList;
 
 //! enumeration for the different translation-binding-types
@@ -102 +104 @@
   bool bRelDirChanged;     //!< If Relative Direction has changed since last time we checked
 
-  Vector relCoordinate;    //!< coordinates relative to the parent
-  Vector absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
-  Quaternion relDirection; //!< direction relative to the parent
-  Quaternion absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
+  Vector* relCoordinate;    //!< coordinates relative to the parent
+  Vector* absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
+  Quaternion* relDirection; //!< direction relative to the parent
+  Quaternion* absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
 
   int mode;                //!< the mode of the binding

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

@@ -18 +18 @@
 
 #include "base_object.h"
+#include "stdincl.h"
 
 

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

@@ -8 +8 @@
 #define _BASE_OBJECT_H
 
-#include "stdincl.h"
+//#include "stdincl.h"
 
 

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

@@ -65 +65 @@
 float Vector::operator* (const Vector& v) const
 {
-  return x*v.x+y*v.y+z*v.z;
+  return x * v.x + y * v.y+ z * v.z;
 }
 

orxonox/trunk/src/track_node.cc

@@ -46 +46 @@
   this->trackManager = TrackManager::getInstance();
   this->setMode(PNODE_ALL);
-  this->absCoordinate = *absCoordinate;
+  this->absCoordinate = absCoordinate;
 }
 

orxonox/trunk/src/world_entities/primitive.cc

@@ -20 +20 @@
 #include "stdincl.h"
 #include "world_entity.h"
-#include "vector.h"
 #include "objModel.h"
 
@@ -39 +38 @@
 
   this->material = new Material("Sphere");
-  this->material->setDiffuseMap("../data/pictures/load_screen.jpg");
+  //this->material->setDiffuseMap("../data/pictures/load_screen.jpg");
   this->material->setIllum(3);
-  this->material->setSpecular(1, 1, 1);
+  this->material->setAmbient(1, .5, 1);
+  Vector* v = new Vector();
+
 }
 
@@ -74 +75 @@
 void Primitive::tick (float time) 
 {
-  //  Vector v(0.0, 0.0, 1.0);
-  //  Quaternion q(10.0, v);
-  //  this->setRelDir(&(this->relDirection * q));
+  // Vector v(0.0, 0.0, 1.0);
+  // Quaternion q(10.0, v);
+  // this->setRelDir(&(this->relDirection * q));
 }
 
@@ -93 +94 @@
   //glMultMatrixf((float*)matrix);
   this->material->select();
-  gluSphere(this->object, 2, 20, 20);
+  gluSphere(this->object, 1, 6, 6);
+  //gluCylinder(this->object, 1, 1, 2, 6, 6);
+  //gluDisk(this->object, 1, 2, 6, 6);
 
   glPopMatrix();

orxonox/trunk/src/world_entities/skysphere.cc

@@ -100 +100 @@
   glPushMatrix();
   glMatrixMode(GL_MODELVIEW);
-  glTranslatef(this->absCoordinate.x,
-               this->absCoordinate.y,
-               this->absCoordinate.z);
+  Vector r = this->getAbsCoor();
+  glTranslatef(r.x, r.y, r.z);
 
   //glRotatef(-30, 1, 0, 0);