pop
/
martian-chess
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BROKEN: Change order of loading systems for tweakfile

Browse Source
main
Elijah Voigt 2 years ago
parent 3f8232283e
commit 7a35c3e233
3 changed files with 123 additions and 40 deletions
Show Stats Download Patch File Download Diff File

159
src/display2d.rs
Unescape Escape View File

@ -6,10 +6,11 @@ use bevy::window::{PrimaryWindow, WindowResized};
use crate::{
game::{Board, BoardIndex, Piece, Side, Tile},
prelude::*,
tweak::Tweakfile,
};
use serde::Deserialize;
const SCALE: f32 = 4.0;
const TILE_SIZE: f32 = 16.0;
pub(crate) struct Display2dPlugin;
@ -63,6 +64,41 @@ pub(crate) struct Display2d;
#[derive(Debug, Component)]
struct BackgroundImage;
/// All possible sprites
#[derive(Debug, Deserialize, Component, Clone, PartialEq)]
pub(crate) enum GameSprite {
RedQueen,
RedDrone,
RedPawn,
BlueQueen,
BlueDrone,
BluePawn,
LightTile,
DarkTile,
}
impl From<(game::Piece, game::Side)> for GameSprite {
fn from((piece, side): (game::Piece, game::Side)) -> GameSprite {
match (piece, side) {
(Piece::Queen, Side::A) => GameSprite::RedQueen,
(Piece::Drone, Side::A) => GameSprite::RedDrone,
(Piece::Pawn, Side::A) => GameSprite::RedPawn,
(Piece::Queen, Side::B) => GameSprite::BlueQueen,
(Piece::Drone, Side::B) => GameSprite::BlueDrone,
(Piece::Pawn, Side::B) => GameSprite::BluePawn,
}
}
}
impl From<Tile> for GameSprite {
fn from(tile: game::Tile) -> GameSprite {
match tile {
Tile::Light => GameSprite::LightTile,
Tile::Dark => GameSprite::DarkTile,
}
}
}
/// STARTUP: Initialize 2d gameplay Camera
fn initialize_camera(mut commands: Commands) {
commands.spawn((
@ -84,13 +120,19 @@ fn initialize_camera(mut commands: Commands) {
fn load_spritesheet(
mut texture_atlases: ResMut<Assets<TextureAtlas>>,
server: Res<AssetServer>,
tweaks: Res<Assets<tweak::Tweakfile>>,
mut commands: Commands,
) {
let handle: Handle<tweak::Tweakfile> = server.load("martian.tweak.toml");
let tweak = tweaks.get(&handle).expect("Load tweakfiles");
let atlas = TextureAtlas::from_grid(
server.load("images/sprites.png"),
Vec2::new(TILE_SIZE, TILE_SIZE),
8,
1,
server.load(tweak.display2d.sprites.file.clone()),
Vec2::new(
tweak.display2d.sprites.tile_size.x,
tweak.display2d.sprites.tile_size.y,
),
tweak.display2d.sprites.columns,
tweak.display2d.sprites.rows,
None,
None,
);
@ -156,8 +198,11 @@ fn initialize_board(board: Option<Res<Board>>, mut commands: Commands) {
.with_children(|parent| {
// Spawn tiles
game::tiles().for_each(|(index, tile)| {
let game_sprite: GameSprite = tile.clone().into();
parent.spawn((
tile,
game_sprite,
tile.clone(),
index,
Display2d,
SpriteSheetBundle { ..default() },
@ -169,11 +214,14 @@ fn initialize_board(board: Option<Res<Board>>, mut commands: Commands) {
board.pieces().iter().for_each(|(index, piece)| {
let side = Board::side(*index).expect("Spawn valid side");
let game_sprite: GameSprite = (*piece, side.clone()).into();
parent.spawn((
game_sprite,
piece.clone(),
Display2d,
index.clone(),
side,
side.clone(),
SpriteSheetBundle { ..default() },
game::Selectable,
));
@ -187,54 +235,57 @@ fn set_piece_sprite(
(
&mut TextureAtlasSprite,
&mut Handle<TextureAtlas>,
&Piece,
&Side,
&GameSprite,
),
(With<Display2d>, Or<(Added<Piece>, Changed<Side>)>),
>,
sprite_sheet: Option<Res<SpriteSheet>>,
tweaks: Res<Assets<Tweakfile>>,
server: Res<AssetServer>,
) {
if let Some(sprite_sheet) = sprite_sheet {
events
.iter_mut()
.for_each(|(mut sprite, mut texture_atlas, piece, side)| {
debug!("Updating sprite {:?} {:?}", piece, side);
let handle: Handle<Tweakfile> = server.load("martian.tweak.toml");
let tweak = tweaks
.get(&handle)
.expect("Load tweaksfile in set piece sprite");
let sprite_sheet = sprite_sheet.expect("Sprite sheet");
events
.iter_mut()
.for_each(|(mut sprite, mut texture_atlas, game_sprite)| {
if let Some(index) = tweak.display2d.sprites.locate(game_sprite) {
if *texture_atlas != sprite_sheet.handle {
*texture_atlas = sprite_sheet.handle.clone();
}
sprite.index = match (piece, side) {
(Piece::Queen, Side::A) => 2,
(Piece::Queen, Side::B) => 5,
(Piece::Drone, Side::A) => 3,
(Piece::Drone, Side::B) => 6,
(Piece::Pawn, Side::A) => 4,
(Piece::Pawn, Side::B) => 7,
};
});
}
sprite.index = index;
}
});
}
fn set_tile_sprite(
mut events: Query<
(&mut TextureAtlasSprite, &mut Handle<TextureAtlas>, &Tile),
(Added<game::Tile>, With<Display2d>),
(
&mut TextureAtlasSprite,
&mut Handle<TextureAtlas>,
&GameSprite,
),
(Added<GameSprite>, With<Display2d>),
>,
sprite_sheet: Option<Res<SpriteSheet>>,
tweaks: Res<Assets<Tweakfile>>,
server: Res<AssetServer>,
) {
if let Some(sprite_sheet) = sprite_sheet {
events
.iter_mut()
.for_each(|(mut sprite, mut texture_atlas, tile)| {
let handle: Handle<Tweakfile> = server.load("martian.tweak.toml");
let tweak = tweaks
.get(&handle)
.expect("Load tweaksfile in set tile sprite");
let sprite_sheet = sprite_sheet.expect("Sprite sheet");
events
.iter_mut()
.for_each(|(mut sprite, mut texture_atlas, game_sprite)| {
if let Some(index) = tweak.display2d.sprites.locate(game_sprite) {
*texture_atlas = sprite_sheet.handle.clone();
let s = match tile {
Tile::Dark => 0,
Tile::Light => 1,
};
*sprite = TextureAtlasSprite::new(s);
});
}
*sprite = TextureAtlasSprite::new(index);
}
});
}
/// Sets a piece location given it's board index
@ -348,3 +399,33 @@ fn move_piece(
}
})
}
pub(crate) mod tweaks {
use super::*;
#[derive(Debug, Deserialize, Default)]
pub(crate) struct Display2dTweaks {
#[serde(default)]
pub sprites: SpriteTweaks,
}
#[derive(Debug, Deserialize, Default)]
pub(crate) struct SpriteTweaks {
#[serde(default)]
pub file: String,
#[serde(default)]
pub tile_size: Vec2,
#[serde(default)]
pub columns: usize,
#[serde(default)]
pub rows: usize,
#[serde(default)]
pub sprite_order: Vec<GameSprite>,
}
impl SpriteTweaks {
pub(crate) fn locate(&self, s: &GameSprite) -> Option<usize> {
self.sprite_order.iter().position(|x| x == s)
}
}
}

2
src/game.rs
Unescape Escape View File

@ -136,7 +136,7 @@ pub(crate) struct BoardIndex {
pub y: usize,
}
#[derive(Debug, Component, PartialEq)]
#[derive(Debug, Component, PartialEq, Clone)]
pub(crate) enum Side {
A,
B,

2
src/tweak.rs
Unescape Escape View File

@ -35,6 +35,8 @@ pub(crate) struct Tweakfile {
pub audio: audio::AudioTweaks,
#[serde(default)]
pub display3d: display3d::tweaks::Display3dTweaks,
#[serde(default)]
pub display2d: display2d::tweaks::Display2dTweaks,
}
#[derive(Default)]

Write Preview
Loading…
Cancel
Save