Added collision layers to Config.h

1 files changed, 25 insertions, 13 deletions

diff --git a/game/background/StartSubScene.cpp b/game/background/StartSubScene.cpp
index c769a5f..a918c05 100644
--- a/game/background/StartSubScene.cpp
+++ b/game/background/StartSubScene.cpp
@@ -168,7 +168,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 500,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_1_rb.active = false;
 	frag_1.add_component<CircleCollider>(25);
@@ -189,7 +190,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 400,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_2_rb.active = false;
 	frag_2.add_component<CircleCollider>(55);
@@ -210,7 +212,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 300,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_3_rb.active = false;
 	frag_3.add_component<CircleCollider>(35);
@@ -231,7 +234,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 200,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_4_rb.active = false;
 	frag_4.add_component<CircleCollider>(60);
@@ -252,7 +256,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 100,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_5_rb.active = false;
 	frag_5.add_component<CircleCollider>(5);
@@ -273,7 +278,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 100,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_6_rb.active = false;
 	frag_6.add_component<CircleCollider>(30);
@@ -294,7 +300,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 800,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_7_rb.active = false;
 	frag_7.add_component<CircleCollider>(45);
@@ -315,7 +322,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 500,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_8_rb.active = false;
 	frag_8.add_component<CircleCollider>(25);
@@ -336,7 +344,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 500,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_9_rb.active = false;
 	frag_9.add_component<CircleCollider>(15);
@@ -357,12 +366,13 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 300,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_10_rb.active = false;
 	frag_10.add_component<CircleCollider>(60);
 
-	GameObject frag_11 = scn.new_object("frag_11", "wall_fragment", vec2(begin_x, 90));
+	GameObject frag_11 = scn.new_object("frag_11", "wall_fragment", vec2(begin_x, 70));
 	Asset frag_11_asset{"asset/background/start/StartWall_frag11.png"};
 	Sprite & frag_11_sprite = frag_11.add_component<Sprite>(
 		frag_11_asset, Sprite::Data{
@@ -378,7 +388,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 200,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_11_rb.active = false;
 	frag_11.add_component<CircleCollider>(5);
@@ -399,7 +410,8 @@ void StartSubScene::create_wall_fragments(crepe::Scene & scn, float begin_x) {
 		.angular_velocity = 100,
 		.angular_velocity_coefficient = 0.55,
 		.elasticity_coefficient = 0.5,
-		.collision_layer = 5,
+		.collision_layers = {COLL_LAY_BOT_TOP},
+		.collision_layer = COLL_LAY_WALL_FRAGS,
 	});
 	frag_12_rb.active = false;
 	frag_12.add_component<CircleCollider>(50);