Skip to content

Commit

Permalink
Format code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@StarArawn
StarArawn committed Nov 13, 2022
1 parent 37d09c5 commit 77177a9
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 93 deletions.
4 changes: 2 additions & 2 deletions examples/texture_container.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ mod helpers;

#[cfg(not(feature = "atlas"))]
mod no_atlas {
use super::helpers;
use bevy::prelude::*;
use bevy_ecs_tilemap::helpers::hex_grid::axial::AxialPos;
use bevy_ecs_tilemap::prelude::*;
use rand::prelude::SliceRandom;
use rand::thread_rng;
use super::helpers;
const MAP_RADIUS: u32 = 10;
const MAP_DIAMETER: u32 = 2 * MAP_RADIUS + 1;
const MAP_CENTER: TilePos = TilePos {
Expand Down Expand Up @@ -117,4 +117,4 @@ fn main() {

#[cfg(not(feature = "atlas"))]
no_atlas::main();
}
}
182 changes: 91 additions & 91 deletions examples/texture_vec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,106 +2,106 @@ mod helpers;

#[cfg(not(feature = "atlas"))]
mod no_atlas {
use bevy::prelude::*;
use bevy_ecs_tilemap::helpers::hex_grid::axial::AxialPos;
use bevy_ecs_tilemap::prelude::*;
use rand::prelude::SliceRandom;
use rand::thread_rng;
use super::helpers;
use super::helpers;
use bevy::prelude::*;
use bevy_ecs_tilemap::helpers::hex_grid::axial::AxialPos;
use bevy_ecs_tilemap::prelude::*;
use rand::prelude::SliceRandom;
use rand::thread_rng;

const MAP_RADIUS: u32 = 10;
const MAP_DIAMETER: u32 = 2 * MAP_RADIUS + 1;
const MAP_CENTER: TilePos = TilePos {
x: MAP_RADIUS + 1,
y: MAP_RADIUS + 1,
};
const TILE_SIZE: TilemapTileSize = TilemapTileSize { x: 48.0, y: 54.0 };
const COORD_SYS: HexCoordSystem = HexCoordSystem::Row;
const MAP_RADIUS: u32 = 10;
const MAP_DIAMETER: u32 = 2 * MAP_RADIUS + 1;
const MAP_CENTER: TilePos = TilePos {
x: MAP_RADIUS + 1,
y: MAP_RADIUS + 1,
};
const TILE_SIZE: TilemapTileSize = TilemapTileSize { x: 48.0, y: 54.0 };
const COORD_SYS: HexCoordSystem = HexCoordSystem::Row;

fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default());
fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default());

let image_handles = vec![
asset_server.load("hex-tile-0.png"),
asset_server.load("hex-tile-1.png"),
asset_server.load("hex-tile-2.png"),
];
let texture_vec = TilemapTexture::Vector(image_handles);
let image_handles = vec![
asset_server.load("hex-tile-0.png"),
asset_server.load("hex-tile-1.png"),
asset_server.load("hex-tile-2.png"),
];
let texture_vec = TilemapTexture::Vector(image_handles);

let map_size = TilemapSize {
x: MAP_DIAMETER,
y: MAP_DIAMETER,
};
let map_size = TilemapSize {
x: MAP_DIAMETER,
y: MAP_DIAMETER,
};

let mut tile_storage = TileStorage::empty(map_size);
let tilemap_entity = commands.spawn_empty().id();
let tilemap_id = TilemapId(tilemap_entity);
let mut tile_storage = TileStorage::empty(map_size);
let tilemap_entity = commands.spawn_empty().id();
let tilemap_id = TilemapId(tilemap_entity);

let tile_positions = generate_hexagon(
AxialPos::from_tile_pos_given_coord_system(&MAP_CENTER, COORD_SYS),
MAP_RADIUS,
)
.into_iter()
.map(|axial_pos| axial_pos.as_tile_pos_given_coord_system(COORD_SYS));
let tile_positions = generate_hexagon(
AxialPos::from_tile_pos_given_coord_system(&MAP_CENTER, COORD_SYS),
MAP_RADIUS,
)
.into_iter()
.map(|axial_pos| axial_pos.as_tile_pos_given_coord_system(COORD_SYS));

let mut rng = thread_rng();
let weighted_tile_choices = [
(TileTextureIndex(0), 0.8),
(TileTextureIndex(1), 0.1),
(TileTextureIndex(2), 0.1),
];
for position in tile_positions {
let texture = weighted_tile_choices
.choose_weighted(&mut rng, |choice| choice.1)
.unwrap()
.0;
let tile_entity = commands
.spawn_empty()
.insert(TileBundle {
position,
tilemap_id,
texture_index: texture,
..Default::default()
})
.id();
tile_storage.set(&position, tile_entity);
}
let mut rng = thread_rng();
let weighted_tile_choices = [
(TileTextureIndex(0), 0.8),
(TileTextureIndex(1), 0.1),
(TileTextureIndex(2), 0.1),
];
for position in tile_positions {
let texture = weighted_tile_choices
.choose_weighted(&mut rng, |choice| choice.1)
.unwrap()
.0;
let tile_entity = commands
.spawn_empty()
.insert(TileBundle {
position,
tilemap_id,
texture_index: texture,
..Default::default()
})
.id();
tile_storage.set(&position, tile_entity);
}

let tile_size = TILE_SIZE;
let grid_size = TILE_SIZE.into();
let map_type = TilemapType::Hexagon(COORD_SYS);
let tile_size = TILE_SIZE;
let grid_size = TILE_SIZE.into();
let map_type = TilemapType::Hexagon(COORD_SYS);

commands.entity(tilemap_entity).insert(TilemapBundle {
grid_size,
map_type,
tile_size,
size: map_size,
storage: tile_storage,
texture: texture_vec,
transform: get_tilemap_center_transform(&map_size, &grid_size, &map_type, 0.0),
..Default::default()
});
}
commands.entity(tilemap_entity).insert(TilemapBundle {
grid_size,
map_type,
tile_size,
size: map_size,
storage: tile_storage,
texture: texture_vec,
transform: get_tilemap_center_transform(&map_size, &grid_size, &map_type, 0.0),
..Default::default()
});
}

pub fn main() {
App::new()
.add_plugins(
DefaultPlugins
.set(WindowPlugin {
window: WindowDescriptor {
width: 1270.0,
height: 720.0,
title: String::from("Using TilemapTexture::Vector"),
..Default::default()
},
..default()
})
.set(ImagePlugin::default_nearest()),
)
.add_plugin(TilemapPlugin)
.add_startup_system(startup)
.add_system(helpers::camera::movement)
.run();
pub fn main() {
App::new()
.add_plugins(
DefaultPlugins
.set(WindowPlugin {
window: WindowDescriptor {
width: 1270.0,
height: 720.0,
title: String::from("Using TilemapTexture::Vector"),
..Default::default()
},
..default()
})
.set(ImagePlugin::default_nearest()),
)
.add_plugin(TilemapPlugin)
.add_startup_system(startup)
.add_system(helpers::camera::movement)
.run();
}
}

Expand All @@ -111,4 +111,4 @@ fn main() {

#[cfg(not(feature = "atlas"))]
no_atlas::main();
}
}

0 comments on commit 77177a9

Please sign in to comment.