Changeset 3307 in orxonox.OLD

Timestamp:

Dec 30, 2004, 12:55:57 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: now parenting works visibly good meaning, that the old abilities have been reimplemented and are working now. turned coord system again to the old one to be able to enjoy the terrific green lands of orxonox

Location:

orxonox/branches/parenting/src

Files:

• camera.cc (modified) (1 diff)
• player.cc (modified) (2 diffs)
• world.cc (modified) (2 diffs)

orxonox/branches/parenting/src/camera.cc

@@ -238 +238 @@
   /* orientation and */
   //glMultMatrixf ((float*)matrix);
+
   /*  translation */
-  glTranslatef (this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z );
-  //glTranslatef (-actualPlace.r.x, -actualPlace.r.y,- actualPlace.r.z);
-//Placement *plBound = bound->get_placement();
+  //glTranslatef (this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z );
+
 
   // ===== second camera control calculation option

orxonox/branches/parenting/src/player.cc

@@ -104 +104 @@
   
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  //PN glTranslatef(getPlacement()->r.x, getPlacement()->r.y, getPlacement()->r.z);
-  //getPlacement()->w.matrix (matrix);
+  printf("Player::draw() - (%f, %f, %f)\n", this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  //rotate
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
   
   glMatrixMode(GL_MODELVIEW);
-  //glRotatef(-90, 0,1,0);
   obj->draw();
   // glCallList(objectList);
@@ -137 +136 @@
   Vector direction (1.0, 0.0, 0.0);
   //direction = this->absDirection.apply (direction);
-  Vector orthDirection (0.0, 0.0, 1.0);
+  Vector orthDirection (0.0, 1.0, 0.0);
   //orthDirection = orthDirection.cross (direction);
 

orxonox/branches/parenting/src/world.cc

@@ -449 +449 @@
 void World::draw ()
 {
-  // draw geometry
-  
   // draw entities
   WorldEntity* entity;
-  
-  //((WorldEntity*)this->nullParent)->processDraw ();
-
-  
   entity = this->entities->enumerate();
   while( entity != NULL ) 
@@ -462 +456 @@
       if( entity->bDraw ) entity->draw();
       entity = this->entities->nextElement();
-    }
-  
+    } 
   
   // draw debug coord system