From 4b63074631fa35bd875a79b5c31d490d10a0491e Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Mon, 17 Aug 2026 03:32:02 -0700 Subject: draw three teapots and split out the model rendering code a bunch for rapid instancing Force-Push: yes Change-Id: I75be46d8cd11bbf662013711ee5ec56abeb5e6ea --- src/graphics/scene.rs | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) (limited to 'src/graphics/scene.rs') diff --git a/src/graphics/scene.rs b/src/graphics/scene.rs index 9631dba..b27b68b 100644 --- a/src/graphics/scene.rs +++ b/src/graphics/scene.rs @@ -1,6 +1,10 @@ #![deny(unsafe_code)] use crate::error::*; use crate::graphics::Render; +use crate::linear_algebra::{ Vec3, Vec4, Transformation }; +use crate::shader_data::{ Vertex, VertexPushBlock }; + +use std::f32::consts::{ TAU }; use vulkanalia::Device; use vulkanalia::vk::{ self, HasBuilder, DeviceV1_0 }; @@ -78,7 +82,24 @@ pub fn generate_scene_commands<'a>(image_index: usize, time: f32, } if let Some(model) = &render.model { - model.render(time, device, render, command_buffer); + model.make_active(device, render, command_buffer); + + let (scale, mut transformation) = demo_spin_transformation(time); + apply_model_transformation(device, render, command_buffer, + &scale, &transformation); + model.render(device, render, command_buffer); + + transformation.translation = transformation.translation.add( + &Vec3::new(0.0, 4.0, 0.0)); + apply_model_transformation(device, render, command_buffer, + &scale, &transformation); + model.render(device, render, command_buffer); + + transformation.translation = transformation.translation.add( + &Vec3::new(0.0, -8.0, 0.0)); + apply_model_transformation(device, render, command_buffer, + &scale, &transformation); + model.render(device, render, command_buffer); } unsafe { device.cmd_end_render_pass(*command_buffer) }; @@ -88,3 +109,42 @@ pub fn generate_scene_commands<'a>(image_index: usize, time: f32, Ok(command_buffer) } + +fn demo_spin_transformation(time: f32) -> (Vec3, Transformation) { + let scale = Vec3::new(1.0, 1.0, 1.0); + + let transformation = Transformation { + rotation: Vec4::rotation_quaternion(&Vec3::new(0.0, 1.0, 0.0), + time % TAU), + translation: Vec3::new(0.0, 0.0, 0.0), + }; + + (scale, transformation) +} + + +#[allow(unsafe_code)] +fn apply_model_transformation(device: &Device, render: &Render, + command_buffer: &vk::CommandBuffer, + scale: &Vec3, + transformation: &Transformation) +{ + let push_block = VertexPushBlock:: { + scale: scale.clone(), + model: transformation.clone(), + }; + let size = size_of::>(); + let push_block_bytes = unsafe { + std::slice::from_raw_parts(&push_block as *const VertexPushBlock + as *const u8, + size) + }; + + unsafe { + device.cmd_push_constants(*command_buffer, render.pipeline_layout, + vk::ShaderStageFlags::VERTEX, + 0, + push_block_bytes) + }; +} + -- cgit 1.4.1