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

Merge pull request #75795 from cody82/fix-html-particle-shader

Browse source 
Fix "error X3708: continue cannot be used in a switch" in HTML export
This commit is contained in:
Rémi Verschelde 2023-04-12 09:06:57 +02:00
commit 6a6e36ec6a
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 69 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -300,28 +300,23 @@ void main() {
vec3 rel_vec = xform[3].xyz - attractors[i].transform[3].xyz; vec3 rel_vec = xform[3].xyz - attractors[i].transform[3].xyz;
vec3 local_pos = rel_vec * mat3(attractors[i].transform); vec3 local_pos = rel_vec * mat3(attractors[i].transform);
switch (attractors[i].type) { if (attractors[i].type == ATTRACTOR_TYPE_SPHERE) {
case ATTRACTOR_TYPE_SPHERE: { dir = safe_normalize(rel_vec);
dir = safe_normalize(rel_vec); float d = length(local_pos) / attractors[i].extents.x;
float d = length(local_pos) / attractors[i].extents.x; if (d > 1.0) {
if (d > 1.0) { continue;
continue; }
} amount = max(0.0, 1.0 - d);
amount = max(0.0, 1.0 - d); } else if (attractors[i].type == ATTRACTOR_TYPE_BOX) {
} break; dir = safe_normalize(rel_vec);
case ATTRACTOR_TYPE_BOX: {
dir = safe_normalize(rel_vec);
vec3 abs_pos = abs(local_pos / attractors[i].extents.xyz); vec3 abs_pos = abs(local_pos / attractors[i].extents.xyz);
float d = max(abs_pos.x, max(abs_pos.y, abs_pos.z)); float d = max(abs_pos.x, max(abs_pos.y, abs_pos.z));
if (d > 1.0) { if (d > 1.0) {
continue; continue;
} }
amount = max(0.0, 1.0 - d); amount = max(0.0, 1.0 - d);
} else if (attractors[i].type == ATTRACTOR_TYPE_VECTOR_FIELD) {
} break;
case ATTRACTOR_TYPE_VECTOR_FIELD: {
} break;
} }
amount = pow(amount, attractors[i].attenuation); amount = pow(amount, attractors[i].attenuation);
dir = safe_normalize(mix(dir, attractors[i].transform[2].xyz, attractors[i].directionality)); dir = safe_normalize(mix(dir, attractors[i].transform[2].xyz, attractors[i].directionality));
@ -383,80 +378,72 @@ void main() {
vec3 rel_vec = xform[3].xyz - colliders[i].transform[3].xyz; vec3 rel_vec = xform[3].xyz - colliders[i].transform[3].xyz;
vec3 local_pos = rel_vec * mat3(colliders[i].transform); vec3 local_pos = rel_vec * mat3(colliders[i].transform);
switch (colliders[i].type) { if (colliders[i].type == COLLIDER_TYPE_SPHERE) {
case COLLIDER_TYPE_SPHERE: { float d = length(rel_vec) - (particle_size + colliders[i].extents.x);
float d = length(rel_vec) - (particle_size + colliders[i].extents.x);
if (d < 0.0) { if (d < 0.0) {
col = true;
depth = -d;
normal = normalize(rel_vec);
}
} else if (colliders[i].type == COLLIDER_TYPE_BOX) {
vec3 abs_pos = abs(local_pos);
vec3 sgn_pos = sign(local_pos);
if (any(greaterThan(abs_pos, colliders[i].extents.xyz))) {
//point outside box
vec3 closest = min(abs_pos, colliders[i].extents.xyz);
vec3 rel = abs_pos - closest;
depth = length(rel) - particle_size;
if (depth < 0.0) {
col = true; col = true;
depth = -d; normal = mat3(colliders[i].transform) * (normalize(rel) * sgn_pos);
normal = normalize(rel_vec); depth = -depth;
} }
} else {
} break; //point inside box
case COLLIDER_TYPE_BOX: { vec3 axis_len = colliders[i].extents.xyz - abs_pos;
vec3 abs_pos = abs(local_pos); // there has to be a faster way to do this?
vec3 sgn_pos = sign(local_pos); if (all(lessThan(axis_len.xx, axis_len.yz))) {
normal = vec3(1, 0, 0);
if (any(greaterThan(abs_pos, colliders[i].extents.xyz))) { } else if (all(lessThan(axis_len.yy, axis_len.xz))) {
//point outside box normal = vec3(0, 1, 0);
vec3 closest = min(abs_pos, colliders[i].extents.xyz);
vec3 rel = abs_pos - closest;
depth = length(rel) - particle_size;
if (depth < 0.0) {
col = true;
normal = mat3(colliders[i].transform) * (normalize(rel) * sgn_pos);
depth = -depth;
}
} else { } else {
//point inside box normal = vec3(0, 0, 1);
vec3 axis_len = colliders[i].extents.xyz - abs_pos;
// there has to be a faster way to do this?
if (all(lessThan(axis_len.xx, axis_len.yz))) {
normal = vec3(1, 0, 0);
} else if (all(lessThan(axis_len.yy, axis_len.xz))) {
normal = vec3(0, 1, 0);
} else {
normal = vec3(0, 0, 1);
}
col = true;
depth = dot(normal * axis_len, vec3(1)) + particle_size;
normal = mat3(colliders[i].transform) * (normal * sgn_pos);
} }
} break; col = true;
case COLLIDER_TYPE_SDF: { depth = dot(normal * axis_len, vec3(1)) + particle_size;
} break; normal = mat3(colliders[i].transform) * (normal * sgn_pos);
case COLLIDER_TYPE_HEIGHT_FIELD: { }
vec3 local_pos_bottom = local_pos; } else if (colliders[i].type == COLLIDER_TYPE_SDF) {
local_pos_bottom.y -= particle_size; } else if (colliders[i].type == COLLIDER_TYPE_HEIGHT_FIELD) {
vec3 local_pos_bottom = local_pos;
local_pos_bottom.y -= particle_size;
if (any(greaterThan(abs(local_pos_bottom), colliders[i].extents.xyz))) { if (any(greaterThan(abs(local_pos_bottom), colliders[i].extents.xyz))) {
continue; continue;
} }
const float DELTA = 1.0 / 8192.0; const float DELTA = 1.0 / 8192.0;
vec3 uvw_pos = vec3(local_pos_bottom / colliders[i].extents.xyz) * 0.5 + 0.5; vec3 uvw_pos = vec3(local_pos_bottom / colliders[i].extents.xyz) * 0.5 + 0.5;
float y = 1.0 - texture(height_field_texture, uvw_pos.xz).r; float y = 1.0 - texture(height_field_texture, uvw_pos.xz).r;
if (y > uvw_pos.y) { if (y > uvw_pos.y) {
//inside heightfield //inside heightfield
vec3 pos1 = (vec3(uvw_pos.x, y, uvw_pos.z) * 2.0 - 1.0) * colliders[i].extents.xyz; vec3 pos1 = (vec3(uvw_pos.x, y, uvw_pos.z) * 2.0 - 1.0) * colliders[i].extents.xyz;
vec3 pos2 = (vec3(uvw_pos.x + DELTA, 1.0 - texture(height_field_texture, uvw_pos.xz + vec2(DELTA, 0)).r, uvw_pos.z) * 2.0 - 1.0) * colliders[i].extents.xyz; vec3 pos2 = (vec3(uvw_pos.x + DELTA, 1.0 - texture(height_field_texture, uvw_pos.xz + vec2(DELTA, 0)).r, uvw_pos.z) * 2.0 - 1.0) * colliders[i].extents.xyz;
vec3 pos3 = (vec3(uvw_pos.x, 1.0 - texture(height_field_texture, uvw_pos.xz + vec2(0, DELTA)).r, uvw_pos.z + DELTA) * 2.0 - 1.0) * colliders[i].extents.xyz; vec3 pos3 = (vec3(uvw_pos.x, 1.0 - texture(height_field_texture, uvw_pos.xz + vec2(0, DELTA)).r, uvw_pos.z + DELTA) * 2.0 - 1.0) * colliders[i].extents.xyz;
normal = normalize(cross(pos1 - pos2, pos1 - pos3)); normal = normalize(cross(pos1 - pos2, pos1 - pos3));
float local_y = (vec3(local_pos / colliders[i].extents.xyz) * 0.5 + 0.5).y; float local_y = (vec3(local_pos / colliders[i].extents.xyz) * 0.5 + 0.5).y;
col = true; col = true;
depth = dot(normal, pos1) - dot(normal, local_pos_bottom); depth = dot(normal, pos1) - dot(normal, local_pos_bottom);
} }
} break;
} }
if (col) { if (col) {