Compare commits
No commits in common. "1d9a77198658ac94684505be77d2efcf4e1c3bef" and "5e8fe85cdf0475532c63ebe7eeb9ae25b1086385" have entirely different histories.
1d9a771986
...
5e8fe85cdf
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +1,7 @@
|
||||||
[package]
|
[package]
|
||||||
name = "pteropus"
|
name = "pteropus"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
crate-type = ["cdylib", "rlib"]
|
crate-type = ["cdylib", "rlib"]
|
||||||
|
|
@ -15,12 +15,12 @@ wgsl-shader-assembler = { git = "https://git.gordon.earth/matthew/wgsl-shader-as
|
||||||
|
|
||||||
[target.'cfg(target_arch = "x86_64")'.dependencies]
|
[target.'cfg(target_arch = "x86_64")'.dependencies]
|
||||||
winit = { version = "0.30.3", features = ["rwh_06"] }
|
winit = { version = "0.30.3", features = ["rwh_06"] }
|
||||||
wgpu = "25.0.0"
|
wgpu = "23.0.0"
|
||||||
env_logger = "0.11.3"
|
env_logger = "0.11.3"
|
||||||
futures = { version = "0.3.30", features = ["executor"] }
|
futures = { version = "0.3.30", features = ["executor"] }
|
||||||
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||||
wgpu = { version = "25.0.0", features = ["webgl"]}
|
wgpu = { version = "23.0.0", features = ["webgl"]}
|
||||||
wasm-bindgen = "0.2.84"
|
wasm-bindgen = "0.2.84"
|
||||||
wasm-bindgen-futures = "0.4.42"
|
wasm-bindgen-futures = "0.4.42"
|
||||||
console_log = "1.0"
|
console_log = "1.0"
|
||||||
|
|
|
||||||
|
|
@ -427,14 +427,14 @@ fn load_dem_texture(source: &Dem, device: &wgpu::Device, queue: &wgpu::Queue) ->
|
||||||
});
|
});
|
||||||
|
|
||||||
queue.write_texture(
|
queue.write_texture(
|
||||||
wgpu::TexelCopyTextureInfo {
|
wgpu::ImageCopyTexture {
|
||||||
texture: &texture,
|
texture: &texture,
|
||||||
mip_level: 0,
|
mip_level: 0,
|
||||||
origin: wgpu::Origin3d::ZERO,
|
origin: wgpu::Origin3d::ZERO,
|
||||||
aspect: wgpu::TextureAspect::All,
|
aspect: wgpu::TextureAspect::All,
|
||||||
},
|
},
|
||||||
bytemuck::cast_slice(&source.grid[..]),
|
bytemuck::cast_slice(&source.grid[..]),
|
||||||
wgpu::TexelCopyBufferLayout {
|
wgpu::ImageDataLayout {
|
||||||
offset: 0,
|
offset: 0,
|
||||||
bytes_per_row: Some(std::mem::size_of::<u16>() as u32 * source.num_cells_x),
|
bytes_per_row: Some(std::mem::size_of::<u16>() as u32 * source.num_cells_x),
|
||||||
rows_per_image: Some(source.num_cells_y),
|
rows_per_image: Some(source.num_cells_y),
|
||||||
|
|
@ -470,14 +470,14 @@ fn create_dembvh_texture(
|
||||||
|
|
||||||
for (level, grid) in source.layers.iter().enumerate() {
|
for (level, grid) in source.layers.iter().enumerate() {
|
||||||
queue.write_texture(
|
queue.write_texture(
|
||||||
wgpu::TexelCopyTextureInfo {
|
wgpu::ImageCopyTexture {
|
||||||
texture: &texture,
|
texture: &texture,
|
||||||
mip_level: level as u32,
|
mip_level: level as u32,
|
||||||
origin: wgpu::Origin3d::ZERO,
|
origin: wgpu::Origin3d::ZERO,
|
||||||
aspect: wgpu::TextureAspect::All,
|
aspect: wgpu::TextureAspect::All,
|
||||||
},
|
},
|
||||||
bytemuck::cast_slice(&grid.data[..]),
|
bytemuck::cast_slice(&grid.data[..]),
|
||||||
wgpu::TexelCopyBufferLayout {
|
wgpu::ImageDataLayout {
|
||||||
offset: 0,
|
offset: 0,
|
||||||
bytes_per_row: Some(std::mem::size_of::<u16>() as u32 * 2 * grid.size),
|
bytes_per_row: Some(std::mem::size_of::<u16>() as u32 * 2 * grid.size),
|
||||||
rows_per_image: Some(grid.size),
|
rows_per_image: Some(grid.size),
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ use crate::mvu::{Event, MvuApp, Size2i};
|
||||||
use {
|
use {
|
||||||
log::info,
|
log::info,
|
||||||
std::{borrow::Cow, path::PathBuf},
|
std::{borrow::Cow, path::PathBuf},
|
||||||
wgpu::{Device, Instance, Queue, RenderPipeline, Surface, SurfaceConfiguration, Trace},
|
wgpu::{Device, Instance, Queue, RenderPipeline, Surface, SurfaceConfiguration},
|
||||||
};
|
};
|
||||||
|
|
||||||
mod dem_renderer;
|
mod dem_renderer;
|
||||||
|
|
@ -62,8 +62,8 @@ impl MvuApp<Model> for App {
|
||||||
required_limits: wgpu::Limits::downlevel_webgl2_defaults()
|
required_limits: wgpu::Limits::downlevel_webgl2_defaults()
|
||||||
.using_resolution(adapter.limits()),
|
.using_resolution(adapter.limits()),
|
||||||
memory_hints: wgpu::MemoryHints::MemoryUsage,
|
memory_hints: wgpu::MemoryHints::MemoryUsage,
|
||||||
trace: Trace::Off,
|
|
||||||
},
|
},
|
||||||
|
None,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.expect("Failed to create device");
|
.expect("Failed to create device");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue