Changeset 5866 in orxonox.OLD for trunk

Timestamp:

Dec 1, 2005, 11:12:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: multi-texture work perfectly, try building src/subprojects/importer/multitex
and
execute
./multitex [fileName[ fileName [fileName […]]]]

Location:

trunk/src

Files:

• lib/graphics/importer/material.h (modified) (1 diff)
• subprojects/importer/multitex.cc (modified) (3 diffs)

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

@@ -51 +51 @@
   static void addTexturePath(const char* pathName);
 
- private:
-  int         illumModel;       //!< The IlluminationModel is either flat or smooth.
-  float       diffuse [4];      //!< The diffuse color of the Material.
-  float       ambient [4];      //!< The ambient color of the Material.
-  float       specular [4];     //!< The specular color of the Material.
-  float       shininess;        //!< The shininess of the Material.
-  float       transparency;     //!< The transperency of the Material.
+  private:
+    int         illumModel;       //!< The IlluminationModel is either flat or smooth.
+    float       diffuse [4];      //!< The diffuse color of the Material.
+    float       ambient [4];      //!< The ambient color of the Material.
+    float       specular [4];     //!< The specular color of the Material.
+    float       shininess;        //!< The shininess of the Material.
+    float       transparency;     //!< The transperency of the Material.
   public:
-  Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
-  Texture*    ambientTexture;   //!< The ambient texture of the Material.
-  Texture*    specularTexture;  //!< The specular texture of the Material.
+    Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
+    Texture*    ambientTexture;   //!< The ambient texture of the Material.
+    Texture*    specularTexture;  //!< The specular texture of the Material.
 };
 #endif

trunk/src/subprojects/importer/multitex.cc

@@ -33 +33 @@
 TextureSequence* seq;
 Texture* test;
+Material* testMat;
+
 float counter = 0;
+
 
 void Framework::moduleInit(int argc, char** argv)
 {
   ResourceManager::getInstance()->addImageDir("./");
+
+  testMat = new Material;
 
   seq = new TextureSequence();
@@ -46 +51 @@
   }
   test = new Texture(argv[1]);
+  testMat->setDiffuseMap(argv[1]);
 
   ResourceManager::getInstance()->addImageDir("");
 
 
-  obj = new PrimitiveModel(PRIM_CYLINDER);
+  obj = new PrimitiveModel(PRIM_SPHERE, 10.0);
 
   ResourceManager::getInstance()->debug();
@@ -84 +90 @@
 void Framework::moduleDraw(void) const
 {
-  float diffuse[] = {1,1,1,1};
-  float ambient[] = {1,0,0,1};
-  float specular[] = {1,0,1,1};
-  // setting diffuse color
-  //  glColor3f (diffuse[0], diffuse[1], diffuse[2]);
-  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
-
-  // setting ambient color
-  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
-
-  // setting up Sprecular
-  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
-
-  // setting up Shininess
-  glMaterialf(GL_FRONT, GL_SHININESS, .4);
-  glShadeModel(GL_SMOOTH);
-
-  glEnable(GL_TEXTURE_2D);
+  testMat->select();
   glBindTexture(GL_TEXTURE_2D, seq->getTexture());
-//  printf("Number = %d\n", seq->getTexture());
-    /* This allows alpha blending of 2D textures with the scene */
-//     if (seq->hasAlpha())
-//     {
-//       glEnable(GL_BLEND);
-//       glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-//     }
-
   obj->draw();