fix: rendering now has correct viewport height and width

src/app.rs

@@ -31,7 +31,7 @@ use vulkano::pipeline::graphics::rasterization::RasterizationState;
 use vulkano::pipeline::graphics::vertex_input::{Vertex, VertexDefinition};
 use vulkano::pipeline::graphics::viewport::{Viewport, ViewportState};
 use vulkano::pipeline::layout::PipelineDescriptorSetLayoutCreateInfo;
-use vulkano::pipeline::{GraphicsPipeline, Pipeline, PipelineBindPoint, PipelineLayout, PipelineShaderStageCreateInfo};
+use vulkano::pipeline::{DynamicState, GraphicsPipeline, Pipeline, PipelineBindPoint, PipelineLayout, PipelineShaderStageCreateInfo};
 use vulkano::render_pass::{Framebuffer, FramebufferCreateInfo, RenderPass, Subpass};
 use vulkano::shader::ShaderModule;
 use vulkano::swapchain::{Surface, Swapchain, SwapchainCreateInfo, SwapchainPresentInfo};
@@ -211,7 +211,8 @@ impl VulkanContext {
             &queue,
             &pipeline,
             &framebuffers,
-            camera_resources.descriptor_set(),
+            &camera,
+            &camera_resources,
             mesh_registry.clone(),
             batches,
         )?;
@@ -240,7 +241,7 @@ impl VulkanContext {
 
     /// Draws a frame on the current [`Surface`].
     pub fn draw_frame(&mut self) -> Result<(), Box<dyn Error>> {
-        self.camera.move_right(0.1);
+        // self.camera.move_right(0.1);
         self.camera_resources.update(&self.camera);
         let (image_idx, suboptimal, acquire_future) =
             match swapchain::acquire_next_image(self.swapchain.clone(), None)
@@ -268,7 +269,8 @@ impl VulkanContext {
             &self.queue,
             &self.pipeline,
             &self.framebuffers,
-            self.camera_resources.descriptor_set(),
+            &self.camera,
+            &self.camera_resources,
             self.mesh_registry.clone(),
             RenderBatch::build_batches(
                 self.mem_allocator.clone(),
@@ -404,11 +406,8 @@ impl VulkanContext {
                 .into_pipeline_layout_create_info(device.clone())?,
         )?;
 
-        let viewport = Viewport {
+        // This is a default viewport. It will be updated later via the camera struct in the context.
-            offset: [0.0, 0.0],
+        let viewport = Viewport::default();
-            extent: extents,
-            depth_range: 0.0..=1.0,
-        };
 
         Ok(GraphicsPipeline::new(
             device.clone(),
@@ -428,7 +427,7 @@ impl VulkanContext {
                     subpass.num_color_attachments(),
                     ColorBlendAttachmentState::default(),
                 )),
-                dynamic_state: Default::default(),
+                dynamic_state: [DynamicState::Viewport].into_iter().collect(),
                 subpass: Some(subpass.into()),
                 ..GraphicsPipelineCreateInfo::layout(layout)
             },
@@ -441,7 +440,8 @@ impl VulkanContext {
         queue: &Arc<Queue>,
         pipeline: &Arc<GraphicsPipeline>,
         framebuffers: &Vec<Arc<Framebuffer>>,
-        camera_desc_set: Arc<DescriptorSet>,
+        camera: &Camera,
+        camera_resources: &CameraResources,
         mesh_registry: Arc<MeshRegistry>,
         render_batches: Vec<RenderBatch>,
     ) -> Result<Vec<Arc<PrimaryAutoCommandBuffer>>, Box<dyn Error>> {
@@ -468,11 +468,16 @@ impl VulkanContext {
                             },
                         )
                         .unwrap()
+                        .set_viewport(
+                            0,
+                            [camera.viewport()].into_iter().collect()
+                        )
+                        .unwrap()
                         .bind_descriptor_sets(
                             PipelineBindPoint::Graphics,
                             pipeline.layout().clone(),
                             0,
-                            camera_desc_set.clone(),
+                            camera_resources.descriptor_set().clone(),
                         )
                         .unwrap()
                         .bind_pipeline_graphics(pipeline.clone())
@@ -515,7 +520,7 @@ impl VulkanContext {
             self.device.wait_idle()?;
         };
 
-        let image_extents = self.swapchain.image_extent();
+        let image_extents = self.window.inner_size();
 
         let (new_swapchain, new_images) = self.swapchain.recreate(SwapchainCreateInfo {
             image_extent: image_extents.clone().into(),
@@ -537,10 +542,10 @@ impl VulkanContext {
                 &self.vert_shader,
                 &self.frag_shader,
                 &self.render_pass,
-                [image_extents[0] as f32, image_extents[1] as f32],
+                [image_extents.width as f32, image_extents.height as f32],
             )?;
 
-            self.camera.extents(image_extents);
+            self.camera.extents([image_extents.width, image_extents.height]);
 
             let batches = RenderBatch::build_batches(
                 self.mem_allocator.clone(),
@@ -553,7 +558,8 @@ impl VulkanContext {
                 &self.queue,
                 &new_pipeline,
                 &self.framebuffers,
-                self.camera_resources.descriptor_set(),
+                &self.camera,
+                &self.camera_resources,
                 self.mesh_registry.clone(),
                 batches
             )?;

src/common/camera.rs

@@ -6,6 +6,7 @@ use vulkano::descriptor_set::allocator::DescriptorSetAllocator;
 use vulkano::descriptor_set::{DescriptorSet, WriteDescriptorSet};
 use vulkano::descriptor_set::layout::DescriptorSetLayout;
 use vulkano::memory::allocator::{AllocationCreateInfo, MemoryAllocator, MemoryTypeFilter};
+use vulkano::pipeline::graphics::viewport::Viewport;
 use crate::gpu::camera::CameraUniform;
 
 /// A camera set within 3D space.
@@ -31,7 +32,7 @@ impl Camera {
         extents: impl Into<Vector2<u32>>
     ) -> Self {
         let extents = extents.into();
-        let position = Vector3::new(20.0, 20.0, 20.0);
+        let position = Vector3::new(-10.0, 10.0, -10.0);
         let target = Vector3::zeros();
 
         // Traveling along this vector moves us toward the target.
@@ -91,12 +92,27 @@ impl Camera {
     pub fn get_projection(&self) -> Matrix4<f32> {
         let aspect = self.extents.x as f32 / self.extents.y as f32;
 
-        Matrix4::new_perspective(
+        let mut proj = Matrix4::new_perspective(
             aspect,
             self.fov,
             1.0,
             10000.0
-        )
+        );
+
+        // Flip the y-axis, since Vulkan uses a different coordinate system.
+        proj[(1, 1)] *= -1.0;
+
+        proj
+    }
+
+    /// Creates a [`Viewport`] based on the current extents.
+    pub fn viewport(&self) -> Viewport {
+        let extent = self.extents.map(|v| v as f32).into();
+        Viewport {
+            offset: [0.0, 0.0],
+            extent,
+            depth_range: 0.0..=1.0,
+        }
     }
 }