Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/world_entities/skybox.cc

Timestamp:

May 24, 2005, 10:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

File:

• orxonox/branches/physics/src/world_entities/skybox.cc (modified) (4 diffs)

orxonox/branches/physics/src/world_entities/skybox.cc

@@ -11 +11 @@
 
    ### File Specific:
-   main-programmer: David Gruetter
-   co-programmer: Benjamin Grauer
-   
-   Created by Dave: this file is actually quite similar to player.cc and so is 
-   skybox.h similar to player.h
-   With that said, things should be clear:)
-   
-   Edited:
-   Bensch: more constructors, changeability, comments...
-   Patrick: giving it the common orxonox style, not much to do... good work Dave!
-
+   main-programmer: Benjamin Grauer
+   co-programmer: ...
 */
 
@@ -46 +37 @@
    \param fileName the file to take as input for the SkyBox
 */
-SkyBox::SkyBox(char* fileName)
+SkyBox::SkyBox(const char* fileName)
 {
   this->preInit();
+  if (fileName)
+    this->setTextureAndType(fileName, ".jpg");
   this->postInit();
 }
 
-SkyBox::SkyBox(TiXmlElement* root) : WorldEntity(root)
+SkyBox::SkyBox(const TiXmlElement* root) : WorldEntity(root)
 {
   this->preInit();
 
-  const char* string;
-
-  // Model Loading      
-  string = grabParameter( root, "materialset");
-  if( string != NULL)
-    this->setTexture(string, "jpg");
-  else
-    {
-      PRINTF(0)("SkyBox is missing a proper 'MaterialSet'\n");
-    }
-  if( this->skyModel == NULL)
-    {
-      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
-    }
+  this->loadParams(root);
+
   this->postInit();
+}
+
+void SkyBox::loadParams(const TiXmlElement* root)
+{
+  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");
 }
 
@@ -116 +103 @@
                "skybox_right.jpg", "skybox_front.jpg", "skybox_back.jpg");
 */
-void SkyBox::setTexture(const char* name, const char* extension)
+void SkyBox::setTextureAndType(const char* name, const char* extension)
 {
   char* top    = new char[strlen(name)+strlen(extension)+ 10];
@@ -219 +206 @@
 
   this->skyModel->setMaterial(material[0]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,3, 3,2,3, 5,3,3, 4,0,3); // top
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,0,3, 3,1,3, 5,2,3, 4,3,3); // top
   this->skyModel->setMaterial(material[1]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,3,1, 7,0,1, 1,1,1, 0,2,1); // bottom
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,1, 7,1,1, 1,2,1, 0,3,1); // bottom
   this->skyModel->setMaterial(material[2]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,2, 1,1,2, 3,2,2, 2,3,2); // left
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,2, 5,3,2, 7,0,2, 6,1,2); // left
   this->skyModel->setMaterial(material[3]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,0, 5,3,0, 7,0,0, 6,1,0); // right
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,0, 1,1,0, 3,2,0, 2,3,0); // right
   this->skyModel->setMaterial(material[4]);
-  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,6); // front
+  this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,5); // front
   this->skyModel->setMaterial(material[5]);
   this->skyModel->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back