Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/skysphere.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/world_entities/skysphere.cc (modified) (9 diffs)

orxonox/branches/levelloader/src/world_entities/skysphere.cc

@@ -24 +24 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+
 #include "material.h"
 #include "skysphere.h"
@@ -29 +31 @@
 #include "vector.h"
 #include "world_entity.h"
-
 
 using namespace std;
@@ -38 +39 @@
 Skysphere::Skysphere()
 {  
-  initialize("../data/pictures/sky-replace.jpg");
+  this->initialize("../data/pictures/sky-replace.jpg");
 }
+
 
 /**
@@ -47 +49 @@
 Skysphere::Skysphere(char* fileName)
 {
-  initialize(fileName);
+  this->initialize(fileName);
 }
+
 
 /**
@@ -56 +59 @@
 {
   PRINTF(3)("Deleting the SkySphere\n");
-  delete skyMaterial;
-  free(sphereObj);
+  delete this->skyMaterial;
+  free(this->sphereObj);
 }
 
@@ -69 +72 @@
   this->sphereObj = gluNewQuadric();
   gluQuadricTexture(this->sphereObj, GL_TRUE);
-  this->setRadius(250.0);
+  this->setRadius(1900.0);
 
   this->skyMaterial = new Material("Sky");
@@ -75 +78 @@
   this->skyMaterial->setIllum(3);
   this->skyMaterial->setAmbient(1.0, 1.0, 1.0);
-}
-
-
-/**
-   \brief sets the Radius of the Sphere.
-   \param radius The Radius of The Sphere
-*/
-void Skysphere::setRadius(float radius)
-{
-  this->sphereRadius = radius;
 }
 
@@ -99 +92 @@
 
 /**
-   \brief updates the position of the Skysphere
-   \param sphereCenter The coordinate of the Center of the Sphere
-   
-   This is normally done in the update-phase of world, so the Skysphere is always centered at the Camera.
-*/
-void Skysphere::updatePosition(Vector sphereCenter)
-{
-  this->sphereCenter = sphereCenter;
-}
-
-
-/**
    \brief draws the Skysphere
    
@@ -117 +98 @@
 void Skysphere::draw()
 {
-  glEnable(GL_TEXTURE_2D);
+  glPushMatrix();
+  glMatrixMode(GL_MODELVIEW);
+  glTranslatef(this->absCoordinate.x,
+               this->absCoordinate.y,
+               this->absCoordinate.z);
+
+  //glRotatef(-30, 1, 0, 0);
+  //glRotatef(95.0f, 0.0f, 0.0f, 1.0f);
+  //glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
+  
   skyMaterial->select();
-  glPushMatrix();
-  glTranslatef(this->sphereCenter.x,this->sphereCenter.y,this->sphereCenter.z);
-  
-  glRotatef(-30, 1, 0, 0);
-  glRotatef(95.0f, 0.0f, 0.0f, 1.0f);
-  glRotatef(-250.0f, 0.0, 1.0f, 0.0f);
-  
-  gluSphere(sphereObj, sphereRadius, 20, 20);
+  gluSphere(this->sphereObj, this->sphereRadius, 20, 20);
   glPopMatrix();
-  glDisable(GL_TEXTURE_2D);
 }
+
+
+/**
+   \brief sets the Radius of the Sphere.
+   \param radius The Radius of The Sphere
+*/
+void Skysphere::setRadius(float radius)
+{
+  this->sphereRadius = radius;
+}