Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/world_entities/skybox.cc

Timestamp:

May 9, 2005, 11:29:19 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/world_entities/skybox.cc (modified) (10 diffs)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

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

@@ -28 +28 @@
 
 #include "skybox.h"
+
 #include "stdincl.h"
+#include "factory.h"
 
 #include "material.h"
@@ -36 +38 @@
 //#include "world_entity.h"
 
+CREATE_FACTORY(SkyBox);
 
 using namespace std;
@@ -44 +47 @@
 */
 SkyBox::SkyBox(char* fileName)
+{
+  this->preInit();
+  this->postInit();
+}
+
+SkyBox::SkyBox(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->model == NULL)
+    {
+      PRINTF(0)("SkyBox model '%s' could not be loaded\n", string);
+    }
+  this->postInit();
+}
+
+void SkyBox::preInit(void)
 {
   this->setClassName("SkyBox");
@@ -56 +86 @@
     }
   this->setMode(PNODE_MOVEMENT);
-
+}
+
+void SkyBox::postInit(void)
+{
   this->setSize(1900.0);
+  this->rebuild();
 }
 
@@ -67 +101 @@
 {
   PRINTF(5)("Deleting the SkyBox\n");
-  
   for (int i = 0; i < 6; i++)
     delete this->material[i];
@@ -84 +117 @@
 void SkyBox::setTexture(const char* name, const char* extension)
 {
-  char* top    = new char[strlen(name)+strlen(extension)+ 6];
-  char* bottom = new char[strlen(name)+strlen(extension)+ 9];
-  char* left   = new char[strlen(name)+strlen(extension)+ 7];
-  char* right  = new char[strlen(name)+strlen(extension)+ 8];
-  char* front  = new char[strlen(name)+strlen(extension)+ 8];
-  char* back   = new char[strlen(name)+strlen(extension)+ 7];
+  char* top    = new char[strlen(name)+strlen(extension)+ 10];
+  char* bottom = new char[strlen(name)+strlen(extension)+ 10];
+  char* left   = new char[strlen(name)+strlen(extension)+ 10];
+  char* right  = new char[strlen(name)+strlen(extension)+ 10];
+  char* front  = new char[strlen(name)+strlen(extension)+ 10];
+  char* back   = new char[strlen(name)+strlen(extension)+ 10];
 
   sprintf(top, "%s_top.%s", name, extension);
@@ -100 +133 @@
   this->setTextures(top, bottom, left, right, front, back);
 
+  // deleted alocated memory of this function
   delete []top;
   delete []bottom;
@@ -125 +159 @@
   this->material[4]->setDiffuseMap(front);
   this->material[5]->setDiffuseMap(back);
-
-  this->rebuild();
 }
 
@@ -135 +167 @@
 {
   this->size = size;
-
-  this->rebuild();
 }
 
@@ -188 +218 @@
 
   model->setMaterial(material[0]);
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 3,2,4, 4,3,4, 6,4,4, 5,1,4); // top
+  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,3, 3,2,3, 5,3,3, 4,0,3); // top
   model->setMaterial(material[1]);
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,4,2, 8,1,2, 2,2,2, 1,3,2); // bottom
+  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,3,1, 7,0,1, 1,1,1, 0,2,1); // bottom
   model->setMaterial(material[2]);
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,1,3, 2,2,3, 4,3,3, 3,4,3); // left
+  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 0,0,2, 1,1,2, 3,2,2, 2,3,2); // left
   model->setMaterial(material[3]);
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 5,3,1, 6,4,1, 8,1,1, 7,2,1); // right
+  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 4,2,0, 5,3,0, 7,0,0, 6,1,0); // right
   model->setMaterial(material[4]);
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 2,1,6, 8,2,6, 6,3,6, 4,4,6); // front
+  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 1,0,5, 7,1,5, 5,2,5, 3,3,6); // front
   model->setMaterial(material[5]);
-  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 7,1,5, 1,2,5, 3,3,5, 5,4,5); // back
+  model->addFace (4, VERTEX_TEXCOORD_NORMAL, 6,0,4, 0,1,4, 2,2,4, 4,3,4); // back
   
   model->finalize();

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+