initial z axis tiles pass

This commit is contained in:
StephenAdamson
2024-12-13 00:19:21 +00:00
parent c14851616b
commit 01e1349ea1
7 changed files with 91 additions and 96 deletions
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

+1
View File
@@ -39,6 +39,7 @@ pub fn camera_movement(
pub fn spawn_panning_camera(mut commands: Commands) { pub fn spawn_panning_camera(mut commands: Commands) {
commands.spawn(( commands.spawn((
Camera2d::default(), Camera2d::default(),
Transform::from_xyz(0.,0.,10.),
PanningCamera { pan_speed: 5.0 } PanningCamera { pan_speed: 5.0 }
)); ));
} }
+18 -6
View File
@@ -24,20 +24,29 @@ pub fn setup_level(mut commands: Commands, asset_server: Res<AssetServer>) {
fn setup_tilemap(commands: &mut Commands, asset_server: &Res<AssetServer>) { fn setup_tilemap(commands: &mut Commands, asset_server: &Res<AssetServer>) {
for x in 0..25 { for x in 0..25 {
for y in 0..25 { for y in 0..25 {
for z in 0..4 {
let position = Vec3::new( let position = Vec3::new(
x as f32 * 16. * PIXEL_RATIO, x as f32 * 16. * PIXEL_RATIO,
y as f32 * 16. * PIXEL_RATIO, y as f32 * 16. * PIXEL_RATIO,
-0.5, -z as f32,
); );
let mut noitem: bool = false;
let texture = if random::<f32>() < 0.5 { let texture: Handle<Image>;
asset_server.load("grass.png") if random::<f32>() < 0.4 {
texture = asset_server.load("grass.png");
} else if random::<f32>() < 0.2 {
texture = asset_server.load("dirt.png");
} else if random::<f32>() < 0.1 {
texture = asset_server.load("rock.png");
} else { } else {
asset_server.load("rock.png") texture = asset_server.load("sky.png");
noitem = true;
}; };
let mut items: Vec<ItemBundle> = vec![]; let mut items: Vec<ItemBundle> = vec![];
if !noitem {
if random::<f32>() < 0.1 { if random::<f32>() < 0.1 {
items.push(ItemBundle { items.push(ItemBundle {
transform: Transform::from_translation(Vec3::new(0., 0., 0.1)), transform: Transform::from_translation(Vec3::new(0., 0., 0.1)),
@@ -71,7 +80,7 @@ fn setup_tilemap(commands: &mut Commands, asset_server: &Res<AssetServer>) {
visibility: Visibility::Visible, visibility: Visibility::Visible,
}); });
} }
}
let tile_entity = commands let tile_entity = commands
.spawn(( .spawn((
@@ -85,7 +94,9 @@ fn setup_tilemap(commands: &mut Commands, asset_server: &Res<AssetServer>) {
astar_weight: random::<u8>() % 10 + 1, astar_weight: random::<u8>() % 10 + 1,
}, },
Tile { position: position }, Tile { position: position },
TileState { timer: Timer::from_seconds(0.5, TimerMode::Repeating) } TileState {
timer: Timer::from_seconds(1., TimerMode::Repeating),
},
)) ))
.id(); .id();
@@ -97,3 +108,4 @@ fn setup_tilemap(commands: &mut Commands, asset_server: &Res<AssetServer>) {
} }
} }
} }
}
+1 -1
View File
@@ -27,7 +27,7 @@ fn main() {
.add_systems(FixedUpdate, ( .add_systems(FixedUpdate, (
camera::camera_movement, camera::camera_movement,
citizen::citizen_movement, citizen::citizen_movement,
tile::tile_update, tile::tile_sprite_update,
)) ))
.run(); .run();
} }
+2 -29
View File
@@ -60,49 +60,23 @@ pub struct DoorTile {
pub locked: bool, pub locked: bool,
} }
pub fn spawn_tile( pub fn tile_sprite_update(
commands: &mut Commands,
position: Vec3,
floor_tile: FloorTile,
// fixture: Option<Fixture>,
items: Vec<Item>,
) {
let tile_entity = commands.spawn((Tile { position }, floor_tile)).id();
// if let Some(fixture) = fixture {
// commands.entity(tile_entity).add_children(&[
// commands
// .spawn((fixture,))
// .id(),
// ]);
// }
let mut child_entities = Vec::new();
for item in items {
child_entities.push(commands.spawn(item).id());
}
commands.entity(tile_entity).add_children(&child_entities);
}
pub fn tile_update(
time: Res<Time>, time: Res<Time>,
mut query_tile: Query<(Entity, &Children, &mut TileState), With<Tile>>, mut query_tile: Query<(Entity, &Children, &mut TileState), With<Tile>>,
mut query_item: Query<(&mut Visibility, &Item)>, mut query_item: Query<(&mut Visibility, &Item)>,
) { ) {
for (tile_entity, children, mut state) in query_tile.iter_mut() { for (_, children, mut state) in query_tile.iter_mut() {
state.timer.tick(time.delta()); state.timer.tick(time.delta());
if !state.timer.finished() { if !state.timer.finished() {
continue; continue;
} }
let mut visible_index: Option<usize> = None; let mut visible_index: Option<usize> = None;
let mut visible_child: Option<Entity> = None;
for (i, &child) in children.iter().enumerate() { for (i, &child) in children.iter().enumerate() {
if let Ok((mut visibility, _)) = query_item.get_mut(child) { if let Ok((mut visibility, _)) = query_item.get_mut(child) {
if matches!(*visibility, Visibility::Visible) { if matches!(*visibility, Visibility::Visible) {
visible_index = Some(i); visible_index = Some(i);
visible_child = Some(child);
*visibility = Visibility::Hidden; *visibility = Visibility::Hidden;
break; break;
} }
@@ -118,7 +92,6 @@ pub fn tile_update(
if let Some(&next_child) = children.get(next_index) { if let Some(&next_child) = children.get(next_index) {
if let Ok((mut visibility, _)) = query_item.get_mut(next_child) { if let Ok((mut visibility, _)) = query_item.get_mut(next_child) {
*visibility = Visibility::Visible; *visibility = Visibility::Visible;
// println!("{}",next_index.to_string());
} }
} }
} }
+9
View File
@@ -0,0 +1,9 @@
use bevy::prelude::*;
pub enum Tiles{
air,
grass,
dirt,
rock,
}
// BUNDLES!!