Skip to content

Commit

Permalink
Finish splitting camera bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtsr
mtsr committed Mar 10, 2021
1 parent a7cd519 commit a9cef2d
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 61 deletions.
127 changes: 70 additions & 57 deletions crates/bevy_render/src/render_graph/nodes/camera_node.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ use crate::{
RenderResourceBindings, RenderResourceContext,
},
};
use bevy_core::{AsBytes, Bytes};
use bevy_core::{AsBytes, Byteable, Bytes};

use bevy_ecs::{Commands, IntoSystem, Local, Query, Res, ResMut, Resources, System, World};
use bevy_transform::prelude::*;
use bevy_utils::HashMap;
use std::borrow::Cow;

#[derive(Debug)]
Expand Down Expand Up @@ -51,8 +52,8 @@ impl SystemNode for CameraNode {
CameraNodeState {
camera_name: self.camera_name.clone(),
command_queue: self.command_queue.clone(),
camera_buffer: None,
staging_buffer: None,
buffers: HashMap::default(),
// staging_buffer: None,
},
);
Box::new(system)
Expand All @@ -63,8 +64,8 @@ impl SystemNode for CameraNode {
pub struct CameraNodeState {
command_queue: CommandQueue,
camera_name: Cow<'static, str>,
camera_buffer: Option<BufferId>,
staging_buffer: Option<BufferId>,
buffers: HashMap<String, (BufferId, BufferId)>,
// staging_buffer: Option<BufferId>,
}

pub fn camera_node_system(
Expand All @@ -76,73 +77,85 @@ pub fn camera_node_system(
mut render_resource_bindings: ResMut<RenderResourceBindings>,
query: Query<(&Camera, &GlobalTransform)>,
) {
let render_resource_context = &**render_resource_context;
let camera_name = state.camera_name.clone();

let (camera, global_transform) = if let Some(entity) = active_cameras.get(&state.camera_name) {
let (camera, global_transform) = if let Some(entity) = active_cameras.get(&camera_name) {
query.get(entity).unwrap()
} else {
return;
};

let view_matrix = global_transform.compute_matrix().inverse();
let camera_matrix = [
(camera.projection_matrix * view_matrix).to_cols_array(),
let view_proj_matrix = camera.projection_matrix * view_matrix;

make_binding(
&mut *state,
&**render_resource_context,
&mut *render_resource_bindings,
&format!("{}ViewProj", camera_name),
view_proj_matrix.to_cols_array(),
);

make_binding(
&mut *state,
&**render_resource_context,
&mut *render_resource_bindings,
&format!("{}View", camera_name),
view_matrix.to_cols_array(),
];
let buffer_size = camera_matrix.byte_len();
);
}

let staging_buffer = if let Some(staging_buffer) = state.staging_buffer {
render_resource_context.map_buffer(staging_buffer);
staging_buffer
} else {
let buffer = render_resource_context.create_buffer(BufferInfo {
size: buffer_size,
buffer_usage: BufferUsage::COPY_DST | BufferUsage::UNIFORM,
..Default::default()
});
render_resource_bindings.set(
&format!("{}ViewProj", &state.camera_name),
RenderResourceBinding::Buffer {
buffer,
range: 0..view_matrix.byte_len() as u64,
dynamic_index: None,
},
);
render_resource_bindings.set(
&format!("{}View", &state.camera_name),
RenderResourceBinding::Buffer {
buffer,
range: view_matrix.byte_len() as u64..buffer_size as u64,
dynamic_index: None,
},
);
state.camera_buffer = Some(buffer);
fn make_binding<B>(
state: &mut CameraNodeState,
render_resource_context: &dyn RenderResourceContext,
render_resource_bindings: &mut RenderResourceBindings,
binding_name: &str,
bytes: B,
) where
B: Bytes + Byteable,
{
let buffer_size = bytes.byte_len();

let staging_buffer = render_resource_context.create_buffer(BufferInfo {
size: buffer_size,
buffer_usage: BufferUsage::COPY_SRC | BufferUsage::MAP_WRITE,
mapped_at_creation: true,
});
let buffers_entry = state.buffers.entry(binding_name.to_owned());

state.staging_buffer = Some(staging_buffer);
staging_buffer
};
let (staging_buffer, buffer) = buffers_entry
.and_modify(|(staging_buffer, _)| {
render_resource_context.map_buffer(*staging_buffer);
})
.or_insert_with(|| {
let buffer = render_resource_context.create_buffer(BufferInfo {
size: buffer_size,
buffer_usage: BufferUsage::COPY_DST | BufferUsage::UNIFORM,
..Default::default()
});

render_resource_bindings.set(
&binding_name,
RenderResourceBinding::Buffer {
buffer,
range: 0..buffer_size as u64,
dynamic_index: None,
},
);

let staging_buffer = render_resource_context.create_buffer(BufferInfo {
size: buffer_size,
buffer_usage: BufferUsage::COPY_SRC | BufferUsage::MAP_WRITE,
mapped_at_creation: true,
});
(staging_buffer, buffer)
});

render_resource_context.write_mapped_buffer(
staging_buffer,
*staging_buffer,
0..buffer_size as u64,
&mut |data, _renderer| {
data[0..buffer_size].copy_from_slice(camera_matrix.as_bytes());
data[0..buffer_size].copy_from_slice(bytes.as_bytes());
},
);
render_resource_context.unmap_buffer(staging_buffer);

let camera_buffer = state.camera_buffer.unwrap();
state.command_queue.copy_buffer_to_buffer(
staging_buffer,
0,
camera_buffer,
0,
buffer_size as u64,
);
render_resource_context.unmap_buffer(*staging_buffer);

state
.command_queue
.copy_buffer_to_buffer(*staging_buffer, 0, *buffer, 0, buffer_size as u64);
}
9 changes: 5 additions & 4 deletions crates/bevy_render/src/render_graph/nodes/pass_node.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ where
TextureAttachment::Id(input.get(input_index).unwrap().get_texture().unwrap());
}

for camera_info in self.cameras.iter_mut() {
'outer: for camera_info in self.cameras.iter_mut() {
let camera_name = &camera_info.name;

if render_context
Expand All @@ -211,22 +211,23 @@ where
{
let mut camera_bind_group_builder = BindGroup::build();

for binding_name in self
for (index, binding_name) in self
.camera_bind_group_descriptor
.bindings
.iter()
.map(|binding| &binding.name)
.enumerate()
{
let camera_binding = if let Some(camera_binding) = render_resource_bindings.get(
&format!("{}{}", &camera_name, binding_name.replace("Camera", "")),
) {
camera_binding.clone()
} else {
continue;
continue 'outer;
};

camera_bind_group_builder =
camera_bind_group_builder.add_binding(0, camera_binding);
camera_bind_group_builder.add_binding(index as u32, camera_binding);
}

let camera_bind_group = camera_bind_group_builder.finish();
Expand Down

0 comments on commit a9cef2d

Please sign in to comment.