From 5cb87a3a81ca4cdcb26e46ac830db892e6eb5d4c Mon Sep 17 00:00:00 2001
From: Derek Christ <christ.derek@gmail.com>
Date: Sat, 13 Apr 2024 18:24:05 +0200
Subject: [PATCH] First steps to fixing canvas

---
 assets/canvas_shader.wgsl | 1 -
 src/canvas.rs             | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/assets/canvas_shader.wgsl b/assets/canvas_shader.wgsl
index 51e798f..71a8487 100644
--- a/assets/canvas_shader.wgsl
+++ b/assets/canvas_shader.wgsl
@@ -28,6 +28,5 @@ fn fragment(input: VertexOutput) -> @location(0) vec4<f32> {
     }
 
     output_color += lighting;
-
     return output_color;
 }
diff --git a/src/canvas.rs b/src/canvas.rs
index d51491a..d21e872 100644
--- a/src/canvas.rs
+++ b/src/canvas.rs
@@ -7,7 +7,7 @@ use bevy::{
     render::{
         render_resource::{encase, AsBindGroup, OwnedBindingResource, ShaderRef, ShaderType},
         renderer::RenderQueue,
-        RenderApp, RenderSet,
+        Render, RenderApp, RenderSet,
     },
     sprite::{Material2d, Material2dPlugin, MaterialMesh2dBundle, RenderMaterials2d},
 };
@@ -24,7 +24,10 @@ impl Plugin for CanvasPlugin {
 
         app.sub_app_mut(RenderApp)
             .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());
                 buffer
                     .write(&CanvasMaterialUniform {
-                        ambient_color: CANVAS_COLOR,
+                        ambient_color: Color::RED,
                         tile_lights: tile_lights_uniform.clone(),
                         number_of_lights: tile_lights.len() as _,
                     })