Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-22 12:43:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

add vertex buffer flag to uniform attributes

Browse source
This commit is contained in:
Carter Anderson 2020-03-15 12:35:02 -07:00
parent 1332630fa3
commit c1e66089cc
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
bevy_derive/src/lib.rs
View file

@ -39,6 +39,8 @@ struct UniformAttributeArgs {
pub ignore: Option<bool>, pub ignore: Option<bool>,
#[darling(default)] #[darling(default)]
pub shader_def: Option<bool>, pub shader_def: Option<bool>,
#[darling(default)]
pub vertex_buffer: Option<bool>,
} }
#[proc_macro_derive(Uniforms, attributes(uniform))] #[proc_macro_derive(Uniforms, attributes(uniform))]
@ -121,7 +123,13 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream {
let mut uniform_name_strings = Vec::new(); let mut uniform_name_strings = Vec::new();
let mut texture_and_sampler_name_strings = Vec::new(); let mut texture_and_sampler_name_strings = Vec::new();
let mut texture_and_sampler_name_idents = Vec::new(); let mut texture_and_sampler_name_idents = Vec::new();
let field_infos = active_uniform_fields.iter().map(|f| { let field_infos = uniform_fields.iter().filter(|(_field, attrs)| {
attrs.is_none()
|| match attrs.as_ref().unwrap().ignore {
Some(ignore) => !ignore,
None => true,
}
}).map(|(f, attrs)| {
let field_name = f.ident.as_ref().unwrap().to_string(); let field_name = f.ident.as_ref().unwrap().to_string();
let uniform = format!("{}_{}", struct_name, field_name); let uniform = format!("{}_{}", struct_name, field_name);
let texture = format!("{}_texture", uniform); let texture = format!("{}_texture", uniform);
@ -131,12 +139,21 @@ pub fn derive_uniforms(input: TokenStream) -> TokenStream {
texture_and_sampler_name_strings.push(sampler.clone()); texture_and_sampler_name_strings.push(sampler.clone());
texture_and_sampler_name_idents.push(f.ident.clone()); texture_and_sampler_name_idents.push(f.ident.clone());
texture_and_sampler_name_idents.push(f.ident.clone()); texture_and_sampler_name_idents.push(f.ident.clone());
let is_vertex_buffer_member = match attrs {
Some(attrs) => {
match attrs.vertex_buffer {
Some(vertex_buffer) => vertex_buffer,
None => false,
}
},
None => false,
};
quote!(bevy::render::shader::FieldInfo { quote!(bevy::render::shader::FieldInfo {
name: #field_name, name: #field_name,
uniform_name: #uniform, uniform_name: #uniform,
texture_name: #texture, texture_name: #texture,
sampler_name: #sampler, sampler_name: #sampler,
is_vertex_buffer_member: false, is_vertex_buffer_member: #is_vertex_buffer_member,
}) })
}); });