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

Merge pull request #8388 from Dobbias/fix_#8381

Browse source 
Fix gles3-particles shader not compiling
This commit is contained in:
Rémi Verschelde 2017-04-18 00:01:08 +02:00 committed by GitHub
commit 24b2186ff9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gles3/shaders/particles.glsl
View file

@ -101,7 +101,7 @@ void main() {
restart_phase*= (1.0-explosiveness); restart_phase*= (1.0-explosiveness);
bool restart=false; bool restart=false;
bool active = velocity_active.a > 0.5; bool shader_active = velocity_active.a > 0.5;
if (system_phase > prev_system_phase) { if (system_phase > prev_system_phase) {
if (prev_system_phase < restart_phase && system_phase >= restart_phase) { if (prev_system_phase < restart_phase && system_phase >= restart_phase) {
@ -134,7 +134,7 @@ void main() {
uint particle_number = current_cycle * uint(total_particles) + uint(gl_VertexID); uint particle_number = current_cycle * uint(total_particles) + uint(gl_VertexID);
if (restart) { if (restart) {
active=emitting; shader_active=emitting;
} }
mat4 xform; mat4 xform;
@ -148,7 +148,7 @@ void main() {
out_velocity_active=vec4(0.0); out_velocity_active=vec4(0.0);
out_custom=vec4(0.0); out_custom=vec4(0.0);
if (!restart) if (!restart)
active=false; shader_active=false;
xform = mat4( xform = mat4(
vec4(1.0,0.0,0.0,0.0), vec4(1.0,0.0,0.0,0.0),
@ -163,7 +163,7 @@ void main() {
xform = transpose(mat4(xform_1,xform_2,xform_3,vec4(vec3(0.0),1.0))); xform = transpose(mat4(xform_1,xform_2,xform_3,vec4(vec3(0.0),1.0)));
} }
if (active) { if (shader_active) {
//execute shader //execute shader
{ {
@ -178,7 +178,7 @@ VERTEX_SHADER_CODE
for(int i=0;i<attractor_count;i++) { for(int i=0;i<attractor_count;i++) {
vec3 rel_vec = xform[3].xyz - attractors[i].pos; vec3 rel_vec = xform[3].xyz - attractors[i].pos;
float dist = rel_vec.length(); float dist = length(rel_vec);
if (attractors[i].radius < dist) if (attractors[i].radius < dist)
continue; continue;
if (attractors[i].eat_radius>0 && attractors[i].eat_radius > dist) { if (attractors[i].eat_radius>0 && attractors[i].eat_radius > dist) {
@ -215,7 +215,7 @@ VERTEX_SHADER_CODE
xform = transpose(xform); xform = transpose(xform);
out_velocity_active.a = mix(0.0,1.0,active); out_velocity_active.a = mix(0.0,1.0,shader_active);
out_xform_1 = xform[0]; out_xform_1 = xform[0];
out_xform_2 = xform[1]; out_xform_2 = xform[1];