hheik
/
kuilu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting

fix/collision-refresh
hheik 2022-12-12 18:57:19 +02:00
parent 1135766cac
commit fdaa420779
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game.rs
View File

@ -4,7 +4,7 @@ use bevy_prototype_debug_lines::DebugLinesPlugin;
use bevy_rapier2d::prelude::*; use bevy_rapier2d::prelude::*;
use crate::{ use crate::{
terrain2d::{Chunk2D, Terrain2D, Terrain2DPlugin, TerrainGen2D}, terrain2d::{Terrain2D, Terrain2DPlugin, TerrainGen2D},
util::Vector2I, util::Vector2I,
}; };

28
src/terrain2d.rs
View File

@ -3,17 +3,13 @@ use std::collections::{
HashMap, HashMap,
}; };
use bevy::{ use bevy::{prelude::*, render::camera::RenderTarget};
prelude::*,
render::{camera::RenderTarget},
};
use bevy_prototype_debug_lines::DebugLines; use bevy_prototype_debug_lines::DebugLines;
mod chunk2d; mod chunk2d;
mod terrain_gen2d; mod terrain_gen2d;
mod texel2d; mod texel2d;
use bevy_rapier2d::prelude::*;
pub use chunk2d::*; pub use chunk2d::*;
pub use terrain_gen2d::*; pub use terrain_gen2d::*;
pub use texel2d::*; pub use texel2d::*;
@ -30,21 +26,26 @@ impl Plugin for Terrain2DPlugin {
app.register_type::<TerrainChunk2D>() app.register_type::<TerrainChunk2D>()
.insert_resource(Terrain2D::new()) .insert_resource(Terrain2D::new())
.add_event::<TerrainEvent2D>() .add_event::<TerrainEvent2D>()
.add_system(debug_painter) .add_system(debug_painter)
.add_system_to_stage( .add_system_to_stage(
CoreStage::PostUpdate, CoreStage::PostUpdate,
dirty_rect_visualizer.before(emit_terrain_events), dirty_rect_visualizer.before(emit_terrain_events),
) )
// DEBUG: // DEBUG:
.add_system_to_stage(CoreStage::First, first_log) .add_system_to_stage(CoreStage::First, first_log)
.add_system_to_stage(CoreStage::Last, last_log) .add_system_to_stage(CoreStage::Last, last_log)
.add_system_to_stage(
.add_system_to_stage(CoreStage::PostUpdate, chunk_spawner.before(emit_terrain_events)) CoreStage::PostUpdate,
.add_system_to_stage(CoreStage::PostUpdate, chunk_sprite_sync.after(chunk_spawner)) chunk_spawner.before(emit_terrain_events),
.add_system_to_stage(CoreStage::PostUpdate, chunk_collision_sync.after(chunk_spawner)) )
.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); .add_system_to_stage(CoreStage::PostUpdate, emit_terrain_events);
} }
} }
@ -58,13 +59,10 @@ fn first_log() {
fn last_log( fn last_log(
chunk_query: Query<(Entity, &TerrainChunk2D)>, chunk_query: Query<(Entity, &TerrainChunk2D)>,
child_query: Query<&Children>, child_query: Query<&Children>,
collider_query: Query<&Collider>,
mut commands: Commands, mut commands: Commands,
) { ) {
println!("> end"); println!("> end");
for (entity, chunk) in chunk_query.iter() { for (entity, chunk) in chunk_query.iter() {
// if chunk.index == Vector2I::new(8, 1) {
// }
println!("chunk! {entity:?} {:?}", chunk.index); println!("chunk! {entity:?} {:?}", chunk.index);
for children in child_query.get(entity).iter() { for children in child_query.get(entity).iter() {
for child in children.iter() { for child in children.iter() {