Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 18:32:44 +01:00
Code Issues Projects Releases Activity

Fix particle rendering transform matrix

Browse Source
This commit is contained in:
Miloslav Číž 2017-11-19 21:32:44 +01:00 committed by Daniel Evans
parent d934f1c9b0
commit 57284fdade
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
rwengine/src/render/GameRenderer.cpp
View File

@ -496,8 +496,6 @@ void GameRenderer::renderEffects(GameWorld* world) {
auto& p = particle.position; auto& p = particle.position;
glm::mat4 m(1.f);
// Figure the direction to the camera center. // Figure the direction to the camera center.
auto amp = cpos - p; auto amp = cpos - p;
glm::vec3 ptc = particle.up; glm::vec3 ptc = particle.up;
@ -508,24 +506,17 @@ void GameRenderer::renderEffects(GameWorld* world) {
ptc = amp; ptc = amp;
} }
glm::vec3 f = glm::normalize(particle.direction); ptc = glm::normalize(ptc);
glm::vec3 s = glm::cross(f, glm::normalize(ptc));
glm::vec3 u = glm::cross(s, f);
m[0][0] = s.x;
m[1][0] = s.y;
m[2][0] = s.z;
m[0][1] = -f.x;
m[1][1] = -f.y;
m[2][1] = -f.z;
m[0][2] = u.x;
m[1][2] = u.y;
m[2][2] = u.z;
m[3][0] = -glm::dot(s, p);
m[3][1] = glm::dot(f, p);
m[3][2] = -glm::dot(u, p);
m = glm::scale(glm::inverse(m), glm::vec3(particle.size, 1.f));
// m = glm::translate(m, p); glm::mat4 transformMat(1.f);
glm::mat4 lookMat = glm::lookAt(
glm::vec3(0.0f,0.0f,0.0f),
ptc,
glm::vec3(0.0f,0.0f,1.0f));
transformMat = glm::scale(glm::translate(transformMat,p),
glm::vec3(particle.size,1.0f)) * glm::inverse(lookMat);
Renderer::DrawParameters dp; Renderer::DrawParameters dp;
dp.textures = {particle.texture->getName()}; dp.textures = {particle.texture->getName()};
@ -536,7 +527,7 @@ void GameRenderer::renderEffects(GameWorld* world) {
dp.blend = true; dp.blend = true;
dp.diffuse = 1.f; dp.diffuse = 1.f;
renderer->drawArrays(m, &particleDraw, dp); renderer->drawArrays(transformMat, &particleDraw, dp);
} }
} }