diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-22 02:07:51 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-22 02:07:51 +0400 |
| commit | c44670f6cd4ca6631c2cd98a029f8d27084be4f8 (patch) | |
| tree | f9624b84ca643a0702ff5b4e65c7730ccf34a447 /source/gameengine/Rasterizer | |
| parent | 4dc1ac2a7c5c64f7c12bc160366ab1c1733498d6 (diff) | |
Apricot Branch
==============
* Made GLSL respect opaque/add/alpha/clip flags.
* Fix bug for all material types to correctly deal with
different transp flags in a single mesh.
* Also made 3d view material alpha code a bit easier to
understand.
Diffstat (limited to 'source/gameengine/Rasterizer')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_IPolygonMaterial.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp index cb10ba6bf37..6f04ce5d866 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp @@ -39,6 +39,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname, int tilexrep, int tileyrep, int mode, + int transp, bool transparant, bool zsort, int lightlayer, @@ -51,6 +52,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname, m_tilexrep(tilexrep), m_tileyrep(tileyrep), m_drawingmode (mode), + m_transp(transp), m_transparant(transparant), m_zsort(zsort), m_lightlayer(lightlayer), @@ -74,6 +76,7 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const this->m_multimode == lhs.m_multimode && this->m_flag == lhs.m_flag && this->m_drawingmode == lhs.m_drawingmode && + this->m_transp == lhs.m_transp && this->m_lightlayer == lhs.m_lightlayer && this->m_texturename.hash() == lhs.m_texturename.hash() && this->m_materialname.hash() == lhs.m_materialname.hash() @@ -86,6 +89,7 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const this->m_tilexrep == lhs.m_tilexrep && this->m_tileyrep == lhs.m_tileyrep && this->m_transparant == lhs.m_transparant && + this->m_transp == lhs.m_transp && this->m_zsort == lhs.m_zsort && this->m_drawingmode == lhs.m_drawingmode && this->m_bIsTriangle == lhs.m_bIsTriangle && diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h index d2d1dba99d9..fd5c6d5a59f 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h @@ -68,6 +68,7 @@ protected: int m_tilexrep,m_tileyrep; int m_drawingmode; // tface->mode bool m_transparant; + int m_transp; bool m_zsort; int m_lightlayer; bool m_bIsTriangle; @@ -102,6 +103,7 @@ public: int tilexrep, int tileyrep, int mode, + int transp, bool transparant, bool zsort, int lightlayer, |