From f23acd41e0341909200437bfb6487cbe9ca58a53 Mon Sep 17 00:00:00 2001 From: Alexey Volkov Date: Tue, 27 Sep 2022 21:26:45 +0300 Subject: [PATCH] refactor: move broadphase-related functionality into separate subdir (#1943) A variant of refactoring mentioned here #1894 (comment) Sweep broadphase have no any additional specific classes, it's based only on core classes. So it is discussion question, do we need to keep int in separate folder (to avoid mixing with core broadphase.dart file) or just leave it in the root folder 'broadphase'. --- packages/flame/lib/collisions.dart | 12 ++++++------ .../src/collisions/{ => broadphase}/broadphase.dart | 0 .../quadtree/has_quadtree_collision_detection.dart | 0 .../quadtree/quad_tree_broadphase.dart} | 0 .../{ => broadphase}/quadtree/quadtree.dart | 0 .../quadtree/quadtree_collision_detection.dart | 0 .../src/collisions/{ => broadphase/sweep}/sweep.dart | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename packages/flame/lib/src/collisions/{ => broadphase}/broadphase.dart (100%) rename packages/flame/lib/src/collisions/{ => broadphase}/quadtree/has_quadtree_collision_detection.dart (100%) rename packages/flame/lib/src/collisions/{quadtree/broadphase.dart => broadphase/quadtree/quad_tree_broadphase.dart} (100%) rename packages/flame/lib/src/collisions/{ => broadphase}/quadtree/quadtree.dart (100%) rename packages/flame/lib/src/collisions/{ => broadphase}/quadtree/quadtree_collision_detection.dart (100%) rename packages/flame/lib/src/collisions/{ => broadphase/sweep}/sweep.dart (100%) diff --git a/packages/flame/lib/collisions.dart b/packages/flame/lib/collisions.dart index 2f5abe662..69b74964e 100644 --- a/packages/flame/lib/collisions.dart +++ b/packages/flame/lib/collisions.dart @@ -1,4 +1,9 @@ -export 'src/collisions/broadphase.dart'; +export 'src/collisions/broadphase/broadphase.dart'; +export 'src/collisions/broadphase/quadtree/has_quadtree_collision_detection.dart'; +export 'src/collisions/broadphase/quadtree/quad_tree_broadphase.dart'; +export 'src/collisions/broadphase/quadtree/quadtree.dart'; +export 'src/collisions/broadphase/quadtree/quadtree_collision_detection.dart'; +export 'src/collisions/broadphase/sweep/sweep.dart'; export 'src/collisions/collision_callbacks.dart'; export 'src/collisions/collision_detection.dart'; export 'src/collisions/collision_passthrough.dart'; @@ -9,10 +14,5 @@ export 'src/collisions/hitboxes/polygon_hitbox.dart'; export 'src/collisions/hitboxes/rectangle_hitbox.dart'; export 'src/collisions/hitboxes/screen_hitbox.dart'; export 'src/collisions/hitboxes/shape_hitbox.dart'; -export 'src/collisions/quadtree/broadphase.dart'; -export 'src/collisions/quadtree/has_quadtree_collision_detection.dart'; -export 'src/collisions/quadtree/quadtree.dart'; -export 'src/collisions/quadtree/quadtree_collision_detection.dart'; export 'src/collisions/standard_collision_detection.dart'; -export 'src/collisions/sweep.dart'; export 'src/experimental/raycast_result.dart'; diff --git a/packages/flame/lib/src/collisions/broadphase.dart b/packages/flame/lib/src/collisions/broadphase/broadphase.dart similarity index 100% rename from packages/flame/lib/src/collisions/broadphase.dart rename to packages/flame/lib/src/collisions/broadphase/broadphase.dart diff --git a/packages/flame/lib/src/collisions/quadtree/has_quadtree_collision_detection.dart b/packages/flame/lib/src/collisions/broadphase/quadtree/has_quadtree_collision_detection.dart similarity index 100% rename from packages/flame/lib/src/collisions/quadtree/has_quadtree_collision_detection.dart rename to packages/flame/lib/src/collisions/broadphase/quadtree/has_quadtree_collision_detection.dart diff --git a/packages/flame/lib/src/collisions/quadtree/broadphase.dart b/packages/flame/lib/src/collisions/broadphase/quadtree/quad_tree_broadphase.dart similarity index 100% rename from packages/flame/lib/src/collisions/quadtree/broadphase.dart rename to packages/flame/lib/src/collisions/broadphase/quadtree/quad_tree_broadphase.dart diff --git a/packages/flame/lib/src/collisions/quadtree/quadtree.dart b/packages/flame/lib/src/collisions/broadphase/quadtree/quadtree.dart similarity index 100% rename from packages/flame/lib/src/collisions/quadtree/quadtree.dart rename to packages/flame/lib/src/collisions/broadphase/quadtree/quadtree.dart diff --git a/packages/flame/lib/src/collisions/quadtree/quadtree_collision_detection.dart b/packages/flame/lib/src/collisions/broadphase/quadtree/quadtree_collision_detection.dart similarity index 100% rename from packages/flame/lib/src/collisions/quadtree/quadtree_collision_detection.dart rename to packages/flame/lib/src/collisions/broadphase/quadtree/quadtree_collision_detection.dart diff --git a/packages/flame/lib/src/collisions/sweep.dart b/packages/flame/lib/src/collisions/broadphase/sweep/sweep.dart similarity index 100% rename from packages/flame/lib/src/collisions/sweep.dart rename to packages/flame/lib/src/collisions/broadphase/sweep/sweep.dart