Noratrieb/game-wip-dontplay
1
0
Fork 0
mirror of https://github.com/Noratrieb/game-wip-dontplay.git synced 2026-01-16 12:25:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make tile ids strongly typed between bg/mid/fg

Browse source
This commit is contained in:
crumblingstatue 2023-04-17 13:41:51 +02:00
parent cdf73d0739
commit 1e665378f8
15 changed files with 448 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game.rs
View file

@ -17,7 +17,7 @@ use crate::{
math::{smoothwave, wp_to_tp, WorldPos},
res::Res,
tiles::TileDb,
world::{Tile, TilePos, World},
world::{TilePos, World},
worldgen::Worldgen,
};
@ -77,11 +77,11 @@ impl GameState {
for_each_tile_on_screen(self.camera_offset, rt.size(), |tp, sp| {
let tile = self.world.tile_at_mut(tp, &self.worldgen);
s.set_position(sp.to_sf_vec());
if tile.bg != Tile::EMPTY {
if !tile.bg.empty() {
s.set_texture_rect(self.tile_db[tile.bg].tex_rect.to_sf());
rt.draw(&s);
}
if tile.mid != Tile::EMPTY {
if !tile.mid.empty() {
s.set_texture_rect(self.tile_db[tile.mid].tex_rect.to_sf());
if let Some(light) = self.tile_db[tile.mid].light {
let pos = ScreenVec {
@ -92,7 +92,7 @@ impl GameState {
}
rt.draw(&s);
}
if tile.fg != Tile::EMPTY {
if !tile.fg.empty() {
s.set_texture_rect(self.tile_db[tile.fg].tex_rect.to_sf());
rt.draw(&s);
}