Skip to content

Commit

Permalink
Bugfixes, API extensions, Debug data and logic
Browse files Browse the repository at this point in the history
  • Loading branch information
@davids91
davids91 committed Jul 21, 2024
1 parent e741b03 commit b7add49
Show file tree
Hide file tree
Showing 5 changed files with 276 additions and 52 deletions.
223 changes: 190 additions & 33 deletions examples/wgpu_render.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,23 @@ use shocovox_rs::octree::V3cf32;
use shocovox_rs::octree::VoxelData;
use std::sync::Arc;
use winit::application::ApplicationHandler;
use winit::event::ElementState;
use winit::event::MouseButton;
use winit::event::WindowEvent;
use winit::event_loop::ActiveEventLoop;
use winit::event_loop::{ControlFlow, EventLoop};
use winit::keyboard::NamedKey;
use winit::window::Window;
use winit::window::WindowId;

#[cfg(feature = "wgpu")]
const DISPLAY_RESOLUTION: [u32; 2] = [1024, 768];

#[cfg(feature = "wgpu")]
const ARRAY_DIMENSION: u32 = 64;
const OCTREE_SIZE: u32 = 128;

#[cfg(feature = "wgpu")]
const BRICK_DIMENSION: usize = 32;

#[cfg(feature = "wgpu")]
struct SvxRenderExample<T, const DIM: usize>
Expand All @@ -27,6 +33,10 @@ where
backend: SvxRenderBackend,
window: Option<Arc<Window>>,
tree: Arc<Octree<T, DIM>>,

// User input variables
last_cursor_pos: winit::dpi::PhysicalPosition<f64>,
left_mouse_btn_pressed: bool,
}

#[cfg(feature = "wgpu")]
Expand Down Expand Up @@ -70,26 +80,59 @@ where
Some(&self.tree),
));
}
WindowEvent::MouseInput {
device_id: _,
state,
button,
} => {
if button == MouseButton::Left && state.is_pressed() {
self.left_mouse_btn_pressed = true;
} else if button == MouseButton::Left && !state.is_pressed() {
self.left_mouse_btn_pressed = false;
}
}
WindowEvent::CursorMoved {
device_id: _,
position,
} => {
let delta_x = ((position.x - self.last_cursor_pos.x) as f32)
.min(100.)
.max(-100.);
if self.left_mouse_btn_pressed {
self.backend.update_viewport_glass_fov(
self.backend.viewport().w_h_fov.z * (1. + delta_x / 100.),
);
}
self.last_cursor_pos = position;
}
WindowEvent::KeyboardInput {
device_id: _,
event,
is_synthetic: _,
} => {
if let winit::keyboard::Key::Named(named) = event.logical_key {
match named {
winit::keyboard::NamedKey::ArrowUp => {
self.backend.update_viewport_origin(V3cf32::new(0., 1., 0.));
NamedKey::ArrowUp => {
self.backend.update_viewport_origin(V3cf32::new(0., 5., 0.));
}
winit::keyboard::NamedKey::ArrowDown => {
NamedKey::ArrowDown => {
self.backend
.update_viewport_origin(V3cf32::new(0., -1., 0.));
.update_viewport_origin(V3cf32::new(0., -5., 0.));
}
winit::keyboard::NamedKey::ArrowLeft => {
NamedKey::ArrowLeft => {
self.backend
.update_viewport_origin(V3cf32::new(-1., 0., 0.));
.update_viewport_origin(V3cf32::new(-5., 0., 0.));
}
NamedKey::ArrowRight => {
self.backend.update_viewport_origin(V3cf32::new(5., 0., 0.));
}
winit::keyboard::NamedKey::ArrowRight => {
self.backend.update_viewport_origin(V3cf32::new(1., 0., 0.));
NamedKey::PageUp => {
self.backend
.update_viewport_origin(self.backend.viewport().direction * 5.);
}
NamedKey::PageDown => {
self.backend
.update_viewport_origin(self.backend.viewport().direction * -5.);
}
_ => {}
}
Expand All @@ -103,42 +146,149 @@ where
#[cfg(feature = "wgpu")]
fn main() {
// fill octree with data
let mut tree = shocovox_rs::octree::Octree::<Albedo, 16>::new(ARRAY_DIMENSION)
let mut tree = shocovox_rs::octree::Octree::<Albedo, BRICK_DIMENSION>::new(OCTREE_SIZE)
.ok()
.unwrap();

// single color voxel
// tree.insert_at_lod(
// &V3c::new(0, 0, 0),
// 4,
// Albedo::default()
// .with_red(1.)
// .with_green(0.)
// .with_blue(1.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// Different color voxels
// tree.insert(
// &V3c::new(0, 0, 0),
// Albedo::default()
// .with_red(0.)
// .with_green(0.)
// .with_blue(0.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// tree.insert(
// &V3c::new(0, 0, 1),
// Albedo::default()
// .with_red(0.)
// .with_green(0.)
// .with_blue(1.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// tree.insert(
// &V3c::new(0, 1, 0),
// Albedo::default()
// .with_red(0.)
// .with_green(1.)
// .with_blue(0.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// tree.insert(
// &V3c::new(0, 1, 1),
// Albedo::default()
// .with_red(0.)
// .with_green(1.)
// .with_blue(1.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// tree.insert(
// &V3c::new(1, 0, 0),
// Albedo::default()
// .with_red(1.)
// .with_green(0.)
// .with_blue(0.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// tree.insert(
// &V3c::new(1, 0, 1),
// Albedo::default()
// .with_red(1.)
// .with_green(0.)
// .with_blue(1.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// tree.insert(
// &V3c::new(1, 1, 0),
// Albedo::default()
// .with_red(1.)
// .with_green(1.)
// .with_blue(0.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// tree.insert(
// &V3c::new(1, 1, 1),
// Albedo::default()
// .with_red(1.)
// .with_green(1.)
// .with_blue(1.)
// .with_alpha(1.),
// )
// .ok()
// .unwrap();

// assert!(
// Albedo::default()
// .with_red(1.)
// .with_green(0.)
// .with_blue(0.)
// .with_alpha(1.)
// == *tree.get(&V3c::new(1, 0, 0)).unwrap()
// );

tree.insert(&V3c::new(1, 3, 3), Albedo::from(0x66FFFF))
.ok()
.unwrap();
for x in 0..ARRAY_DIMENSION {
for y in 0..ARRAY_DIMENSION {
for z in 0..ARRAY_DIMENSION {
if ((x < (ARRAY_DIMENSION / 4)
|| y < (ARRAY_DIMENSION / 4)
|| z < (ARRAY_DIMENSION / 4))
for x in 0..OCTREE_SIZE {
for y in 0..OCTREE_SIZE {
for z in 0..OCTREE_SIZE {
if ((x < (OCTREE_SIZE / 4) || y < (OCTREE_SIZE / 4) || z < (OCTREE_SIZE / 4))
&& (0 == x % 2 && 0 == y % 4 && 0 == z % 2))
|| ((ARRAY_DIMENSION / 2) <= x
&& (ARRAY_DIMENSION / 2) <= y
&& (ARRAY_DIMENSION / 2) <= z)
|| ((OCTREE_SIZE / 2) <= x && (OCTREE_SIZE / 2) <= y && (OCTREE_SIZE / 2) <= z)
{
let r = if 0 == x % (ARRAY_DIMENSION / 4) {
(x as f32 / ARRAY_DIMENSION as f32 * 255.) as u32
let r = if 0 == x % (OCTREE_SIZE / 4) {
x as f32 / OCTREE_SIZE as f32
} else {
128
0.5
};
let g = if 0 == y % (ARRAY_DIMENSION / 4) {
(y as f32 / ARRAY_DIMENSION as f32 * 255.) as u32
let g = if 0 == y % (OCTREE_SIZE / 4) {
y as f32 / OCTREE_SIZE as f32
} else {
128
0.5
};
let b = if 0 == z % (ARRAY_DIMENSION / 4) {
(z as f32 / ARRAY_DIMENSION as f32 * 255.) as u32
let b = if 0 == z % (OCTREE_SIZE / 4) {
z as f32 / OCTREE_SIZE as f32
} else {
128
0.5
};
tree.insert(
&V3c::new(x, y, z),
Albedo::from(r | (g << 8) | (b << 16) | 0xFF000000),
Albedo::default().with_red(r).with_green(g).with_blue(b),
)
.ok()
.unwrap();
Expand All @@ -150,9 +300,9 @@ fn main() {

// Fire up the display
let origin = V3c::new(
ARRAY_DIMENSION as f32 * 2.,
ARRAY_DIMENSION as f32 / 2.,
ARRAY_DIMENSION as f32 * -2.,
OCTREE_SIZE as f32 * 2.,
OCTREE_SIZE as f32 / 2.,
OCTREE_SIZE as f32 * -2.,
);

let event_loop = EventLoop::new().unwrap();
Expand All @@ -161,13 +311,20 @@ fn main() {
.with_viewport(Viewport {
direction: (V3c::new(0., 0., 0.) - origin).normalized(),
origin,
w_h_fov: V3c::new(10., 10., 10.),
w_h_fov: V3c::new(10., 10., 3.5),
});
// .with_viewport(Viewport {
// direction: V3c::new(1., 0., 0.),
// origin: V3c::new(0., 1., 0.),
// w_h_fov: V3c::new(0., 0., 1.),
// });

let mut example = SvxRenderExample {
backend,
window: None,
tree: showcase.clone(),
last_cursor_pos: Default::default(),
left_mouse_btn_pressed: false,
};

env_logger::init();
Expand Down
4 changes: 2 additions & 2 deletions src/octree/raytracing/wgpu/data.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use encase::StorageBuffer;
use encase::{ShaderSize, StorageBuffer};

use crate::octree::{
empty_marker, raytracing::wgpu::types::Voxelement, types::NodeChildrenArray, NodeContent,
Expand Down Expand Up @@ -167,7 +167,7 @@ where

// Upload data to buffers
let octree_meta = OctreeMetaData::from(self);
let mut buffer = StorageBuffer::new(Vec::<u8>::new());
let mut buffer = encase::UniformBuffer::new(Vec::<u8>::new());
buffer.write(&octree_meta).unwrap();
if let Some(metadata_buffer) = &app.metadata_buffer {
app.queue
Expand Down
18 changes: 17 additions & 1 deletion src/octree/raytracing/wgpu/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,23 @@ impl<'a> SvxRenderBackend {
)
}

pub fn update_viewport_direction(&mut self, direction: V3cf32) {
pub fn update_viewport_direction(&mut self, delta: V3cf32) {
self.viewport.direction = (self.viewport.direction + delta).normalized();
let mut buffer = UniformBuffer::new(Vec::<u8>::new());
buffer.write(&self.viewport).unwrap();
self.queue
.as_ref()
.expect("Expected SvxRenderApp to have a vaild rendering queue!")
.write_buffer(
self.viewport_buffer
.as_ref()
.expect("Expected SvxRenderApp to have a vaild Viewport buffer!"),
0,
&buffer.into_inner(),
)
}

pub fn set_viewport_direction(&mut self, direction: V3cf32) {
self.viewport.direction = direction;
let mut buffer = UniformBuffer::new(Vec::<u8>::new());
buffer.write(&self.viewport).unwrap();
Expand Down
Loading

0 comments on commit b7add49

Please sign in to comment.