Changeset 8376 in orxonox.OLD for trunk/src/lib/graphics/importer/material.cc

Timestamp:

Jun 14, 2006, 12:13:16 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: no more seg-fault when copying a Texture

File:

• trunk/src/lib/graphics/importer/material.cc (modified) (9 diffs)

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

@@ -132 +132 @@
 
     // setting diffuse color
-  glColor4f (diffuse[0], diffuse[1], diffuse[2], this->transparency);
+  glColor4f (diffuse.r(), diffuse.g(), diffuse.b(), diffuse.a());
   // setting ambient color
-  glMaterialfv(GL_FRONT, GL_AMBIENT, this->ambient);
+  glMaterialfv(GL_FRONT, GL_AMBIENT, &this->ambient[0]);
   // setting up Sprecular
-  glMaterialfv(GL_FRONT, GL_SPECULAR, this->specular);
+  glMaterialfv(GL_FRONT, GL_SPECULAR, &this->specular[0]);
   // setting up Shininess
   glMaterialf(GL_FRONT, GL_SHININESS, this->shininess);
 
   // setting the transparency
-  if (this->transparency < 1.0 ||       /* This allows alpha blending of 2D textures with the scene */
+  if (this->diffuse.a() < 1.0 ||       /* This allows alpha blending of 2D textures with the scene */
       (likely(!this->textures.empty() && this->textures[0].hasAlpha())))
   {
@@ -206 +206 @@
 {
   PRINTF(4)("setting Diffuse Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
-  this->diffuse[0] = r;
-  this->diffuse[1] = g;
-  this->diffuse[2] = b;
-  this->diffuse[3] = 1.0;
-
+  this->diffuse = Color(r, g, b, this->diffuse.a() );
 }
 
@@ -223 +219 @@
 {
   PRINTF(4)("setting Ambient Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
-  this->ambient[0] = r;
-  this->ambient[1] = g;
-  this->ambient[2] = b;
-  this->ambient[3] = 1.0;
+  this->ambient = Color(r, g, b, 1.0);
 }
 
@@ -238 +231 @@
 {
   PRINTF(4)("setting Specular Color of Material %s to r=%f g=%f b=%f.\n", this->getName(), r, g, b);
-  this->specular[0] = r;
-  this->specular[1] = g;
-  this->specular[2] = b;
-  this->specular[3] = 1.0;
+  this->specular = Color (r, g, b, 1.0);
 }
 
@@ -260 +250 @@
 {
   PRINTF(4)("setting Transparency of Material %s to %f.\n", this->getName(), trans);
-  this->transparency = trans;
+  this->diffuse.a() = trans;
 }
 
@@ -310 +300 @@
     Texture* tex = dynamic_cast<Texture*>(ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target));
     if (tex != NULL)
-    this->textures[textureNumber] = *tex;
+      this->textures[textureNumber] = *tex;
     else
       this->textures[textureNumber] = Texture();
@@ -373 +363 @@
  * @brief Sets the Materials Ambient Map
  * @todo implement this
-*/
+ */
 void Material::setAmbientMap(const std::string& aMap, GLenum target)
 {
@@ -383 +373 @@
  * @brief Sets the Materials Specular Map
  * @param sMap the Name of the Image to Use
-   @todo implement this
-*/
+ * @todo implement this
+ */
 void Material::setSpecularMap(const std::string& sMap, GLenum target)
 {
@@ -395 +385 @@
  * @param bump the Name of the Image to Use
  * @todo implemet this
-*/
+ */
 void Material::setBump(const std::string& bump)
 {