diff options
| -rw-r--r-- | game/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | game/GameScene.cpp | 3 | ||||
| -rw-r--r-- | game/background/AquariumSubScene.cpp (renamed from game/AquariumSubScene.cpp) | 18 | ||||
| -rw-r--r-- | game/background/AquariumSubScene.h (renamed from game/AquariumSubScene.h) | 0 | ||||
| -rw-r--r-- | game/background/BackgroundSubScene.cpp (renamed from game/BackgroundSubScene.cpp) | 0 | ||||
| -rw-r--r-- | game/background/BackgroundSubScene.h (renamed from game/BackgroundSubScene.h) | 0 | ||||
| -rw-r--r-- | game/background/ForestParallaxScript.cpp (renamed from game/ForestParallaxScript.cpp) | 0 | ||||
| -rw-r--r-- | game/background/ForestParallaxScript.h (renamed from game/ForestParallaxScript.h) | 0 | ||||
| -rw-r--r-- | game/background/ForestSubScene.cpp (renamed from game/ForestSubScene.cpp) | 0 | ||||
| -rw-r--r-- | game/background/ForestSubScene.h (renamed from game/ForestSubScene.h) | 0 | ||||
| -rw-r--r-- | game/background/HallwaySubScene.cpp (renamed from game/HallwaySubScene.cpp) | 0 | ||||
| -rw-r--r-- | game/background/HallwaySubScene.h (renamed from game/HallwaySubScene.h) | 0 | ||||
| -rw-r--r-- | game/background/StartSubScene.cpp (renamed from game/StartSubScene.cpp) | 0 | ||||
| -rw-r--r-- | game/background/StartSubScene.h (renamed from game/StartSubScene.h) | 0 |
14 files changed, 14 insertions, 19 deletions
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index dc55523..937b5e6 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -9,17 +9,17 @@ project(game C CXX) add_subdirectory(../src crepe) add_executable(main - AquariumSubScene.cpp - BackgroundSubScene.cpp - ForestParallaxScript.cpp - ForestSubScene.cpp + background/AquariumSubScene.cpp + background/BackgroundSubScene.cpp + background/ForestParallaxScript.cpp + background/ForestSubScene.cpp GameScene.cpp - HallwaySubScene.cpp + background/HallwaySubScene.cpp MoveCameraManualyScript.cpp PlayerScript.cpp PlayerSubScene.cpp StartGameScript.cpp - StartSubScene.cpp + background/StartSubScene.cpp main.cpp ) diff --git a/game/GameScene.cpp b/game/GameScene.cpp index c280474..9606244 100644 --- a/game/GameScene.cpp +++ b/game/GameScene.cpp @@ -1,9 +1,10 @@ #include "GameScene.h" -#include "BackgroundSubScene.h" #include "MoveCameraManualyScript.h" #include "PlayerSubScene.h" #include "StartGameScript.h" +#include "background/BackgroundSubScene.h" + #include <cmath> #include <crepe/api/Animator.h> #include <crepe/api/Asset.h> diff --git a/game/AquariumSubScene.cpp b/game/background/AquariumSubScene.cpp index f4b20f6..40e22b7 100644 --- a/game/AquariumSubScene.cpp +++ b/game/background/AquariumSubScene.cpp @@ -14,8 +14,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) { GameObject aquarium_begin = scn.new_object("aquarium_begin", "background", vec2(begin_x, 0)); - Asset aquarium_begin_asset{ - "asset/background/aquarium/glassTubeFG_1_TVOS.png"}; + Asset aquarium_begin_asset{"asset/background/aquarium/glassTubeFG_1_TVOS.png"}; aquarium_begin.add_component<Sprite>(aquarium_begin_asset, Sprite::Data{ .sorting_in_layer = 4, .order_in_layer = 0, @@ -25,8 +24,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) { GameObject aquarium_middle_1 = scn.new_object("aquarium_middle", "background", vec2(begin_x, 0)); - Asset aquarium_middle_1_asset{ - "asset/background/aquarium/glassTubeFG_3_TVOS.png"}; + Asset aquarium_middle_1_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"}; aquarium_middle_1.add_component<Sprite>(aquarium_middle_1_asset, Sprite::Data{ .sorting_in_layer = 4, .order_in_layer = 2, @@ -38,8 +36,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) { GameObject aquarium_middle_2 = scn.new_object("aquarium_middle", "background", vec2(begin_x, 0)); - Asset aquarium_middle_2_asset{ - "asset/background/aquarium/glassTubeFG_3_TVOS.png"}; + Asset aquarium_middle_2_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"}; aquarium_middle_2.add_component<Sprite>(aquarium_middle_2_asset, Sprite::Data{ .sorting_in_layer = 4, .order_in_layer = 3, @@ -49,8 +46,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) { GameObject aquarium_middle_3 = scn.new_object("aquarium_middle", "background", vec2(begin_x, 0)); - Asset aquarium_middle_3_asset{ - "asset/background/aquarium/glassTubeFG_3_TVOS.png"}; + Asset aquarium_middle_3_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"}; aquarium_middle_3.add_component<Sprite>(aquarium_middle_3_asset, Sprite::Data{ .sorting_in_layer = 4, .order_in_layer = 4, @@ -62,8 +58,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) { GameObject aquarium_middle_4 = scn.new_object("aquarium_middle", "background", vec2(begin_x, 0)); - Asset aquarium_middle_4_asset{ - "asset/background/aquarium/glassTubeFG_3_TVOS.png"}; + Asset aquarium_middle_4_asset{"asset/background/aquarium/glassTubeFG_3_TVOS.png"}; aquarium_middle_4.add_component<Sprite>(aquarium_middle_4_asset, Sprite::Data{ .sorting_in_layer = 4, .order_in_layer = 5, @@ -74,8 +69,7 @@ float AquariumSubScene::create(Scene & scn, float begin_x) { this->add_background(scn, begin_x); GameObject aquarium_end = scn.new_object("aquarium_end", "background", vec2(begin_x, 0)); - Asset aquarium_end_asset{ - "asset/background/aquarium/glassTubeFG_2_TVOS.png"}; + Asset aquarium_end_asset{"asset/background/aquarium/glassTubeFG_2_TVOS.png"}; aquarium_end.add_component<Sprite>(aquarium_end_asset, Sprite::Data{ .sorting_in_layer = 4, .order_in_layer = 1, diff --git a/game/AquariumSubScene.h b/game/background/AquariumSubScene.h index 2a188bc..2a188bc 100644 --- a/game/AquariumSubScene.h +++ b/game/background/AquariumSubScene.h diff --git a/game/BackgroundSubScene.cpp b/game/background/BackgroundSubScene.cpp index 6fdc598..6fdc598 100644 --- a/game/BackgroundSubScene.cpp +++ b/game/background/BackgroundSubScene.cpp diff --git a/game/BackgroundSubScene.h b/game/background/BackgroundSubScene.h index 06bdac4..06bdac4 100644 --- a/game/BackgroundSubScene.h +++ b/game/background/BackgroundSubScene.h diff --git a/game/ForestParallaxScript.cpp b/game/background/ForestParallaxScript.cpp index 27e30eb..27e30eb 100644 --- a/game/ForestParallaxScript.cpp +++ b/game/background/ForestParallaxScript.cpp diff --git a/game/ForestParallaxScript.h b/game/background/ForestParallaxScript.h index a65a684..a65a684 100644 --- a/game/ForestParallaxScript.h +++ b/game/background/ForestParallaxScript.h diff --git a/game/ForestSubScene.cpp b/game/background/ForestSubScene.cpp index 810ef17..810ef17 100644 --- a/game/ForestSubScene.cpp +++ b/game/background/ForestSubScene.cpp diff --git a/game/ForestSubScene.h b/game/background/ForestSubScene.h index 0a04001..0a04001 100644 --- a/game/ForestSubScene.h +++ b/game/background/ForestSubScene.h diff --git a/game/HallwaySubScene.cpp b/game/background/HallwaySubScene.cpp index 486b8c6..486b8c6 100644 --- a/game/HallwaySubScene.cpp +++ b/game/background/HallwaySubScene.cpp diff --git a/game/HallwaySubScene.h b/game/background/HallwaySubScene.h index acc9329..acc9329 100644 --- a/game/HallwaySubScene.h +++ b/game/background/HallwaySubScene.h diff --git a/game/StartSubScene.cpp b/game/background/StartSubScene.cpp index 5d810c2..5d810c2 100644 --- a/game/StartSubScene.cpp +++ b/game/background/StartSubScene.cpp diff --git a/game/StartSubScene.h b/game/background/StartSubScene.h index c83e3d5..c83e3d5 100644 --- a/game/StartSubScene.h +++ b/game/background/StartSubScene.h |