modzero/monstrous
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix this

Browse Source
This commit is contained in:
Gender Shrapnel 2022-12-04 17:12:37 +01:00
parent f12412ff14
commit e04e620930
Signed by: modzero
GPG Key ID: 4E11A06C6D1E5213
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -7,8 +7,8 @@ license = "AGPL-3.0-or-later"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
bevy = "0.9.0" bevy = "0.9"
bevy_ecs_tilemap = "0.9.0" bevy_ecs_tilemap = "0.9"
rand = "0.8.5" rand = "0.8.5"
ron = "0.8.0" ron = "0.8.0"
serde = { version = "1.0.143", features = ["derive"] } serde = { version = "1.0.143", features = ["derive"] }

32
src/main.rs
View File

@ -5,7 +5,6 @@ use bevy::{
diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin}, diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
input::mouse::MouseMotion, input::mouse::MouseMotion,
prelude::*, prelude::*,
render::texture::ImageSettings,
}; };
use bevy_ecs_tilemap::prelude::*; use bevy_ecs_tilemap::prelude::*;
use rand::{thread_rng, Rng}; use rand::{thread_rng, Rng};
@ -19,18 +18,17 @@ fn make_ground_layer(
tile_size: TilemapTileSize, tile_size: TilemapTileSize,
) { ) {
let mut tile_storage = TileStorage::empty(tilemap_size); let mut tile_storage = TileStorage::empty(tilemap_size);
let tilemap_entity = commands.spawn().id(); let tilemap_entity = commands.spawn_empty().id();
let mut random = thread_rng(); let mut random = thread_rng();
for x in 0..tilemap_size.x { for x in 0..tilemap_size.x {
for y in 0..tilemap_size.y { for y in 0..tilemap_size.y {
let tile_pos = TilePos { x, y }; let tile_pos = TilePos { x, y };
let tile_entity = commands let tile_entity = commands
.spawn() .spawn(TileBundle {
.insert_bundle(TileBundle {
position: tile_pos, position: tile_pos,
tilemap_id: TilemapId(tilemap_entity), tilemap_id: TilemapId(tilemap_entity),
texture: TileTexture(random.gen_range(13..=19)), texture_index: TileTextureIndex(random.gen_range(13..=19)),
..Default::default() ..Default::default()
}) })
.id(); .id();
@ -39,26 +37,24 @@ fn make_ground_layer(
} }
let grid_size = tile_size.into(); let grid_size = tile_size.into();
let map_type = TilemapType::default();
commands commands
.entity(tilemap_entity) .entity(tilemap_entity)
.insert_bundle(TilemapBundle { .insert(TilemapBundle {
grid_size, grid_size,
map_type,
size: tilemap_size, size: tilemap_size,
storage: tile_storage.clone(), storage: tile_storage.clone(),
texture: TilemapTexture::Single(texture_handle), texture: TilemapTexture::Single(texture_handle),
tile_size, tile_size,
transform: get_tilemap_center_transform( transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
&tilemap_size,
&grid_size,
0.0,
),
..Default::default() ..Default::default()
}); });
} }
fn startup(mut commands: Commands, asset_server: Res<AssetServer>) { fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn_bundle(Camera2dBundle::default()); commands.spawn(Camera2dBundle::default());
let texture_handle = asset_server.load("tileset.png"); let texture_handle = asset_server.load("tileset.png");
@ -90,14 +86,18 @@ fn mouse_motion(
fn main() { fn main() {
App::new() App::new()
.insert_resource(WindowDescriptor { .add_plugins(DefaultPlugins
.set(WindowPlugin {
window: WindowDescriptor {
width: 1270.0, width: 1270.0,
height: 720.0, height:720.0,
title: String::from("Monstrous"), title: String::from("Monstrous"),
..Default::default() ..Default::default()
},
..default()
}) })
.insert_resource(ImageSettings::default_nearest()) .set(ImagePlugin::default_nearest()),
.add_plugins(DefaultPlugins) )
.add_plugin(LogDiagnosticsPlugin::default()) .add_plugin(LogDiagnosticsPlugin::default())
.add_plugin(FrameTimeDiagnosticsPlugin::default()) .add_plugin(FrameTimeDiagnosticsPlugin::default())
.add_plugin(TilemapPlugin) .add_plugin(TilemapPlugin)