Changeset 3088 in orxonox.OLD

Timestamp:

Dec 4, 2004, 10:42:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: images will now load only to selected regions

File:

• orxonox/branches/images/importer/material.cc (modified) (4 diffs)

orxonox/branches/images/importer/material.cc

@@ -83 +83 @@
   setDiffuse(0,0,0);
   setAmbient(0,0,0);
-  setSpecular(0,0,0);
+  setSpecular(.5,.5,.5);
   setShininess(2.0);
   setTransparency(0.0);
@@ -147 +147 @@
   if (diffuseTextureSet)
     glBindTexture(GL_TEXTURE_2D, diffuseTexture);
+  else
+    glBindTexture(GL_TEXTURE_2D, 0);
   
 }
@@ -403 +405 @@
       
       /* Linear Filtering */
-      glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+      glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );                    
       glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
       if ( map )
@@ -484 +486 @@
       free(pImage);                                                             // Free the image structure
     }
-
+  return true;
 }