popertots/dorf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove bad tilemap. mouse experiment

Browse Source
This commit is contained in:
popertots
2024-12-13 20:47:12 +00:00
parent 70cce2c5e9
commit 89567d4ce7
4 changed files with 110 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game.rs
+65 -74
View File
@@ -6,16 +6,11 @@ use rand::prelude::*;
pub const PIXEL_RATIO: f32 = 4.0;
#[derive(Resource)]
pub struct TileMap {
pub tiles: Vec<Vec<Vec<Entity>>>,
}
pub fn setup_level(mut commands: Commands, asset_server: Res<AssetServer>) {
setup_tilemap(&mut commands, &asset_server);
pub fn setup_level(mut commands: Commands, asset_server: Res<AssetServer>, mut tilemap: ResMut<TileMap>) {
setup_tilemap(&mut commands, &asset_server, tilemap);
for x in 0..25 {
for y in 0..250 {
for x in -50..50 {
for y in -25..25 {
if random::<f32>() < 0.1 {
commands.spawn(Citizen::new(
&asset_server,
@@ -26,84 +21,80 @@ pub fn setup_level(mut commands: Commands, asset_server: Res<AssetServer>, mut t
}
}
fn setup_tilemap(commands: &mut Commands, asset_server: &Res<AssetServer>, mut tilemap: ResMut<TileMap>) {
for x in 0..25 {
let mut row:Vec<Vec<Entity>> = Vec::new();
for y in 0..25 {
let mut column:Vec<Entity> = Vec::new();
fn setup_tilemap(commands: &mut Commands, asset_server: &Res<AssetServer>) {
for x in -50..50 {
for y in -25..25 {
for z in 0..4 {
let position = Vec3::new(
x as f32 * 16. * PIXEL_RATIO,
y as f32 * 16. * PIXEL_RATIO,
-z as f32,
);
let mut noitem: bool = false;
let tile_entity: Entity;
if random::<f32>() < 0.4 {
tile_entity = commands
.spawn(TilePrefab::grass(position, asset_server))
.id();
} else if random::<f32>() < 0.2 {
tile_entity = commands
.spawn(TilePrefab::dirt(position, asset_server))
.id();
} else if random::<f32>() < 0.1 {
tile_entity = commands
.spawn(TilePrefab::rock(position, asset_server))
.id();
} else {
tile_entity = commands.spawn(TilePrefab::air(position, asset_server)).id();
noitem = true;
};
let mut items: Vec<ItemBundle> = vec![];
if !noitem {
if random::<f32>() < 0.1 {
items.push(ItemBundle {
transform: Transform::from_translation(Vec3::new(0., 0., 0.1)),
sprite: Sprite {
image: asset_server.load("beer.png"),
..Default::default()
},
item: Item::new(),
visibility: Visibility::Visible,
});
}
if random::<f32>() < 0.1 {
items.push(ItemBundle {
transform: Transform::from_translation(Vec3::new(0., 0., 0.1)),
sprite: Sprite {
image: asset_server.load("chalice.png"),
..Default::default()
},
item: Item::new(),
visibility: Visibility::Visible,
});
}
if random::<f32>() < 0.1 {
items.push(ItemBundle {
transform: Transform::from_translation(Vec3::new(0., 0., 0.1)),
sprite: Sprite {
image: asset_server.load("fish.png"),
..Default::default()
},
item: Item::new(),
visibility: Visibility::Visible,
});
}
if random::<f32>() < 0.1 {
items.push(ItemBundle {
transform: Transform::from_translation(Vec3::new(0., 0., 0.1)),
sprite: Sprite {
image: asset_server.load("beer.png"),
..Default::default()
},
item: Item::new(),
visibility: Visibility::Visible,
});
}
if random::<f32>() < 0.1 {
items.push(ItemBundle {
transform: Transform::from_translation(Vec3::new(0., 0., 0.1)),
sprite: Sprite {
image: asset_server.load("chalice.png"),
..Default::default()
},
item: Item::new(),
visibility: Visibility::Visible,
});
}
if random::<f32>() < 0.1 {
items.push(ItemBundle {
transform: Transform::from_translation(Vec3::new(0., 0., 0.1)),
sprite: Sprite {
image: asset_server.load("fish.png"),
..Default::default()
},
item: Item::new(),
visibility: Visibility::Visible,
});
}
let mut child_entities = Vec::new();
for item in items {
child_entities.push(commands.spawn(item).id());
if random::<f32>() < 0.7 {
commands
.spawn(TilePrefab::grass(position, asset_server))
.with_children(|parent| {
for item in items {
parent.spawn(item);
}
});
} else if random::<f32>() < 0.2 {
commands
.spawn(TilePrefab::dirt(position, asset_server))
.with_children(|parent| {
for item in items {
parent.spawn(item);
}
});
} else if random::<f32>() < 0.1 {
commands
.spawn(TilePrefab::rock(position, asset_server))
.with_children(|parent| {
for item in items {
parent.spawn(item);
}
});
} else {
commands.spawn(TilePrefab::air(position, asset_server));
}
commands.entity(tile_entity).add_children(&child_entities);
column.push(tile_entity);
}
row.push(column);
}
tilemap.tiles.push(row);
}
}
src/main.rs
+44 -12
View File
@@ -1,12 +1,15 @@
use bevy::prelude::*;
mod game;
mod citizen;
mod camera;
mod citizen;
mod game;
mod item;
mod tile;
mod tiles;
use bevy::color::palettes::basic::WHITE;
use game::PIXEL_RATIO;
fn main() {
App::new()
.add_plugins(
@@ -21,14 +24,43 @@ fn main() {
.set(ImagePlugin::default_nearest()),
)
.insert_resource(ClearColor(Color::srgb(0.1, 0.1, 0.15)))
.add_systems(Startup, (
game::setup_level,
camera::spawn_panning_camera,
))
.add_systems(FixedUpdate, (
camera::camera_movement,
citizen::citizen_movement,
tile::tile_sprite_update,
))
.add_systems(Startup, (game::setup_level, camera::spawn_panning_camera))
.add_systems(
FixedUpdate,
(
camera::camera_movement,
citizen::citizen_movement,
tile::tile_sprite_update,
),
)
.add_systems(FixedUpdate, draw_cursor)
.run();
}
}
fn draw_cursor(
camera_query: Single<(&Camera, &GlobalTransform)>,
windows: Query<&Window>,
mut gizmos: Gizmos,
) {
let (camera, camera_transform) = *camera_query;
let Ok(window) = windows.get_single() else {
return;
};
let Some(cursor_position) = window.cursor_position() else {
return;
};
// Calculate a world position based on the cursor's position.
let Ok(point) = camera.viewport_to_world_2d(camera_transform, cursor_position) else {
return;
};
println!(
"pos: {}, {}",
(point.x / (16. * PIXEL_RATIO)) as i32,
(point.y / (16. * PIXEL_RATIO)) as i32
);
gizmos.circle_2d(point, 10., WHITE);
}
src/tile.rs
-8
View File
@@ -15,14 +15,6 @@ impl Default for Tile {
}
}
impl Tile {
pub fn new(position: Vec3) -> Self {
Self {
position,
}
}
}
#[derive(Component)]
#[require(Tile)]
pub struct FloorTile {
src/tiles.rs
+1 -11
View File
@@ -1,17 +1,7 @@
use bevy::prelude::*;
use crate::tile::{Tile, TileState};
use crate::game::PIXEL_RATIO;
#[derive(Component)]
#[require(Sprite)]
pub struct Tile {
pub position: Vec3,
}
#[derive(Component)]
pub struct TileState {
pub timer: Timer,
}
#[derive(Bundle)]
pub struct TilePrefab {
transform: Transform,