Pass camera position to shader

crates/bevy_pbr/src/render_graph/forward_pipeline/forward.frag

@@ -16,6 +16,7 @@ layout(location = 0) out vec4 o_Target;
 
 layout(set = 0, binding = 0) uniform Camera {
     mat4 ViewProj;
+    vec4 CamPos;
 };
 
 layout(set = 1, binding = 0) uniform Lights {

crates/bevy_pbr/src/render_graph/forward_pipeline/forward.vert

@@ -10,6 +10,7 @@ layout(location = 2) out vec2 v_Uv;
 
 layout(set = 0, binding = 0) uniform Camera {
     mat4 ViewProj;
+    vec4 CamPos;
 };
 
 layout(set = 2, binding = 0) uniform Transform {

crates/bevy_render/src/render_graph/nodes/camera_node.rs

@@ -77,20 +77,22 @@ pub fn camera_node_system(
 ) {
     let render_resource_context = &**render_resource_context;
 
-    let (camera, transform) = if let Some(camera_entity) = active_cameras.get(&state.camera_name) {
-        (
-            query.get::<Camera>(camera_entity).unwrap(),
-            query.get::<Transform>(camera_entity).unwrap(),
-        )
-    } else {
-        return;
-    };
+    let (camera, transform, translation) =
+        if let Some(camera_entity) = active_cameras.get(&state.camera_name) {
+            (
+                query.get::<Camera>(camera_entity).unwrap(),
+                query.get::<Transform>(camera_entity).unwrap(),
+                query.get::<Translation>(camera_entity).unwrap(),
+            )
+        } else {
+            return;
+        };
 
     let staging_buffer = if let Some(staging_buffer) = state.staging_buffer {
         render_resource_context.map_buffer(staging_buffer);
         staging_buffer
     } else {
-        let size = std::mem::size_of::<[[f32; 4]; 4]>();
+        let size = std::mem::size_of::<[[f32; 4]; 4]>() + std::mem::size_of::<[f32; 4]>();
         let buffer = render_resource_context.create_buffer(BufferInfo {
             size,
             buffer_usage: BufferUsage::COPY_DST | BufferUsage::UNIFORM,
@@ -117,14 +119,18 @@ pub fn camera_node_system(
     };
 
     let matrix_size = std::mem::size_of::<[[f32; 4]; 4]>();
+    let position_size = std::mem::size_of::<[f32; 4]>();
+    let uniform_size = matrix_size + position_size;
     let camera_matrix: [f32; 16] =
         (camera.projection_matrix * transform.value.inverse()).to_cols_array();
+    let position: [f32; 4] = translation.0.extend(1.0).into();
 
     render_resource_context.write_mapped_buffer(
         staging_buffer,
-        0..matrix_size as u64,
+        0..uniform_size as u64,
         &mut |data, _renderer| {
             data[0..matrix_size].copy_from_slice(camera_matrix.as_bytes());
+            data[matrix_size..uniform_size].copy_from_slice(position.as_bytes());
         },
     );
     render_resource_context.unmap_buffer(staging_buffer);
@@ -135,6 +141,6 @@ pub fn camera_node_system(
         0,
         camera_buffer,
         0,
-        matrix_size as u64,
+        uniform_size as u64,
     );
 }

crates/bevy_render/src/render_graph/nodes/pass_node.rs

@@ -77,7 +77,10 @@ impl<Q: HecsQuery> PassNode<Q> {
                 index: 0,
                 bind_type: BindType::Uniform {
                     dynamic: false,
-                    properties: vec![UniformProperty::Struct(vec![UniformProperty::Mat4])],
+                    properties: vec![UniformProperty::Struct(vec![
+                        UniformProperty::Mat4,
+                        UniformProperty::Vec4,
+                    ])],
                 },
                 shader_stage: BindingShaderStage::VERTEX | BindingShaderStage::FRAGMENT,
             }],

examples/shader/shader_custom_material.rs

@@ -28,6 +28,7 @@ const VERTEX_SHADER: &str = r#"
 layout(location = 0) in vec3 Vertex_Position;
 layout(set = 0, binding = 0) uniform Camera {
     mat4 ViewProj;
+    vec4 CamPos;
 };
 layout(set = 1, binding = 0) uniform Transform {
     mat4 Model;

examples/shader/shader_defs.rs

@@ -36,6 +36,7 @@ const VERTEX_SHADER: &str = r#"
 layout(location = 0) in vec3 Vertex_Position;
 layout(set = 0, binding = 0) uniform Camera {
     mat4 ViewProj;
+    vec4 CamPos;
 };
 layout(set = 1, binding = 0) uniform Transform {
     mat4 Model;