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

Timestamp:

Jan 26, 2006, 2:44:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back
merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6755:HEAD

absolutely no conficts

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (3 diffs)
• skybox.cc (modified) (1 diff)

trunk/src/world_entities/camera.cc

@@ -178 +178 @@
 /**
  *  initialize rendering perspective according to this camera
-
-   This is called immediately before the rendering cycle starts, it sets all global
-   rendering options as well as the GL_PROJECTION matrix according to the camera.
-*/
+ *
+ * This is called immediately before the rendering cycle starts, it sets all global
+ * rendering options as well as the GL_PROJECTION matrix according to the camera.
+ */
 void Camera::apply ()
 {
@@ -193 +193 @@
                  this->nearClip,
                  this->farClip);
-
   // speed-up feature
   Vector cameraPosition = this->getAbsCoor();
   Vector targetPosition = this->target->getAbsCoor();
   Vector up = this->getAbsDirV();
-  Vector delay = Vector(0,0,0);
-  if( currentMode != VIEW_FRONT) delay = (this->target->getVelocity())/25;
+  Vector delay = Vector(0, 0, 0);
+  if( currentMode != VIEW_FRONT) delay = (this->target->getVelocity()) / 25.0f;
 
   // Setting the Camera Eye, lookAt and up Vectors
@@ -206 +205 @@
             up.x, up.y, up.z);
 
-  // switching back to Modeling Matrix
   glMatrixMode (GL_MODELVIEW);
-  //  this->target->getParent()->getParent()->debugDraw(0, 2, Vector(1,0,0));
+  glLoadIdentity();
 }
 

trunk/src/world_entities/skybox.cc

@@ -225 +225 @@
   glDisable(GL_LIGHTING);
 
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_FOG);
+
   WorldEntity::draw();
 
+  glPopAttrib();
   glPopAttrib();