Changeset 4620 in orxonox.OLD for orxonox

Timestamp:

Jun 13, 2005, 11:06:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the Sky is farther now

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• story_entities/world.h (modified) (2 diffs)
• world_entities/skybox.cc (modified) (3 diffs)
• world_entities/skybox.h (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -64 +64 @@
 
 #define DEBUG_MODULE_IMPORTER           0
-#define DEBUG_MODULE_TRACK_MANAGER      5
+#define DEBUG_MODULE_TRACK_MANAGER      2
 #define DEBUG_MODULE_GARBAGE_COLLECTOR  0
 #define DEBUG_MODULE_OBJECT_MANAGER     0

orxonox/trunk/src/story_entities/world.cc

@@ -457 +457 @@
   localCamera->lookAt(tn);
   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);
@@ -639 +641 @@
 
         // 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);

orxonox/trunk/src/story_entities/world.h

@@ -27 +27 @@
 class PilotNode;
 class EventHandler;
+class SkyBox;
 
 //! The game world Interface
@@ -120 +121 @@
   ParticleEngine* particleEngine;     //!< The ParticleEngine of the World.
   Camera* localCamera;                //!< The current Camera
-  WorldEntity* sky;                   //!< The Environmental Heaven of orxonox \todo insert this to environment insted
+  SkyBox* 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

@@ -68 +68 @@
 {
   this->setClassID(CL_SKYBOX, "SkyBox");
+
+  this->size = 1900.0;
 
   this->skyModel = NULL;
@@ -84 +86 @@
 void SkyBox::postInit(void)
 {
-  this->setSize(1900.0);
   this->rebuild();
 }
@@ -161 +162 @@
 {
   this->size = size;
+  this->rebuild();
 }
 

orxonox/trunk/src/world_entities/skybox.h

@@ -34 +34 @@
   void setSize(float size);
   /** \brief assumes jpg as input-format */
-  void setTexture(const char* name) { setTextureAndType (name, "jpg");};
+  void setTexture(const char* name) { setTextureAndType (name, "jpg"); };
   void setTextureAndType(const char* name, const char* extension);
   void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back);