Commit d3eff725 authored by cutealien's avatar cutealien

- Material type EMT_TRANSPARENT_ALPHA_CHANNEL_REF no longer ignores light in OpenGL.

- Material type EMT_LIGHTMAP_ADD does now use GL_ADD in OpenGL which makes it look identical do the D3D version.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2740 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 911ca538
...@@ -177,7 +177,7 @@ public: ...@@ -177,7 +177,7 @@ public:
{ {
return true; return true;
} }
private: private:
u32 getGLBlend ( E_BLEND_FACTOR factor ) const u32 getGLBlend ( E_BLEND_FACTOR factor ) const
...@@ -405,7 +405,7 @@ public: ...@@ -405,7 +405,7 @@ public:
{ {
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.5f); glAlphaFunc(GL_GREATER, 0.5f);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
} }
} }
...@@ -466,7 +466,7 @@ public: ...@@ -466,7 +466,7 @@ public:
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);
if (material.MaterialType == EMT_LIGHTMAP_ADD) if (material.MaterialType == EMT_LIGHTMAP_ADD)
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_ADD_SIGNED_ARB); glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_ADD);
else else
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_MODULATE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment