From fdaa4207791c93e478ed20682e6722163a1c464d Mon Sep 17 00:00:00 2001 From: hheik <4469778+hheik@users.noreply.github.com> Date: Mon, 12 Dec 2022 18:57:19 +0200 Subject: [PATCH] formatting --- src/game.rs | 2 +- src/terrain2d.rs | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/game.rs b/src/game.rs index 8d88a5b..776bf90 100644 --- a/src/game.rs +++ b/src/game.rs @@ -4,7 +4,7 @@ use bevy_prototype_debug_lines::DebugLinesPlugin; use bevy_rapier2d::prelude::*; use crate::{ - terrain2d::{Chunk2D, Terrain2D, Terrain2DPlugin, TerrainGen2D}, + terrain2d::{Terrain2D, Terrain2DPlugin, TerrainGen2D}, util::Vector2I, }; diff --git a/src/terrain2d.rs b/src/terrain2d.rs index b5d4759..95b4c1a 100644 --- a/src/terrain2d.rs +++ b/src/terrain2d.rs @@ -3,17 +3,13 @@ use std::collections::{ HashMap, }; -use bevy::{ - prelude::*, - render::{camera::RenderTarget}, -}; +use bevy::{prelude::*, render::camera::RenderTarget}; use bevy_prototype_debug_lines::DebugLines; mod chunk2d; mod terrain_gen2d; mod texel2d; -use bevy_rapier2d::prelude::*; pub use chunk2d::*; pub use terrain_gen2d::*; pub use texel2d::*; @@ -30,21 +26,26 @@ impl Plugin for Terrain2DPlugin { app.register_type::() .insert_resource(Terrain2D::new()) .add_event::() - .add_system(debug_painter) .add_system_to_stage( CoreStage::PostUpdate, dirty_rect_visualizer.before(emit_terrain_events), ) - // DEBUG: .add_system_to_stage(CoreStage::First, first_log) .add_system_to_stage(CoreStage::Last, last_log) - - .add_system_to_stage(CoreStage::PostUpdate, chunk_spawner.before(emit_terrain_events)) - .add_system_to_stage(CoreStage::PostUpdate, chunk_sprite_sync.after(chunk_spawner)) - .add_system_to_stage(CoreStage::PostUpdate, chunk_collision_sync.after(chunk_spawner)) - + .add_system_to_stage( + CoreStage::PostUpdate, + chunk_spawner.before(emit_terrain_events), + ) + .add_system_to_stage( + CoreStage::PostUpdate, + chunk_sprite_sync.after(chunk_spawner), + ) + .add_system_to_stage( + CoreStage::PostUpdate, + chunk_collision_sync.after(chunk_spawner), + ) .add_system_to_stage(CoreStage::PostUpdate, emit_terrain_events); } } @@ -58,13 +59,10 @@ fn first_log() { fn last_log( chunk_query: Query<(Entity, &TerrainChunk2D)>, child_query: Query<&Children>, - collider_query: Query<&Collider>, mut commands: Commands, ) { println!("> end"); for (entity, chunk) in chunk_query.iter() { - // if chunk.index == Vector2I::new(8, 1) { - // } println!("chunk! {entity:?} {:?}", chunk.index); for children in child_query.get(entity).iter() { for child in children.iter() {