immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix track mapping and sphere particle position

dev-ui
Piotr Dziwinski 2012-10-19 22:43:18 +02:00
parent a90cd304ba
commit be4654c63b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/graphics/engine/engine.cpp
View File

@ -1260,10 +1260,7 @@ bool CEngine::TrackTextureMapping(int objRank, const Material& mat, int state,
std::vector<Gfx::VertexTex2>& vs = triangles->vertices; std::vector<Gfx::VertexTex2>& vs = triangles->vertices;
while (pos < 0.0f) while (pos < 0.0f)
pos += 1000000.0f; // never negative! pos += 1.0f; // never negative!
// TODO: might still be buggy as track animation seems to be choppy
// but the code should work exactly as in original
Math::Vector current; Math::Vector current;
@ -1310,12 +1307,14 @@ bool CEngine::TrackTextureMapping(int objRank, const Material& mat, int state,
float pps = ps + pos; float pps = ps + pos;
float ppe = pe + pos; float ppe = pe + pos;
float offset = static_cast<float>( static_cast<int>(pps) ); int offset = static_cast<int>(pps);
ppe -= offset; ppe -= offset;
pps -= offset;
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
vs[tBase + is[i]].texCoord.x = ((ppe * tl) + ts) / tt; vs[tBase + is[i]].texCoord.x = ((pps * tl) + ts) / tt;
vs[tBase + ie[i]].texCoord.x = ((ppe * tl) + ts) / tt;
} }
} }

2
src/graphics/engine/particle.cpp
View File

@ -3214,7 +3214,7 @@ void CParticle::DrawParticleSphere(int i)
angle.z = m_particle[i].angle*0.7f; angle.z = m_particle[i].angle*0.7f;
Math::Matrix rot; Math::Matrix rot;
Math::LoadRotationZXYMatrix(rot, angle); Math::LoadRotationZXYMatrix(rot, angle);
mat = Math::MultiplyMatrices(rot, mat); mat = Math::MultiplyMatrices(mat, rot);
} }
m_device->SetTransform(TRANSFORM_WORLD, mat); m_device->SetTransform(TRANSFORM_WORLD, mat);