Changeset 3607 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 20, 2005, 10:38:59 PM (20 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/world_entities

Files:

• primitive.cc (modified) (4 diffs)
• skysphere.cc (modified) (1 diff)

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);