diff --git a/projects/wobble_bobble/shaders/init_particle_volumes.comp b/projects/wobble_bobble/shaders/init_particle_volumes.comp index 8f0eaf78eb1d68a0695909b5640f2210cb351341..e429209837a805d75bf6104b097844eb1db55dd9 100644 --- a/projects/wobble_bobble/shaders/init_particle_volumes.comp +++ b/projects/wobble_bobble/shaders/init_particle_volumes.comp @@ -30,11 +30,9 @@ void main() { vec3 offset = vec3(i, j, k) / gridResolution; vec3 voxel = minimal.position + offset; - if (length(offset) < minimal.size * 2.0f) { - vec4 gridSample = texture(sampler3D(gridImage, gridSampler), voxel); + vec4 gridSample = texture(sampler3D(gridImage, gridSampler), voxel); - mass += gridSample.w * voxel_particle_weight(voxel, minimal); - } + mass += gridSample.w * voxel_particle_weight(voxel, minimal); } } } diff --git a/projects/wobble_bobble/shaders/update_particle_deformation.comp b/projects/wobble_bobble/shaders/update_particle_deformation.comp index 2fe634451fe85c8582085348b4cbc6fb40cd79de..73d8961ad7454b03176a92612bed0b5e5d8ad423 100644 --- a/projects/wobble_bobble/shaders/update_particle_deformation.comp +++ b/projects/wobble_bobble/shaders/update_particle_deformation.comp @@ -37,14 +37,12 @@ void main() { vec3 offset = vec3(i, j, k) / gridResolution; vec3 voxel = minimal.position + offset; - if (length(offset) < minimal.size * 2.0f) { - vec4 gridSample = texture(sampler3D(gridImage, gridSampler), voxel); - - velocity_gradient += outerProduct( - gridSample.xyz, - voxel_particle_grad_weight(voxel, minimal) - ); - } + vec4 gridSample = texture(sampler3D(gridImage, gridSampler), voxel); + + velocity_gradient += outerProduct( + gridSample.xyz, + voxel_particle_grad_weight(voxel, minimal) + ); } } } diff --git a/projects/wobble_bobble/shaders/update_particle_velocities.comp b/projects/wobble_bobble/shaders/update_particle_velocities.comp index 4a5bbff8e3d985c9c4fc880e20d1172e06107743..bc592ad60dc61e7382230a37db9fdc52aa321d89 100644 --- a/projects/wobble_bobble/shaders/update_particle_velocities.comp +++ b/projects/wobble_bobble/shaders/update_particle_velocities.comp @@ -43,19 +43,17 @@ void main() { vec3 offset = vec3(i, j, k) / gridResolution; vec3 voxel = minimal.position + offset; - if (length(offset) < minimal.size * 2.0f) { - vec4 gridSample = texture(sampler3D(gridImage, gridSampler), voxel); - vec4 gridOldSample = texture(sampler3D(gridOldImage, gridSampler), voxel); + vec4 gridSample = texture(sampler3D(gridImage, gridSampler), voxel); + vec4 gridOldSample = texture(sampler3D(gridOldImage, gridSampler), voxel); - float weight = voxel_particle_weight(voxel, minimal); - vec3 velocity = gridSample.xyz * weight; + float weight = voxel_particle_weight(voxel, minimal); + vec3 velocity = gridSample.xyz * weight; - affine_D += outerProduct(weight * offset, offset); - affine_B += outerProduct(velocity, offset); + affine_D += outerProduct(weight * offset, offset); + affine_B += outerProduct(velocity, offset); - velocity_pic += velocity; - velocity_flip += (gridSample.xyz - gridOldSample.xyz) * weight; - } + velocity_pic += velocity; + velocity_flip += (gridSample.xyz - gridOldSample.xyz) * weight; } } } @@ -72,9 +70,7 @@ void main() { for (k = -gridWindow.z; k <= gridWindow.z; k++) { vec3 offset = vec3(i, j, k) / gridResolution; - if (length(offset) < minimal.size * 2.0f) { - velocity_apic += affine_C * offset; - } + velocity_apic += affine_C * offset; } } }