diff options
Diffstat (limited to 'client/src/render/scene')
| -rw-r--r-- | client/src/render/scene/draw.rs | 6 | ||||
| -rw-r--r-- | client/src/render/scene/mod.rs | 3 | ||||
| -rw-r--r-- | client/src/render/scene/pipelines.rs | 20 | ||||
| -rw-r--r-- | client/src/render/scene/textures.rs | 1 |
4 files changed, 23 insertions, 7 deletions
diff --git a/client/src/render/scene/draw.rs b/client/src/render/scene/draw.rs index dabb9cd..672d7ef 100644 --- a/client/src/render/scene/draw.rs +++ b/client/src/render/scene/draw.rs @@ -15,7 +15,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. */ use super::{DemandMap, RPrefab}; -use glam::{EulerRot, Mat3, Mat4}; +use glam::{EulerRot, Mat3, Mat4, Vec3}; use std::sync::Arc; use weareshared::{packets::Resource, resources::Prefab, tree::SceneTree}; use wgpu::{ @@ -34,6 +34,7 @@ impl ScenePipeline { scene: &SceneTree, prefabs: &DemandMap<Resource<Prefab>, Arc<RPrefab>>, projection: Mat4, + camera_position: Vec3, ) { let mut rpass = commands.begin_render_pass(&RenderPassDescriptor { label: None, @@ -84,6 +85,8 @@ impl ScenePipeline { mb[6], mb[7], mb[8], 0., // ]; let model_basis = bytemuck::cast_slice(&model_basis); + let cp = &[camera_position.x, camera_position.y, camera_position.z, 0.]; + let camera_position = bytemuck::cast_slice(cp); rpass.set_pipeline(&part.pipeline); rpass.set_bind_group(0, &*part.tex_albedo, &[]); @@ -91,6 +94,7 @@ impl ScenePipeline { rpass.set_bind_group(2, &*part.material, &[]); rpass.set_push_constants(ShaderStages::VERTEX, 0, projection.as_flattened()); rpass.set_push_constants(ShaderStages::VERTEX, 64, model_basis); + rpass.set_push_constants(ShaderStages::VERTEX, 112, camera_position); rpass.set_index_buffer(part.index.slice(..), IndexFormat::Uint32); rpass.set_vertex_buffer(0, part.va_position.slice(..)); rpass.set_vertex_buffer(1, part.va_normal.slice(..)); diff --git a/client/src/render/scene/mod.rs b/client/src/render/scene/mod.rs index d83cb95..e314649 100644 --- a/client/src/render/scene/mod.rs +++ b/client/src/render/scene/mod.rs @@ -482,6 +482,7 @@ impl ScenePreparer { visit("textures", &self.textures); visit("materials", &self.materials); visit("pipelines", &self.pipelines); + visit("mip_generation_pipelines", &self.mip_generation_pipelines); } } @@ -512,6 +513,8 @@ impl Widget for &ScenePreparer { self.materials.ui(ui); ui.label("pipelines"); self.pipelines.ui(ui); + ui.label("mip_generation_pipelines"); + self.mip_generation_pipelines.ui(ui); }) .response } diff --git a/client/src/render/scene/pipelines.rs b/client/src/render/scene/pipelines.rs index 3b6758e..675cfae 100644 --- a/client/src/render/scene/pipelines.rs +++ b/client/src/render/scene/pipelines.rs @@ -99,12 +99,20 @@ impl PipelineSpec { let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor { label: None, bind_group_layouts: &[&layouts.texture, &layouts.texture, &layouts.material], - push_constant_ranges: &[PushConstantRange { - // 4x4 view projections - // 3x3(+1 pad) model basis - range: 0..((4 * 4 + 3 * 4) * size_of::<f32>() as u32), - stages: ShaderStages::VERTEX, - }], + push_constant_ranges: &[ + PushConstantRange { + // 4x4 view projections + // 3x3(+1 pad) model basis + // 3(+1 pad) camera position + range: 0..((4 * 4 + 3 * 4) * size_of::<f32>() as u32), + stages: ShaderStages::VERTEX, + }, + PushConstantRange { + range: ((4 * 4 + 3 * 4) * size_of::<f32>() as u32) + ..(4 * 4 + 3 * 4 + 4) * size_of::<f32>() as u32, + stages: ShaderStages::FRAGMENT, + }, + ], }); device.create_render_pipeline(&RenderPipelineDescriptor { label: None, diff --git a/client/src/render/scene/textures.rs b/client/src/render/scene/textures.rs index 0a042bd..463e8f1 100644 --- a/client/src/render/scene/textures.rs +++ b/client/src/render/scene/textures.rs @@ -229,6 +229,7 @@ fn create_texture( // texture.as_image_copy(), // extent, // ); + queue.write_texture( texture.as_image_copy(), data, |