asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #13023 from tom95/particles-align-y-12865

Browse source 
Make particles with DISABLE_Z active respect ALIGN_Y. Fixes #12865
This commit is contained in:
Rémi Verschelde 2017-11-20 10:59:34 +01:00 committed by GitHub
commit 341bf71dc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/3d/particles.cpp
View file

@ -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