Changeset 6511 in orxonox.OLD

Timestamp:

Jan 17, 2006, 2:03:02 AM (18 years ago)

Author:

patrick

Message:

network: skybox is now fixed, there is no seam on the border anymore, some more texture work for the stars background

Location:

branches/network/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/importer/texture.cc (modified) (2 diffs)
• world_entities/skybox.cc (modified) (3 diffs)
• world_entities/skybox.h (modified) (2 diffs)

branches/network/src/lib/graphics/graphics_engine.cc

@@ -270 +270 @@
     this->hwExtensions = new SubString((char*)glGetString(GL_EXTENSIONS), " \n\t,");
 
-  PRINT(4)("Running on : %s %s %s\n", vendor, renderer, version);
+  PRINT(4)("Running on : vendor: %s,  renderer: %s,  version:%s\n", vendor, renderer, version);
   PRINT(4)("Extensions:\n");
   if (this->hwExtensions != NULL)

branches/network/src/lib/graphics/importer/texture.cc

@@ -260 +260 @@
   glBindTexture(target, texture);
 
-  glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+  glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+
+  glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR/*_MIPMAP_LINEAR*/);
   glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
-
-  glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);
-  glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_REPEAT);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_PRIORITY, this->priority);
+
 
   /* control the mipmap levels */
-//   glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);f
-//   glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
-  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_PRIORITY, this->priority);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MIN_LOD, 5);
+  glTexParameterf(GL_TEXTURE_ENV, GL_TEXTURE_MAX_LOD, 0);
 
   /* build the Texture  OpenGL V >= 1.1 */
@@ -294 +295 @@
     PRINTF(1)("Error while loading texture (mipmap generation), gluBuild2DMipmaps returned %i\n", errorCode);
 
-  glBindTexture(target, 0);
+
   return texture;
 }

branches/network/src/world_entities/skybox.cc

@@ -72 +72 @@
   this->toList(OM_ENVIRON_NOTICK);
   this->size = 100.0;
+  this->textureSize = 1024.0f;
 
   for (int i = 0; i < 6; i++)
@@ -205 +206 @@
 }
 
+
+
+void SkyBox::draw()
+{
+  glPushAttrib(GL_LIGHTING_BIT);
+  glDisable(GL_LIGHTING);
+  WorldEntity::draw();
+//   glEnable(GL_LIGHTING);
+  glPopAttrib();
+
+}
+
+
 /**
  *  rebuilds the SkyBox
@@ -223 +237 @@
   model->addVertex (0.5*size, -0.5*size, -0.5*size);
 
-  model->addVertexTexture (0.0, 1.0);
-  model->addVertexTexture (1.0, 1.0);
-  model->addVertexTexture (1.0, 0.0);
-  model->addVertexTexture (0.0, 0.0);
+//   model->addVertexTexture (0.0, 1.0);
+//   model->addVertexTexture (1.0, 1.0);
+//   model->addVertexTexture (1.0, 0.0);
+//   model->addVertexTexture (0.0, 0.0);
+
+  model->addVertexTexture (1.0/this->textureSize, (this->textureSize - 1.0)/this->textureSize);
+  model->addVertexTexture ((this->textureSize - 1.0)/this->textureSize, (this->textureSize - 1.0)/this->textureSize);
+  model->addVertexTexture ((this->textureSize - 1.0)/this->textureSize, 1.0/this->textureSize);
+  model->addVertexTexture (1.0/this->textureSize, 1.0/this->textureSize);
+
 
   model->addVertexNormal (0.0, 0.0, 1.0);

branches/network/src/world_entities/skybox.h

@@ -33 +33 @@
   void postInit();
 
+  virtual void draw();
 
   void setSize(float size);
@@ -60 +61 @@
 
   float           size;            //!< Size of the SkyBox. This should match the frustum maximum range.
+  float           textureSize;     //!< this is the length of a texture (assumes a square texture)
   char*           textureName;     //!< Name of the Texture