diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-20 18:40:24 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-20 18:40:24 +0200 |
| commit | 728e7e405dd56afb4da03fd63df378d5f984ed73 (patch) | |
| tree | fcde9f55e1ca79c1ce3b8a8f642894fce587978a /src | |
| parent | 40e065aea947b45700930d431754282c23d1de45 (diff) | |
| download | colobot-728e7e405dd56afb4da03fd63df378d5f984ed73.tar.gz colobot-728e7e405dd56afb4da03fd63df378d5f984ed73.tar.bz2 colobot-728e7e405dd56afb4da03fd63df378d5f984ed73.zip | |
Transparent plant textures
Diffstat (limited to 'src')
| -rw-r--r-- | src/graphics/engine/modelfile.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/graphics/engine/modelfile.cpp b/src/graphics/engine/modelfile.cpp index c0d04a0..3b0343a 100644 --- a/src/graphics/engine/modelfile.cpp +++ b/src/graphics/engine/modelfile.cpp @@ -608,9 +608,6 @@ bool CModelFile::ReadModel(std::istream& stream) triangle.state = t.state; triangle.variableTex2 = t.texNum2 == 1; - if (triangle.tex1Name == "plant.png") - triangle.state |= ENG_RSTATE_ALPHA; - if (!triangle.variableTex2 && t.texNum2 != 0) { if (t.texNum2 >= 1 && t.texNum2 <= 10) @@ -637,6 +634,10 @@ bool CModelFile::ReadModel(std::istream& stream) m_triangles[i].tex2Name = StrUtils::Replace(m_triangles[i].tex2Name, "bmp", "png"); m_triangles[i].tex2Name = StrUtils::Replace(m_triangles[i].tex2Name, "tga", "png"); + // TODO: fix this in model files + if (m_triangles[i].tex1Name == "plant.png") + m_triangles[i].state |= ENG_RSTATE_ALPHA; + GetLogger()->Trace("ModelTriangle %d\n", i+1); std::string s1 = m_triangles[i].p1.ToString(); GetLogger()->Trace(" p1: %s\n", s1.c_str()); |