Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-26 06:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove field_infos from UniformInfoIter

Browse source
This commit is contained in:
Carter Anderson 2020-03-22 13:14:34 -07:00
parent 08cd5964a4
commit 55130bbe1c
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/render/shader/uniform.rs
View file

@ -36,20 +36,18 @@ pub enum FieldBindType {
Texture,
}
pub struct UniformInfoIter<'a, 'b, T: AsUniforms> {
pub field_infos: &'a [FieldInfo],
pub uniforms: &'b T,
pub struct UniformInfoIter<'a, T: AsUniforms> {
pub uniforms: &'a T,
pub index: usize,
pub add_sampler: bool,
}
impl<'a, 'b, T> UniformInfoIter<'a, 'b, T>
impl<'a, T> UniformInfoIter<'a, T>
where
T: AsUniforms,
{
pub fn new(field_infos: &'a [FieldInfo], uniforms: &'b T) -> Self {
pub fn new(uniforms: &'a T) -> Self {
UniformInfoIter {
field_infos,
uniforms,
index: 0,
add_sampler: false,
@ -57,25 +55,26 @@ where
}
}
impl<'a, 'b, T> Iterator for UniformInfoIter<'a, 'b, T>
impl<'a, T> Iterator for UniformInfoIter<'a, T>
where
T: AsUniforms,
{
type Item = UniformInfo<'a>;
fn next(&mut self) -> Option<Self::Item> {
let field_infos = T::get_field_infos();
if self.add_sampler {
self.add_sampler = false;
Some(UniformInfo {
name: self.field_infos[self.index - 1].sampler_name,
name: field_infos[self.index - 1].sampler_name,
bind_type: BindType::Sampler,
})
} else {
if self.index >= self.field_infos.len() {
if self.index >= field_infos.len() {
None
} else {
let index = self.index;
self.index += 1;
let ref field_info = self.field_infos[index];
let ref field_info = field_infos[index];
let bind_type = self.uniforms.get_field_bind_type(field_info.name);
if let Some(bind_type) = bind_type {
Some(match bind_type {