Changeset 4357 in orxonox.OLD

Timestamp:

May 28, 2005, 12:05:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now Textures are maped as they should
before this textures where switched upside-down, now this is done in the corresponding model's textureCoordinate

Location:

orxonox/trunk/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (2 diffs)
• lib/graphics/importer/material.cc (modified) (2 diffs)
• lib/graphics/importer/md2Model.cc (modified) (1 diff)
• lib/graphics/importer/model.cc (modified) (2 diffs)
• lib/graphics/importer/texture.cc (modified) (2 diffs)
• lib/graphics/importer/texture.h (modified) (2 diffs)
• lib/graphics/particles/particle_system.cc (modified) (1 diff)
• subprojects/particles/particle_fun.cc (modified) (7 diffs)
• world_entities/skybox.cc (modified) (1 diff)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -259 +259 @@
   backMat->select();
   glBegin(GL_TRIANGLE_STRIP);
-  glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY + imageHeight);
-  glTexCoord2i(1, 0); glVertex2i(offsetX +imageWidth, offsetY + imageHeight);
-  glTexCoord2i(0, 1); glVertex2i(offsetX, offsetY);
-  glTexCoord2i(1, 1); glVertex2i(offsetX + imageWidth, offsetY);
+  glTexCoord2i(0, 1); glVertex2i(offsetX, offsetY + imageHeight);
+  glTexCoord2i(1, 1); glVertex2i(offsetX +imageWidth, offsetY + imageHeight);
+  glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY);
+  glTexCoord2i(1, 0); glVertex2i(offsetX + imageWidth, offsetY);
   glEnd();
   
@@ -279 +279 @@
   barMat->select();
   glBegin(GL_TRIANGLE_STRIP);
-  glTexCoord2f(0, 0); glVertex2i(barX, barY + barH);
-  glTexCoord2f(val, 0); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY + barH);
-  glTexCoord2f(0, 1); glVertex2i(barX, barY);
-  glTexCoord2f(val, 1); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY);
+  glTexCoord2f(0,   1); glVertex2i(barX, barY + barH);
+  glTexCoord2f(val, 1); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY + barH);
+  glTexCoord2f(0,   0); glVertex2i(barX, barY);
+  glTexCoord2f(val, 0); glVertex2i(barX + (int)(val * this->barW * (float)screenWidth), barY);
   glEnd();
 

orxonox/trunk/src/lib/graphics/importer/material.cc

@@ -83 +83 @@
   
   // setting the transparency
+  /*
   if (this->transparency < 1.0)
     {
@@ -94 +95 @@
       glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     }
-
+  */
 
   // setting illumination Model 

orxonox/trunk/src/lib/graphics/importer/md2Model.cc

@@ -221 +221 @@
         {
           glNormal3fv(anorms[this->data->pLightNormals[pCommands[2]]]);
-          glTexCoord2f( ((float *)pCommands)[0], 1.0-((float *)pCommands)[1] );
+          glTexCoord2f( ((float *)pCommands)[0], ((float *)pCommands)[1] );
           glVertex3fv(verticesList[pCommands[2]]);
         }

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -489 +489 @@
    If a vertexTextureCoordinate line is found,
    this function will inject it into the vertexTexture-Array
+
+   !! WARNING THIS IS DIFFERNT FROM addVervexTexture(float, float); because it changes the second entry to 1-v !!
 */
 bool Model::addVertexTexture (const char* vTextureString)
@@ -497 +499 @@
   PRINTF(5)("found vertex-Texture %f, %f\n", &subbuffer1, &subbuffer2);
   this->vTexture->addEntry(subbuffer1);
-  this->vTexture->addEntry(subbuffer2);
+  this->vTexture->addEntry(1 - subbuffer2);
   this->texCoordCount++;
   return true;

orxonox/trunk/src/lib/graphics/importer/texture.cc

@@ -18 +18 @@
 #include "texture.h"
 
+#include "debug.h"
 #include "graphics_engine.h"
+
+#include <SDL_image.h>
 
 /**
@@ -167 +170 @@
 
           GLubyte* pixels = (GLubyte*)tmpSurf->pixels;
-          
-          /* this swaps the Mapping so lowel left will be upper left */
-          for( int i = 0 ; i < (tmpSurf->h / 2) ; ++i )
-            for( int j = 0 ; j < tmpSurf->w * tmpSurf->format->BytesPerPixel; j += tmpSurf->format->BytesPerPixel )
-              for(int k = 0; k < tmpSurf->format->BytesPerPixel; ++k)
-                swap( pixels[(i * tmpSurf->w * tmpSurf->format->BytesPerPixel) + j + k],
-                      pixels[ ( (tmpSurf->h - i - 1) * tmpSurf->w *  tmpSurf->format->BytesPerPixel) + j + k]);
 
           PRINTF(3)("loading Image %s\n", imageName);

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -14 +14 @@
 #include "debug.h"
 
-#include <SDL_image.h>
+enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
+                    TEXTURE_NOISE };
 
 //! A Class, that reads in Textures from different fileformats.
@@ -27 +28 @@
  public:
   Texture(const char* imageName = NULL);
+  Texture(TEXTURE_TYPE type, int resolution);
   ~Texture(void);
 

orxonox/trunk/src/lib/graphics/particles/particle_system.cc

@@ -321 +321 @@
     case PARTICLE_SPRITE:
       glMatrixMode(GL_MODELVIEW);
-      glDisable(GL_DEPTH_TEST);
+      //      glDisable(GL_DEPTH_TEST);
 
       material->select(); 
-      //      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+      //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_ENV_MODE, GL_MODULATE);
       
 

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -100 +100 @@
         {
           tmpEmit->setEmissionRate(atof(value));
-          PRINT(3)("EmissionRate set to %f\n", atof(value));
+          PRINT(4)("EmissionRate set to %f\n", atof(value));
         }
       else if (!strcmp(name, "Velocity"))
         {
           tmpEmit->setEmissionVelocity(atof(value));
-          PRINT(3)("Velocity set to %f\n", atof(value));
+          PRINT(4)("Velocity set to %f\n", atof(value));
         }
       else if(!strcmp(name, "SpreadAngle"))
         {
           tmpEmit->setSpread(atof(value));
-          PRINT(3)("SpreadAngle set to %f\n", atof(value));
+          PRINT(4)("SpreadAngle set to %f\n", atof(value));
         }
       else if(!strcmp(name, "EmitterType"))
@@ -120 +120 @@
           else if (!strcmp(value, "EMITTER_CUBE"))
             tmpEmit->setType(EMITTER_CUBE);
-          PRINT(3)("EmitterType set to %s\n", value);
+          PRINT(4)("EmitterType set to %s\n", value);
         }
       else if(!strcmp(name, "EmitterSize"))
         {
           tmpEmit->setSize(atof(value));
-          PRINT(3)("EmitterSize set to %f\n", atof(value));
+          PRINT(4)("EmitterSize set to %f\n", atof(value));
         }
     }
@@ -144 +144 @@
         {
           tmpSys->setRadius(atof(value), tmpSys->getEndRadius());
-          PRINT(3)("ParticleStartRadius set to %f\n", atof(value));
+          PRINT(4)("ParticleStartRadius set to %f\n", atof(value));
         }
       else if (!strcmp(name, "EndRadius"))
         {
           tmpSys->setRadius( tmpSys->getStartRadius(), atof(value));
-          PRINT(3)("ParticleEndRadius set to %f\n", atof(value));
+          PRINT(4)("ParticleEndRadius set to %f\n", atof(value));
         }
 
@@ -155 +155 @@
         {
           tmpSys->setLifeSpan(atof(value));
-          PRINT(3)("ParticleLifeSpan set to %f\n", atof(value));
+          PRINT(4)("ParticleLifeSpan set to %f\n", atof(value));
         }
 
@@ -161 +161 @@
         {
           tmpSys->setConserve(atof(value));
-          PRINT(3)("ParticleConserveFactor set to %f\n", atof(value));
+          PRINT(4)("ParticleConserveFactor set to %f\n", atof(value));
         }
 
@@ -173 +173 @@
             tmpSys->setType(PARTICLE_SPRITE);
 
-          PRINT(3)("ParticleType set to %s\n", value);
+          PRINT(4)("ParticleType set to %s\n", value);
         }
 
@@ -179 +179 @@
         {
           tmpSys->setInheritSpeed(atof(value));
-          PRINT(3)("ParticleInheritSpeed set to %f\n", atof(value));
+          PRINT(4)("ParticleInheritSpeed set to %f\n", atof(value));
         }
       else if (!strcmp(name, "RandomColor"))

orxonox/trunk/src/world_entities/skybox.cc

@@ -193 +193 @@
   this->skyModel->addVertex (0.5*size, -0.5*size, -0.5*size);
 
+  this->skyModel->addVertexTexture (0.0, 1.0);
+  this->skyModel->addVertexTexture (1.0, 1.0);
+  this->skyModel->addVertexTexture (1.0, 0.0);
   this->skyModel->addVertexTexture (0.0, 0.0);
-  this->skyModel->addVertexTexture (1.0, 0.0);
-  this->skyModel->addVertexTexture (1.0, 1.0);
-  this->skyModel->addVertexTexture (0.0, 1.0);
 
   this->skyModel->addVertexNormal (0.0, 0.0, 1.0);