From f8230a1862f5a8688c2704b4188cc706f938b5c0 Mon Sep 17 00:00:00 2001 From: jaynus Date: Fri, 4 Oct 2019 21:24:12 -0700 Subject: [PATCH] Fix silent shader error and pre-compiled shader. This was breaking tiles as they were out of sync and incorrect(ish). --- amethyst_tiles/Cargo.toml | 2 +- amethyst_tiles/compiled/tiles.vert.spv | Bin 2924 -> 2924 bytes amethyst_tiles/shaders/tiles.vert | 2 +- docs/CHANGELOG.md | 8 ++++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/amethyst_tiles/Cargo.toml b/amethyst_tiles/Cargo.toml index 2b2aa7146b..f0f4109b1e 100644 --- a/amethyst_tiles/Cargo.toml +++ b/amethyst_tiles/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "amethyst_tiles" -version = "0.1.1" +version = "0.1.2" authors = ["Walter Pearce "] edition = "2018" description = "2D and 3D Tile Support Library" diff --git a/amethyst_tiles/compiled/tiles.vert.spv b/amethyst_tiles/compiled/tiles.vert.spv index f3beab473a32cab271c230706d2d42942cba769d..94f8ca95270c59e2613143e8d46a871373df9771 100644 GIT binary patch delta 30 icmaDO_C{>O7k0q{1{MZ31_p*CAWj70`pv8y>C6CuK?bJ) delta 30 icmaDO_C{>O7k0rq1{MZ>1_p*CAWj70g3YWP>C6Cvy#}uU diff --git a/amethyst_tiles/shaders/tiles.vert b/amethyst_tiles/shaders/tiles.vert index c76d4dcc1b..34d5d5bbc2 100644 --- a/amethyst_tiles/shaders/tiles.vert +++ b/amethyst_tiles/shaders/tiles.vert @@ -40,7 +40,7 @@ void main() { vec2 ddir_x = (map_transform[0] * sprite_dimensions.x).xy; vec2 ddir_y = (map_transform[1] * -sprite_dimensions.y).xy; - vec4 coord = vec4(tile_coordinate.x, -tile_coordinate.y, tile_coordinate.z, 1.0); + vec4 coord = vec4(float(tile_coordinate.x), -float(tile_coordinate.y), float(tile_coordinate.z), 1.0); vec4 world_coordinate = map_coordinate_transform * coord; world_coordinate = world_coordinate * map_transform; diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index e09df3e29a..2d8b11b1e1 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -22,6 +22,14 @@ The format is based on [Keep a Changelog][kc], and this project adheres to ### Security +## [0.13.3] - 2019-10-4 + +### Fixed + +* Fixed a silent shader error causing amethyst_tiles not to work. ([#1968]) + +[#1966]: https://github.com/amethyst/amethyst/pull/1968 + ## [0.13.2] - 2019-10-4 ### Fixed