Changeset 7108 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 11:22:34 PM (19 years ago)

Author:

bensch

Message:

lighting war

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (2 diffs)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/camera.h (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -587 +587 @@
 void GraphicsEngine::draw() const
 {
-
-  LightManager::getInstance()->draw();
+//  LightManager::getInstance()->draw();
 
   GraphicsEngine::storeMatrices();

trunk/src/story_entities/game_world.cc

@@ -420 +420 @@
   // set camera
   this->dataTank->localCamera->apply ();
+  this->dataTank->localCamera->project ();
+  LightManager::getInstance()->draw();
 
   /* draw all WorldEntiy groups */
@@ -447 +449 @@
   engine->draw();
 
+
   // draw the game ruls
   if( likely(this->dataTank->gameRule != NULL))

trunk/src/world_entities/camera.cc

@@ -178 +178 @@
     // setting up the perspective
   // speed-up feature
+  glMatrixMode (GL_MODELVIEW);
+  glLoadIdentity();
+
+
+}
+
+void Camera::project()
+{
   Vector cameraPosition = this->getAbsCoor();
   Vector targetPosition = this->target->getAbsCoor();
 
-  glMatrixMode (GL_MODELVIEW);
-  glLoadIdentity();
-
-     // Setting the Camera Eye, lookAt and up Vectors
+       // Setting the Camera Eye, lookAt and up Vectors
   gluLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
             targetPosition.x, targetPosition.y, targetPosition.z,
             this->upVector.x, this->upVector.y, this->upVector.z);
-
-
-}
+}
+
 
 /**

trunk/src/world_entities/camera.h

@@ -54 +54 @@
   void tick(float dt);
   void apply ();
+  void project();
 
   void process(const Event &event);