elias/voxel-simulation
1
0
Fork 0
mirror of https://github.com/eliasstepanik/voxel-simulation.git synced 2026-01-22 19:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compute worker readback

Browse Source
This commit is contained in:
Elias Stepanik 2025-06-11 12:24:58 +02:00
parent db4fc07f49
commit b792cceb71
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
client/src/plugins/environment/systems/voxels/sphere_compute.rs
View File

@ -1,7 +1,10 @@
use super::structure::{SparseVoxelOctree, Voxel};
use bevy::prelude::*; use bevy::prelude::*;
use bevy_easy_compute::prelude::*; use bevy_easy_compute::prelude::*;
use bytemuck::{Pod, Zeroable}; use bytemuck::{Pod, Zeroable};
use super::structure::{SparseVoxelOctree, Voxel};
const SPHERE_RADIUS: u32 = 200;
const SPHERE_DIAMETER: u32 = SPHERE_RADIUS * 2 + 1;
#[repr(C)] #[repr(C)]
#[derive(ShaderType, Clone, Copy, Pod, Zeroable)] #[derive(ShaderType, Clone, Copy, Pod, Zeroable)]
@ -24,19 +27,23 @@ pub struct SphereWorker;
impl ComputeWorker for SphereWorker { impl ComputeWorker for SphereWorker {
fn build(world: &mut World) -> AppComputeWorker<Self> { fn build(world: &mut World) -> AppComputeWorker<Self> {
let radius = 200u32; let params = SphereParams {
let diameter = radius * 2 + 1; radius: SPHERE_RADIUS,
let params = SphereParams { radius, diameter }; diameter: SPHERE_DIAMETER,
let buffer = vec![0u32; (diameter * diameter * diameter) as usize]; };
let buffer = vec![0u32; (SPHERE_DIAMETER * SPHERE_DIAMETER * SPHERE_DIAMETER) as usize];
AppComputeWorkerBuilder::new(world) AppComputeWorkerBuilder::new(world)
.add_uniform("params", &params) .add_uniform("params", &params)
.add_staging("voxels", &buffer) .add_staging("voxels", &buffer)
.add_pass::<SphereShader>([ .add_pass::<SphereShader>(
(diameter + 7) / 8, [
(diameter + 7) / 8, (SPHERE_DIAMETER + 7) / 8,
(diameter + 7) / 8, (SPHERE_DIAMETER + 7) / 8,
], &["params", "voxels"]) (SPHERE_DIAMETER + 7) / 8,
],
&["params", "voxels"],
)
.synchronous() .synchronous()
.one_shot() .one_shot()
.build() .build()
@ -66,12 +73,11 @@ pub fn apply_sphere_result(
return; return;
} }
let params: SphereParams = worker.read("params");
let voxels: Vec<u32> = worker.read_vec("voxels"); let voxels: Vec<u32> = worker.read_vec("voxels");
let mut octree = octree_q.single_mut(); let mut octree = octree_q.single_mut();
let step = octree.get_spacing_at_depth(octree.max_depth); let step = octree.get_spacing_at_depth(octree.max_depth);
let radius = params.radius as i32; let radius = SPHERE_RADIUS as i32;
let diameter = params.diameter as i32; let diameter = SPHERE_DIAMETER as i32;
for x in 0..diameter { for x in 0..diameter {
for y in 0..diameter { for y in 0..diameter {
for z in 0..diameter { for z in 0..diameter {
@ -80,11 +86,15 @@ pub fn apply_sphere_result(
let wx = (x - radius) as f32 * step; let wx = (x - radius) as f32 * step;
let wy = (y - radius) as f32 * step; let wy = (y - radius) as f32 * step;
let wz = (z - radius) as f32 * step; let wz = (z - radius) as f32 * step;
octree.insert(Vec3::new(wx, wy, wz), Voxel { color: Color::rgb(0.2, 0.8, 0.2) }); octree.insert(
Vec3::new(wx, wy, wz),
Voxel {
color: Color::rgb(0.2, 0.8, 0.2),
},
);
} }
} }
} }
} }
generated.0 = false; generated.0 = false;
} }