Merge pull request #481 from rparrett/fix-color-srgbness

Fix tile color srgbness
StarArawn · Dec 17, 2023 · fb2e2b2 · fb2e2b2
2 parents 04b5bfa + 555585a
commit fb2e2b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/render/chunk.rs b/src/render/chunk.rs
@@ -167,7 +167,7 @@ pub struct PackedTileData {
     pub visible: bool,
     pub position: Vec4,
     pub texture: Vec4,
-    pub color: Vec4,
+    pub color: [f32; 4],
 }
 
 #[derive(Clone, Debug)]
@@ -374,8 +374,7 @@ impl RenderChunk2d {
                     .into_iter(),
                 );
 
-                let color: [f32; 4] = tile.color.into();
-                colors.extend([color, color, color, color].into_iter());
+                colors.extend(std::iter::repeat(tile.color).take(4));
 
                 // flipping and rotation packed in bits
                 // bit 0 : flip_x

diff --git a/src/render/extract.rs b/src/render/extract.rs
@@ -279,7 +279,7 @@ pub fn extract(
             visible: visible.0,
             position,
             texture,
-            color: color.0.into(),
+            color: color.0.as_linear_rgba_f32(),
         };
 
         let data = tilemap_query.get(tilemap_id.0).unwrap();