diff options
| author | Tom Beckmann <tomjonabc@gmail.com> | 2017-11-18 23:39:20 +0100 |
|---|---|---|
| committer | Tom Beckmann <tomjonabc@gmail.com> | 2017-11-19 21:32:25 +0100 |
| commit | 93be4982d012a25f034210623d50e519cdeddabf (patch) | |
| tree | 26d6e7c252cac7a0827fdfcc1f1a9a867ffeabde /scene/3d/particles.cpp | |
| parent | 63283eca5542314ea5b71afa1fe39bd48c202a4d (diff) | |
Make particles with DISABLE_Z active respect ALIGN_Y. Fixes #12865
Diffstat (limited to 'scene/3d/particles.cpp')
| -rw-r--r-- | scene/3d/particles.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index 915a10328b..2a032f5d96 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -836,9 +836,15 @@ void ParticlesMaterial::_update_shader() { if (flags[FLAG_DISABLE_Z]) { - code += " TRANSFORM[0] = vec4(cos(CUSTOM.x),-sin(CUSTOM.x),0.0,0.0);\n"; - code += " TRANSFORM[1] = vec4(sin(CUSTOM.x),cos(CUSTOM.x),0.0,0.0);\n"; - code += " TRANSFORM[2] = vec4(0.0,0.0,1.0,0.0);\n"; + if (flags[FLAG_ALIGN_Y_TO_VELOCITY]) { + code += " if (length(VELOCITY) > 0.0) { TRANSFORM[1].xyz = normalize(VELOCITY); } else { TRANSFORM[1].xyz = normalize(TRANSFORM[1].xyz); }\n"; + code += " TRANSFORM[0].xyz = normalize(cross(TRANSFORM[1].xyz,TRANSFORM[2].xyz));\n"; + code += " TRANSFORM[2] = vec4(0.0,0.0,1.0,0.0);\n"; + } else { + code += " TRANSFORM[0] = vec4(cos(CUSTOM.x),-sin(CUSTOM.x),0.0,0.0);\n"; + code += " TRANSFORM[1] = vec4(sin(CUSTOM.x),cos(CUSTOM.x),0.0,0.0);\n"; + code += " TRANSFORM[2] = vec4(0.0,0.0,1.0,0.0);\n"; + } } else { //orient particle Y towards velocity |