Changeset 7057 in orxonox.OLD for trunk/src

Timestamp:

Feb 6, 2006, 3:21:49 PM (19 years ago)

Author:

bensch

Message:

Textures can now be set the glBlendFunc, and Creature-Target-Fix

Location:

trunk/src

Files:

• lib/graphics/importer/material.cc (modified) (2 diffs)
• lib/graphics/importer/material.h (modified) (2 diffs)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)

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

@@ -48 +48 @@
   this->ambientTexture = NULL;
   this->specularTexture = NULL;
+  this->sFactor = GL_SRC_ALPHA;
+  this->tFactor = GL_ONE;
 
   this->setName(mtlName);
@@ -112 +114 @@
   {
     glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE/*_MINUS_SRC_ALPHA*/);
+    glBlendFunc(this->sFactor, this->tFactor);
   }
   else

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

@@ -46 +46 @@
   void setTransparency (float trans);
   void setTransparency (char* trans);
+  void setBlendFunc(GLenum sFactor, GLenum tFactor) { this->sFactor = sFactor; this->tFactor = tFactor; };
 
  // MAPPING //
@@ -63 +64 @@
     float       shininess;        //!< The shininess of the Material.
     float       transparency;     //!< The transperency of the Material.
+    GLenum      sFactor;
+    GLenum      tFactor;
 
     Texture*    diffuseTexture;   //!< The diffuse texture of the Material.

trunk/src/world_entities/creatures/md2_creature.cc

@@ -171 +171 @@
 
    this->cameraConnNode.addChild(this->getWeaponManager()->getFixedTarget());
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
   this->getWeaponManager()->getFixedTarget()->setRelCoor(10,0,0);