From c315c206f4852f1308e43c80fc5400ebdfcd8f5e Mon Sep 17 00:00:00 2001 From: Amatsugu Date: Wed, 6 Nov 2024 22:42:01 -0500 Subject: [PATCH] Cleanup --- .vscode/launch.json | 19 ++++++++++++------- .../src/generators/mesh_generator.rs | 3 +-- .../src/generators/packed_mesh_generator.rs | 2 +- engine/world_generation/src/heightmap.rs | 2 +- engine/world_generation/src/hex_utils.rs | 1 - engine/world_generation/src/map/chunk.rs | 1 - engine/world_generation/src/map/config.rs | 1 - engine/world_generation/src/map/map.rs | 1 - engine/world_generation/src/map/map_utils.rs | 4 ++-- game/buildings/src/build_queue.rs | 1 - 10 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 53fd94b..fcd08b1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -14,12 +14,17 @@ "args": [], "cwd": "${workspaceRoot}/game/main", "preLaunchTask": "Build", - // "environment": [ - // { - // "name": "RUST_BACKTRACE", - // "value": "1" - // } - // ] + "environment": [ + // { + // "name": "RUST_BACKTRACE", + // "value": "1" + // }, + { + //Set Asset Folder + "name": "CARGO_MANIFEST_DIR", + "value": "${workspaceRoot}\\game\\main" + } + ] } ] -} \ No newline at end of file +} diff --git a/engine/world_generation/src/generators/mesh_generator.rs b/engine/world_generation/src/generators/mesh_generator.rs index c86e72c..2ac4f79 100644 --- a/engine/world_generation/src/generators/mesh_generator.rs +++ b/engine/world_generation/src/generators/mesh_generator.rs @@ -1,8 +1,7 @@ -use crate::hex_utils::{HexCoord, INNER_RADIUS}; +use crate::hex_utils::HexCoord; use crate::{hex_utils::offset3d_to_world, prelude::*}; #[cfg(feature = "tracing")] use bevy::log::*; -use bevy::math::VectorSpace; use bevy::{ prelude::*, render::{ diff --git a/engine/world_generation/src/generators/packed_mesh_generator.rs b/engine/world_generation/src/generators/packed_mesh_generator.rs index c32b085..df3c141 100644 --- a/engine/world_generation/src/generators/packed_mesh_generator.rs +++ b/engine/world_generation/src/generators/packed_mesh_generator.rs @@ -1,5 +1,5 @@ use crate::hex_utils::HexCoord; -use crate::map::biome_map::{self, BiomeChunk, BiomeMap}; +use crate::map::biome_map::BiomeChunk; use crate::prelude::*; use crate::tile_manager::TileAsset; use crate::tile_mapper::TileMapperAsset; diff --git a/engine/world_generation/src/heightmap.rs b/engine/world_generation/src/heightmap.rs index f115414..a09b2ac 100644 --- a/engine/world_generation/src/heightmap.rs +++ b/engine/world_generation/src/heightmap.rs @@ -8,7 +8,7 @@ use rayon::iter::{IntoParallelIterator, ParallelIterator}; use crate::biome_painter::BiomePainter; use crate::map::biome_map::{BiomeChunk, BiomeData, BiomeMap}; -use crate::{map, prelude::*}; +use crate::prelude::*; pub fn generate_heightmap(cfg: &GenerationConfig, seed: u32, painter: &BiomePainter) -> (Map, BiomeMap) { let biomes = generate_biomes(cfg, seed, painter); diff --git a/engine/world_generation/src/hex_utils.rs b/engine/world_generation/src/hex_utils.rs index c7fbb75..510a60f 100644 --- a/engine/world_generation/src/hex_utils.rs +++ b/engine/world_generation/src/hex_utils.rs @@ -1,4 +1,3 @@ -use num::{PrimInt, Saturating}; use std::fmt::Display; use crate::prelude::Chunk; diff --git a/engine/world_generation/src/map/chunk.rs b/engine/world_generation/src/map/chunk.rs index f83d185..893a4fb 100644 --- a/engine/world_generation/src/map/chunk.rs +++ b/engine/world_generation/src/map/chunk.rs @@ -1,7 +1,6 @@ use crate::hex_utils::SHORT_DIAGONAL; use bevy::prelude::*; -use super::biome_map::BiomeData; #[derive(Clone)] pub struct Chunk { diff --git a/engine/world_generation/src/map/config.rs b/engine/world_generation/src/map/config.rs index 2bd3d2a..766c8e9 100644 --- a/engine/world_generation/src/map/config.rs +++ b/engine/world_generation/src/map/config.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use bevy_asset_loader::asset_collection::AssetCollection; use bevy_inspector_egui::InspectorOptions; use serde::{Deserialize, Serialize}; diff --git a/engine/world_generation/src/map/map.rs b/engine/world_generation/src/map/map.rs index 99d189b..04c7844 100644 --- a/engine/world_generation/src/map/map.rs +++ b/engine/world_generation/src/map/map.rs @@ -3,7 +3,6 @@ use bevy::prelude::*; use crate::hex_utils::*; use super::{ - biome_map::{BiomeData, BiomeMap}, chunk::Chunk, mesh_chunk::MeshChunkData, }; diff --git a/engine/world_generation/src/map/map_utils.rs b/engine/world_generation/src/map/map_utils.rs index 05b6672..5f85cc9 100644 --- a/engine/world_generation/src/map/map_utils.rs +++ b/engine/world_generation/src/map/map_utils.rs @@ -4,10 +4,10 @@ use bevy::{math::VectorSpace, prelude::*}; use image::ImageBuffer; use rayon::prelude::*; -use crate::{biome_painter::BiomePainter, hex_utils::HexCoord}; +use crate::hex_utils::HexCoord; use super::{ - biome_map::{self, BiomeMap}, + biome_map::BiomeMap, chunk::Chunk, map::Map, }; diff --git a/game/buildings/src/build_queue.rs b/game/buildings/src/build_queue.rs index 934c2ee..6e69514 100644 --- a/game/buildings/src/build_queue.rs +++ b/game/buildings/src/build_queue.rs @@ -1,4 +1,3 @@ -use std::path::Display; use bevy::prelude::Resource; use shared::building::BuildingIdentifier;