First steps to fixing canvas
This commit is contained in:
@@ -28,6 +28,5 @@ fn fragment(input: VertexOutput) -> @location(0) vec4<f32> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
output_color += lighting;
|
output_color += lighting;
|
||||||
|
|
||||||
return output_color;
|
return output_color;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use bevy::{
|
|||||||
render::{
|
render::{
|
||||||
render_resource::{encase, AsBindGroup, OwnedBindingResource, ShaderRef, ShaderType},
|
render_resource::{encase, AsBindGroup, OwnedBindingResource, ShaderRef, ShaderType},
|
||||||
renderer::RenderQueue,
|
renderer::RenderQueue,
|
||||||
RenderApp, RenderSet,
|
Render, RenderApp, RenderSet,
|
||||||
},
|
},
|
||||||
sprite::{Material2d, Material2dPlugin, MaterialMesh2dBundle, RenderMaterials2d},
|
sprite::{Material2d, Material2dPlugin, MaterialMesh2dBundle, RenderMaterials2d},
|
||||||
};
|
};
|
||||||
@@ -24,7 +24,10 @@ impl Plugin for CanvasPlugin {
|
|||||||
|
|
||||||
app.sub_app_mut(RenderApp)
|
app.sub_app_mut(RenderApp)
|
||||||
.add_systems(ExtractSchedule, extract_tile_lights)
|
.add_systems(ExtractSchedule, extract_tile_lights)
|
||||||
.add_systems(Update, prepare_canvas_material.in_set(RenderSet::Prepare));
|
.add_systems(
|
||||||
|
Render,
|
||||||
|
prepare_canvas_material.in_set(RenderSet::PrepareAssets),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,7 +82,7 @@ fn prepare_canvas_material(
|
|||||||
let mut buffer = encase::UniformBuffer::new(Vec::new());
|
let mut buffer = encase::UniformBuffer::new(Vec::new());
|
||||||
buffer
|
buffer
|
||||||
.write(&CanvasMaterialUniform {
|
.write(&CanvasMaterialUniform {
|
||||||
ambient_color: CANVAS_COLOR,
|
ambient_color: Color::RED,
|
||||||
tile_lights: tile_lights_uniform.clone(),
|
tile_lights: tile_lights_uniform.clone(),
|
||||||
number_of_lights: tile_lights.len() as _,
|
number_of_lights: tile_lights.len() as _,
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user