forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify Derive to allow unit structs for RenderResources. (#1089)

Browse Source
This commit is contained in:
Patrik Buhring 2020-12-23 18:21:10 -05:00 committed by GitHub
parent acc29ec719
commit cbc0fe1416
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_derive/src/render_resources.rs
View File

@ -2,7 +2,8 @@ use crate::modules::{get_modules, get_path};
use proc_macro::TokenStream; use proc_macro::TokenStream;
use quote::{format_ident, quote}; use quote::{format_ident, quote};
use syn::{ use syn::{
parse::ParseStream, parse_macro_input, Data, DataStruct, DeriveInput, Field, Fields, Path, parse::ParseStream, parse_macro_input, punctuated::Punctuated, Data, DataStruct, DeriveInput,
Field, Fields, Path,
}; };
#[derive(Default)] #[derive(Default)]
@ -72,11 +73,17 @@ pub fn derive_render_resources(input: TokenStream) -> TokenStream {
} }
}) })
} else { } else {
let empty = Punctuated::new();
let fields = match &ast.data { let fields = match &ast.data {
Data::Struct(DataStruct { Data::Struct(DataStruct {
fields: Fields::Named(fields), fields: Fields::Named(fields),
.. ..
}) => &fields.named, }) => &fields.named,
Data::Struct(DataStruct {
fields: Fields::Unit,
..
}) => &empty,
_ => panic!("Expected a struct with named fields."), _ => panic!("Expected a struct with named fields."),
}; };
let field_attributes = fields let field_attributes = fields

2
examples/shader/mesh_custom_attribute.rs
View File

@ -21,7 +21,7 @@ fn main() {
#[derive(RenderResources, Default, TypeUuid)] #[derive(RenderResources, Default, TypeUuid)]
#[uuid = "0320b9b8-b3a3-4baa-8bfa-c94008177b17"] #[uuid = "0320b9b8-b3a3-4baa-8bfa-c94008177b17"]
struct MyMaterialWithVertexColorSupport {} struct MyMaterialWithVertexColorSupport;
const VERTEX_SHADER: &str = r#" const VERTEX_SHADER: &str = r#"
#version 450 #version 450