Changeset 4621 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jun 13, 2005, 2:29:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: SkyBox now loads property size

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)
• world_entities/skybox.cc (modified) (3 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -458 +458 @@
   localCamera->setParentMode(PNODE_MOVEMENT);
   localCamera->setClipRegion(1, 10000.0);
-  this->sky->setSize(10000.0);
   this->localPlayer->setParentMode(PNODE_ALL);
   Vector* cameraOffset = new Vector (0, 5, -10);
@@ -641 +640 @@
 
         // Create SkySphere
-//         this->sky = new Skysphere("pictures/sky-replace.jpg");
-//         this->sky->setName("SkySphere");
-//         this->spawn(this->sky);
+        this->sky = new Skysphere("pictures/sky-replace.jpg");
+        this->sky->setName("SkySphere");
+        this->spawn(this->sky);
         this->localCamera->addChild(this->sky);
         this->sky->setParentMode(PNODE_MOVEMENT);
@@ -1044 +1043 @@
           this->dt = 10;
         }
-      //this->timeSlice (dt);
-
-      /* function to let all entities tick (iterate through list) */
+
       this->dtS = (float)this->dt / 1000.0;
       this->gameTime += this->dtS;

orxonox/trunk/src/story_entities/world.h

@@ -27 +27 @@
 class PilotNode;
 class EventHandler;
-class SkyBox;
 
 //! The game world Interface
@@ -121 +120 @@
   ParticleEngine* particleEngine;     //!< The ParticleEngine of the World.
   Camera* localCamera;                //!< The current Camera
-  SkyBox* sky;                        //!< The Environmental Heaven of orxonox \todo insert this to environment insted
+  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted
   LightManager* lightMan;             //!< The Lights of the Level
   Terrain* terrain;                   //!< The Terrain of the World.

orxonox/trunk/src/world_entities/skybox.cc

@@ -62 +62 @@
 
   LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture)
-    .describe("Sets the material on the SkyBox. The string must be the path relative to the data-dir, and without a trailing .jpg");
+      .describe("Sets the material on the SkyBox. The string must be the path relative to the data-dir, and without a trailing .jpg");
+
+  LoadParam<SkyBox>(root, "Size", this, &SkyBox::setSize)
+      .describe("Sets the Size of the SkyBox (normally this should be 90% of the maximal viewing Distance).");
 }
 
@@ -69 +72 @@
   this->setClassID(CL_SKYBOX, "SkyBox");
 
-  this->size = 1900.0;
+  this->size = 100.0;
 
   this->skyModel = NULL;
@@ -158 +161 @@
 /**
    \param size The new size of the SkyBox
+
+ * do not forget to rebuild the SkyBox after this.
 */
 void SkyBox::setSize(float size)
 {
   this->size = size;
-  this->rebuild();
 }