Changeset 8619 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 20, 2006, 1:24:11 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/world_entities

Files:

• environments/mapped_water.cc (modified) (6 diffs)
• skybox.h (modified) (2 diffs)

trunk/src/world_entities/environments/mapped_water.cc

@@ -80 +80 @@
   memset(pTextureReflection, 0, this->textureSize * this->textureSize * channels * sizeof(unsigned int));
   //mat.select();
-  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
+  glBindTexture(GL_TEXTURE_2D, this->mat.diffuseTextureID(0));
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
@@ -90 +90 @@
   unsigned int* pTextureRefraction = new unsigned int [this->textureSize * this->textureSize * channels];
   memset(pTextureRefraction, 0, this->textureSize * this->textureSize * channels * sizeof(unsigned int));
-  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(1));
+  glBindTexture(GL_TEXTURE_2D, this->mat.diffuseTextureID(1));
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
@@ -281 +281 @@
   ///
 
-  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
+  glBindTexture(GL_TEXTURE_2D, this->mat.diffuseTextureID(0));
 
   // Create the texture and store it on the video card
@@ -351 +351 @@
   if(pos.y > waterHeight)
   {
-    double plane[4] = {0.0, -1.0, 0.0, waterHeight}; 
+    double plane[4] = {0.0, -1.0, 0.0, waterHeight};
     glClipPlane(GL_CLIP_PLANE0, plane);
 
@@ -359 +359 @@
   {
     glCullFace(GL_FRONT);
-    double plane[4] = {0.0, 1.0, 0.0, -waterHeight}; 
+    double plane[4] = {0.0, 1.0, 0.0, -waterHeight};
     glClipPlane(GL_CLIP_PLANE0, plane);
   }
@@ -370 +370 @@
 
 
-  glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(1));
+  glBindTexture(GL_TEXTURE_2D, this->mat.diffuseTextureID(1));
 
   // Create the texture and store it on the video card

trunk/src/world_entities/skybox.h

@@ -53 +53 @@
                            const std::string& posY, const std::string& negZ, const std::string& posZ);
 
-  GLuint getTexture(SKY_SIDE side) const { return (this->material[side]) ? this->material[side]->getDiffuseTexture(): 0; };
+  GLuint getTexture(SKY_SIDE side) const { return (this->material[side]) ? this->material[side]->diffuseTextureID(): 0; };
 
   static void enableCubeMap();
@@ -69 +69 @@
   float           textureSize;     //!< this is the length of a texture (assumes a square texture)
   std::string     textureName;     //!< Name of the Texture
-  
+
   int textureName_handle;          //!< used to notify about changes of textureName
   int size_handle;                 //!< used to notify about changes of size