Changeset 6467 in orxonox.OLD for trunk/src/lib

Timestamp:

Jan 11, 2006, 11:46:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Texture loading with GL_TEXTURE_* in ResourceManager and Material

Location:

trunk/src/lib/graphics/importer

Files:

• grid.cc (modified) (2 diffs)
• material.cc (modified) (4 diffs)
• material.h (modified) (1 diff)

trunk/src/lib/graphics/importer/grid.cc

@@ -33 +33 @@
   this->_sizeX = sizeX;
   this->_sizeY = sizeY;
-  this->_gridSpacingX = sizeX / rows;
-  this->_gridSpacingY = sizeY / columns;
+  this->_gridSpacingX = sizeX / (float)rows;
+  this->_gridSpacingY = sizeY / (float)columns;
 }
 
@@ -53 +53 @@
     for (unsigned int j = 1; j < this->_columns-1; j++)
     {
-     Vector test(
-          (this->vertex(i*_columns+j).y + this->vertex((i-1)*_columns+j).y - this->vertex((i+1)*_columns+j).y ) /maxHeight,
-          1.0,
-          (this->vertex(i*_columns+j).y - this->vertex(i*_columns+j-1).y + this->vertex(i*_columns+j+1).y)/maxHeight
-                );
+/*
+      Vector test( this->_gridSpacingX/(this->vertex(i*_columns+j).y - this->vertex(i*_columns+j-1).y) +
+          this->_gridSpacingX/(this->vertex(i*_columns+j+1).y - this->vertex(i*_columns+j).y)
+          ,
+      _gridSpacingX,
+      this->_gridSpacingY/(this->vertex(i*_columns+j).y - this->vertex((i-1)*_columns+j).y) +
+          this->_gridSpacingX/(this->vertex((i+1)*_columns+j).y - this->vertex(i*_columns+j).y)
+                 );*/
+
+
+
+      Vector test  (
+          (-this->vertex(i*_columns+j-1).y - this->vertex(i*_columns+j+1).y)/maxHeight,
+            1.0,
+            (-this->vertex((i-1)*_columns+j).y - this->vertex((i+1)*_columns+j).y)/maxHeight
+          );
+
+
+//      Vector test(
+//           (this->vertex(i*_columns+j).y + this->vertex((i-1)*_columns+j).y - this->vertex((i+1)*_columns+j).y ) /maxHeight,
+//           1.0,
+//           (this->vertex(i*_columns+j).y - this->vertex(i*_columns+j-1).y + this->vertex(i*_columns+j+1).y)/maxHeight
+//                 );
       this->normal( i*_columns+j) = test.getNormalized();
     }

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

@@ -274 +274 @@
  * @param dMap the Name of the Image to Use
 */
-void Material::setDiffuseMap(const char* dMap)
+void Material::setDiffuseMap(const char* dMap, GLenum target)
 {
   PRINTF(5)("setting Diffuse Map %s\n", dMap);
@@ -283 +283 @@
   //! @todo Textures from .mtl-file need special care.
   if (dMap!= NULL)
-    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME);
+    this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (void*)&target);
   else
     this->diffuseTexture = NULL;
@@ -293 +293 @@
    @todo implement this
 */
-void Material::setAmbientMap(const char* aMap)
+void Material::setAmbientMap(const char* aMap, GLenum target)
 {
   SDL_Surface* ambientMap;
@@ -304 +304 @@
    @todo implement this
 */
-void Material::setSpecularMap(const char* sMap)
+void Material::setSpecularMap(const char* sMap, GLenum target)
 {
   SDL_Surface* specularMap;

trunk/src/lib/graphics/importer/material.h

@@ -44 +44 @@
 
  // MAPPING //
-  void setDiffuseMap(const char* dMap);
-  void setAmbientMap(const char* aMap);
-  void setSpecularMap(const char* sMap);
+  void setDiffuseMap(const char* dMap, GLenum target = GL_TEXTURE_2D);
+  void setAmbientMap(const char* aMap, GLenum target = GL_TEXTURE_2D);
+  void setSpecularMap(const char* sMap, GLenum target = GL_TEXTURE_2D);
   void setBump(const char* bump);