diff --git a/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp b/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp index dbe13fa..48ad67e 100644 --- a/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp +++ b/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp @@ -2,10 +2,10 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include -#include -#include -#include +#include +#include +#include +#include #include "flying_stuff_scene.h" #include "kul.h" diff --git a/demos/demo1-basicfeatures/src/flying_stuff_scene.h b/demos/demo1-basicfeatures/src/flying_stuff_scene.h index 1629e4b..856cd72 100644 --- a/demos/demo1-basicfeatures/src/flying_stuff_scene.h +++ b/demos/demo1-basicfeatures/src/flying_stuff_scene.h @@ -5,12 +5,12 @@ #ifndef GBA_SPRITE_ENGINE_FLYING_STUFF_SCENE_H #define GBA_SPRITE_ENGINE_FLYING_STUFF_SCENE_H -#include -#include -#include -#include +#include +#include +#include +#include -class FlyingStuffScene : public Scene { +class FlyingStuffScene : public scene { private: std::unique_ptr smiley; std::unique_ptr player; @@ -22,7 +22,7 @@ private: int rotation; int rotationDiff = 128; public: - FlyingStuffScene(std::shared_ptr engine) : Scene(engine), rotation(0), rotationDiff(128), scrollX(0), scrollY(0) {} + FlyingStuffScene(std::shared_ptr engine) : scene(engine), rotation(0), rotationDiff(128), scrollX(0), scrollY(0) {} std::vector sprites() override; std::vector backgrounds() override; diff --git a/demos/demo1-basicfeatures/src/main.cpp b/demos/demo1-basicfeatures/src/main.cpp index a74a224..3f36891 100644 --- a/demos/demo1-basicfeatures/src/main.cpp +++ b/demos/demo1-basicfeatures/src/main.cpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "sample_start_scene.h" diff --git a/demos/demo1-basicfeatures/src/sample_start_scene.cpp b/demos/demo1-basicfeatures/src/sample_start_scene.cpp index ac1707a..7b24719 100644 --- a/demos/demo1-basicfeatures/src/sample_start_scene.cpp +++ b/demos/demo1-basicfeatures/src/sample_start_scene.cpp @@ -2,11 +2,11 @@ // Created by Wouter Groeneveld on 02/08/18. // -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "sample_start_scene.h" #include "flying_stuff_scene.h" diff --git a/demos/demo1-basicfeatures/src/sample_start_scene.h b/demos/demo1-basicfeatures/src/sample_start_scene.h index c66004e..86a2d9c 100644 --- a/demos/demo1-basicfeatures/src/sample_start_scene.h +++ b/demos/demo1-basicfeatures/src/sample_start_scene.h @@ -5,9 +5,9 @@ #ifndef GBA_SPRITE_ENGINE_SAMPLE_START_SCENE_H #define GBA_SPRITE_ENGINE_SAMPLE_START_SCENE_H -#include +#include -class SampleStartScene : public Scene { +class SampleStartScene : public scene { private: std::unique_ptr animation; std::unique_ptr smiley; @@ -16,7 +16,7 @@ public: std::vector sprites() override; std::vector backgrounds() override; - SampleStartScene(std::shared_ptr engine) : Scene(engine) {} + SampleStartScene(std::shared_ptr engine) : scene(engine) {} void load() override; void tick(u16 keys) override; diff --git a/engine/include/engine/allocator.h b/engine/include/libgba-sprite-engine/allocator.h similarity index 92% rename from engine/include/engine/allocator.h rename to engine/include/libgba-sprite-engine/allocator.h index c66f507..617fdc5 100644 --- a/engine/include/engine/allocator.h +++ b/engine/include/libgba-sprite-engine/allocator.h @@ -7,8 +7,8 @@ #define GBA_SPRITE_ENGINE_ALLOCATOR_H -#include -#include +#include +#include #include #define MEM_OBJ_VRAM_BASE (MEM_VRAM + VRAM_BG_SIZE) diff --git a/engine/include/engine/background/background.h b/engine/include/libgba-sprite-engine/background/background.h similarity index 95% rename from engine/include/engine/background/background.h rename to engine/include/libgba-sprite-engine/background/background.h index a23a00f..26841c1 100644 --- a/engine/include/engine/background/background.h +++ b/engine/include/libgba-sprite-engine/background/background.h @@ -6,7 +6,7 @@ #define GBA_SPRITE_ENGINE_BACKGROUND_H -#include +#include class Background { private: diff --git a/engine/include/engine/background/text.h b/engine/include/libgba-sprite-engine/background/text.h similarity index 100% rename from engine/include/engine/background/text.h rename to engine/include/libgba-sprite-engine/background/text.h diff --git a/engine/include/engine/background/text_stream.h b/engine/include/libgba-sprite-engine/background/text_stream.h similarity index 95% rename from engine/include/engine/background/text_stream.h rename to engine/include/libgba-sprite-engine/background/text_stream.h index 16a25c8..e54d7a8 100644 --- a/engine/include/engine/background/text_stream.h +++ b/engine/include/libgba-sprite-engine/background/text_stream.h @@ -10,7 +10,7 @@ #include #include -#include +#include #define CHAR_OFFSET_INDEX 32 #define TILE_WIDTH 32 diff --git a/engine/include/engine/effects/fade_out_scene.h b/engine/include/libgba-sprite-engine/effects/fade_out_scene.h similarity index 92% rename from engine/include/engine/effects/fade_out_scene.h rename to engine/include/libgba-sprite-engine/effects/fade_out_scene.h index 299fb91..bd4a7ba 100644 --- a/engine/include/engine/effects/fade_out_scene.h +++ b/engine/include/libgba-sprite-engine/effects/fade_out_scene.h @@ -6,7 +6,7 @@ #define GBA_SPRITE_ENGINE_FADE_OUT_SCENE_H -#include +#include #include "scene_effect.h" class FadeOutScene : public SceneEffect { diff --git a/engine/include/engine/effects/scene_effect.h b/engine/include/libgba-sprite-engine/effects/scene_effect.h similarity index 74% rename from engine/include/engine/effects/scene_effect.h rename to engine/include/libgba-sprite-engine/effects/scene_effect.h index 64cacc8..c729afa 100644 --- a/engine/include/engine/effects/scene_effect.h +++ b/engine/include/libgba-sprite-engine/effects/scene_effect.h @@ -5,14 +5,14 @@ #ifndef GBA_SPRITE_ENGINE_SCENE_EFFECT_H #define GBA_SPRITE_ENGINE_SCENE_EFFECT_H -#include +#include class SceneEffect { protected: // WHY no reference? Scene& operator= is implicitly deleted and no intentions to use that - Scene* sceneToAffect; + scene* sceneToAffect; public: - void setSceneToAffect(Scene* scene) { sceneToAffect = scene; }; + void setSceneToAffect(scene* scene) { sceneToAffect = scene; }; virtual void update() = 0; virtual bool isDone() = 0; diff --git a/engine/include/engine/gba/tonc_core.h b/engine/include/libgba-sprite-engine/gba/tonc_core.h similarity index 100% rename from engine/include/engine/gba/tonc_core.h rename to engine/include/libgba-sprite-engine/gba/tonc_core.h diff --git a/engine/include/engine/gba/tonc_core_stub.h b/engine/include/libgba-sprite-engine/gba/tonc_core_stub.h similarity index 100% rename from engine/include/engine/gba/tonc_core_stub.h rename to engine/include/libgba-sprite-engine/gba/tonc_core_stub.h diff --git a/engine/include/engine/gba/tonc_math.h b/engine/include/libgba-sprite-engine/gba/tonc_math.h similarity index 100% rename from engine/include/engine/gba/tonc_math.h rename to engine/include/libgba-sprite-engine/gba/tonc_math.h diff --git a/engine/include/engine/gba/tonc_memdef.h b/engine/include/libgba-sprite-engine/gba/tonc_memdef.h similarity index 100% rename from engine/include/engine/gba/tonc_memdef.h rename to engine/include/libgba-sprite-engine/gba/tonc_memdef.h diff --git a/engine/include/engine/gba/tonc_memmap.h b/engine/include/libgba-sprite-engine/gba/tonc_memmap.h similarity index 100% rename from engine/include/engine/gba/tonc_memmap.h rename to engine/include/libgba-sprite-engine/gba/tonc_memmap.h diff --git a/engine/include/engine/gba/tonc_oam.h b/engine/include/libgba-sprite-engine/gba/tonc_oam.h similarity index 100% rename from engine/include/engine/gba/tonc_oam.h rename to engine/include/libgba-sprite-engine/gba/tonc_oam.h diff --git a/engine/include/engine/gba/tonc_types.h b/engine/include/libgba-sprite-engine/gba/tonc_types.h similarity index 100% rename from engine/include/engine/gba/tonc_types.h rename to engine/include/libgba-sprite-engine/gba/tonc_types.h diff --git a/engine/include/engine/gba_engine.h b/engine/include/libgba-sprite-engine/gba_engine.h similarity index 76% rename from engine/include/engine/gba_engine.h rename to engine/include/libgba-sprite-engine/gba_engine.h index 9c20087..8730212 100644 --- a/engine/include/engine/gba_engine.h +++ b/engine/include/libgba-sprite-engine/gba_engine.h @@ -6,18 +6,18 @@ #define GBA_SPRITE_ENGINE_GBAENGINE_H -#include -#include -#include -#include -#include "Scene.h" +#include +#include +#include +#include +#include "scene.h" #include "sound_control.h" class GBAEngine { private: // WHY raw pointers? the engine does the transition and cleanup work itself - Scene* currentScene; - Scene* sceneToTransitionTo; + scene* currentScene; + scene* sceneToTransitionTo; SceneEffect* currentEffectForTransition; SpriteManager spriteManager; @@ -36,8 +36,8 @@ private: public: GBAEngine(); - void setScene(Scene* scene); - void transitionIntoScene(Scene* scene, SceneEffect* effect); + void setScene(scene* scene); + void transitionIntoScene(scene* scene, SceneEffect* effect); bool isTransitioning() { return currentEffectForTransition != nullptr; } void dequeueAllSounds(); diff --git a/engine/include/engine/palette/combined_palette.h b/engine/include/libgba-sprite-engine/palette/combined_palette.h similarity index 100% rename from engine/include/engine/palette/combined_palette.h rename to engine/include/libgba-sprite-engine/palette/combined_palette.h diff --git a/engine/include/engine/palette/palette_manager.h b/engine/include/libgba-sprite-engine/palette/palette_manager.h similarity index 95% rename from engine/include/engine/palette/palette_manager.h rename to engine/include/libgba-sprite-engine/palette/palette_manager.h index ed46f12..1d00317 100644 --- a/engine/include/engine/palette/palette_manager.h +++ b/engine/include/libgba-sprite-engine/palette/palette_manager.h @@ -5,8 +5,8 @@ #ifndef GBA_SPRITE_ENGINE_PALETTE_MANAGER_H #define GBA_SPRITE_ENGINE_PALETTE_MANAGER_H -#include -#include +#include +#include #include "combined_palette.h" #define PALETTE_BANK_SIZE 16 diff --git a/engine/include/engine/Scene.h b/engine/include/libgba-sprite-engine/scene.h similarity index 78% rename from engine/include/engine/Scene.h rename to engine/include/libgba-sprite-engine/scene.h index c35915f..ca847ec 100644 --- a/engine/include/engine/Scene.h +++ b/engine/include/libgba-sprite-engine/scene.h @@ -7,13 +7,13 @@ #include #include -#include -#include "engine/sprites/sprite.h" -#include "engine/palette/palette_manager.h" +#include +#include +#include class GBAEngine; -class Scene { +class scene { protected: std::unique_ptr foregroundPalette; std::unique_ptr backgroundPalette; @@ -30,8 +30,8 @@ public: virtual void load() = 0; virtual void tick(u16 i) = 0; - Scene(std::shared_ptr engine) : engine(engine) { } - virtual ~Scene() { + scene(std::shared_ptr engine) : engine(engine) { } + virtual ~scene() { // scenes should manage their own resources - use std::unique_ptr } diff --git a/engine/include/engine/sound_control.h b/engine/include/libgba-sprite-engine/sound_control.h similarity index 93% rename from engine/include/engine/sound_control.h rename to engine/include/libgba-sprite-engine/sound_control.h index 5fc9482..8c1f275 100644 --- a/engine/include/engine/sound_control.h +++ b/engine/include/libgba-sprite-engine/sound_control.h @@ -5,10 +5,10 @@ #ifndef GBA_SPRITE_ENGINE_SOUND_H #define GBA_SPRITE_ENGINE_SOUND_H -#include -#include +#include +#include #include -#include +#include #define CLOCK 16777216 #define CYCLES_PER_BLANK 280806 diff --git a/engine/include/engine/sprites/affine_sprite.h b/engine/include/libgba-sprite-engine/sprites/affine_sprite.h similarity index 100% rename from engine/include/engine/sprites/affine_sprite.h rename to engine/include/libgba-sprite-engine/sprites/affine_sprite.h diff --git a/engine/include/engine/sprites/sprite.h b/engine/include/libgba-sprite-engine/sprites/sprite.h similarity index 97% rename from engine/include/engine/sprites/sprite.h rename to engine/include/libgba-sprite-engine/sprites/sprite.h index e6fc335..cc37df3 100644 --- a/engine/include/engine/sprites/sprite.h +++ b/engine/include/libgba-sprite-engine/sprites/sprite.h @@ -5,7 +5,7 @@ #ifndef GBA_SPRITE_ENGINE_SPRITE_H #define GBA_SPRITE_ENGINE_SPRITE_H -#include +#include #include #define COLOR_MODE_16 0 diff --git a/engine/include/engine/sprites/sprite_builder.h b/engine/include/libgba-sprite-engine/sprites/sprite_builder.h similarity index 100% rename from engine/include/engine/sprites/sprite_builder.h rename to engine/include/libgba-sprite-engine/sprites/sprite_builder.h diff --git a/engine/include/engine/sprites/sprite_manager.h b/engine/include/libgba-sprite-engine/sprites/sprite_manager.h similarity index 93% rename from engine/include/engine/sprites/sprite_manager.h rename to engine/include/libgba-sprite-engine/sprites/sprite_manager.h index 33f1d91..6689984 100644 --- a/engine/include/engine/sprites/sprite_manager.h +++ b/engine/include/libgba-sprite-engine/sprites/sprite_manager.h @@ -5,7 +5,7 @@ #ifndef GBA_SPRITE_ENGINE_SPRITE_MANAGER_H #define GBA_SPRITE_ENGINE_SPRITE_MANAGER_H -#include +#include #include "sprite.h" #include diff --git a/engine/src/allocator.cpp b/engine/src/allocator.cpp index 18d808e..ec03d99 100644 --- a/engine/src/allocator.cpp +++ b/engine/src/allocator.cpp @@ -3,7 +3,7 @@ // #include -#include +#include u32 voidPtrToU32(void* ptr) { return static_cast(reinterpret_cast(ptr)); diff --git a/engine/src/background/background.cpp b/engine/src/background/background.cpp index 7ed7814..86e78d7 100644 --- a/engine/src/background/background.cpp +++ b/engine/src/background/background.cpp @@ -2,16 +2,16 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include +#include #include -#include +#include #ifdef CODE_COMPILED_AS_PART_OF_TEST -#include +#include #else -#include +#include #endif -#include -#include +#include +#include #define TRANSPARENT_TILE_NUMBER 192 // as shown in mGBA, next "free" tile after text. Hardcoded indeed. diff --git a/engine/src/background/text_stream.cpp b/engine/src/background/text_stream.cpp index 70287fe..cd2494c 100644 --- a/engine/src/background/text_stream.cpp +++ b/engine/src/background/text_stream.cpp @@ -2,9 +2,9 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include -#include -#include +#include +#include +#include #include diff --git a/engine/src/effects/fade_out_scene.cpp b/engine/src/effects/fade_out_scene.cpp index e0dccc7..6774f4e 100644 --- a/engine/src/effects/fade_out_scene.cpp +++ b/engine/src/effects/fade_out_scene.cpp @@ -2,7 +2,7 @@ // Created by Wouter Groeneveld on 04/08/18. // -#include +#include FadeOutScene::FadeOutScene(int speed) : timesUpdated(0), speed(speed) { } diff --git a/engine/src/gba_engine.cpp b/engine/src/gba_engine.cpp index 420a353..1ffad73 100644 --- a/engine/src/gba_engine.cpp +++ b/engine/src/gba_engine.cpp @@ -2,10 +2,10 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include -#include -#include -#include +#include +#include +#include +#include std::unique_ptr GBAEngine::activeChannelA; std::unique_ptr GBAEngine::activeChannelB; @@ -119,7 +119,7 @@ void GBAEngine::update() { spriteManager.render(); } -void GBAEngine::transitionIntoScene(Scene *scene, SceneEffect* effect) { +void GBAEngine::transitionIntoScene(scene *scene, SceneEffect* effect) { sceneToTransitionTo = scene; currentEffectForTransition = effect; currentEffectForTransition->setSceneToAffect(this->currentScene); @@ -131,7 +131,7 @@ void GBAEngine::cleanupPreviousScene() { delete currentEffectForTransition; } -void GBAEngine::setScene(Scene* scene) { +void GBAEngine::setScene(scene* scene) { dequeueAllSounds(); if(this->currentScene) { cleanupPreviousScene(); diff --git a/engine/src/palette/combined_palette.cpp b/engine/src/palette/combined_palette.cpp index d8f6600..d53e36a 100644 --- a/engine/src/palette/combined_palette.cpp +++ b/engine/src/palette/combined_palette.cpp @@ -3,8 +3,8 @@ // -#include -#include +#include +#include void CombinedPalette::increaseBrightness(PaletteManager& palette, int bank, int index, u32 intensity) { auto current = palette.get(bank, index); diff --git a/engine/src/palette/palette_manager.cpp b/engine/src/palette/palette_manager.cpp index 59e1184..80683fb 100644 --- a/engine/src/palette/palette_manager.cpp +++ b/engine/src/palette/palette_manager.cpp @@ -3,12 +3,12 @@ // #ifdef CODE_COMPILED_AS_PART_OF_TEST -#include +#include #else -#include +#include #endif -#include -#include +#include +#include const COLOR defaultPaletteData[PALETTE_MAX_SIZE] __attribute__((aligned(4))) = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/engine/src/sound_control.cpp b/engine/src/sound_control.cpp index 8f61c10..017cd28 100644 --- a/engine/src/sound_control.cpp +++ b/engine/src/sound_control.cpp @@ -2,8 +2,8 @@ // Created by Wouter Groeneveld on 07/08/18. // -#include -#include +#include +#include void SoundControl::accept(const void *data, int totalSamples, int ticksPerSample) { this->data = data; diff --git a/engine/src/sprites/affine_sprite.cpp b/engine/src/sprites/affine_sprite.cpp index 4d0e166..efcfafc 100644 --- a/engine/src/sprites/affine_sprite.cpp +++ b/engine/src/sprites/affine_sprite.cpp @@ -2,10 +2,10 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include -#include +#include +#include -#include +#include void AffineSprite::identity() { obj_aff_identity(this->affine.get()); diff --git a/engine/src/sprites/sprite.cpp b/engine/src/sprites/sprite.cpp index a64a551..011db45 100644 --- a/engine/src/sprites/sprite.cpp +++ b/engine/src/sprites/sprite.cpp @@ -3,9 +3,9 @@ // #include -#include -#include -#include +#include +#include +#include Sprite::Sprite(const void *imageData, int imageSize, int x, int y, SpriteSize size) : x(x), y(y), data(imageData), imageSize(imageSize), diff --git a/engine/src/sprites/sprite_builder.cpp b/engine/src/sprites/sprite_builder.cpp index edee86d..d4993ee 100644 --- a/engine/src/sprites/sprite_builder.cpp +++ b/engine/src/sprites/sprite_builder.cpp @@ -2,4 +2,4 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include +#include diff --git a/engine/src/sprites/sprite_manager.cpp b/engine/src/sprites/sprite_manager.cpp index 34b1120..d54521c 100644 --- a/engine/src/sprites/sprite_manager.cpp +++ b/engine/src/sprites/sprite_manager.cpp @@ -2,11 +2,11 @@ // Created by Wouter Groeneveld on 26/07/18. // -#include -#include +#include +#include -#include -#include +#include +#include #define MAX_SPRITE_SIZE 128 #define MAX_AFFINE_SIZE 31 diff --git a/test/allocatortest.cpp b/test/allocatortest.cpp index f2ab566..c492bcf 100644 --- a/test/allocatortest.cpp +++ b/test/allocatortest.cpp @@ -2,13 +2,13 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include -#include +#include +#include #include -#include +#include #include "gtest/gtest.h" #include -#include +#include #include "real_data.h" using namespace std; diff --git a/test/palettetest.cpp b/test/palettetest.cpp index 3ac85d8..b433e60 100644 --- a/test/palettetest.cpp +++ b/test/palettetest.cpp @@ -2,7 +2,7 @@ // Created by Wouter Groeneveld on 04/08/18. // -#include +#include #include "gtest/gtest.h" class SomePaletteManager : public PaletteManager { diff --git a/test/scenetest.cpp b/test/scenetest.cpp index 9ed01c0..5310676 100644 --- a/test/scenetest.cpp +++ b/test/scenetest.cpp @@ -2,9 +2,9 @@ // Created by Wouter Groeneveld on 28/07/18. // -#include -#include -#include +#include +#include +#include #include "gtest/gtest.h" class SceneSuite : public ::testing::Test { @@ -17,12 +17,12 @@ protected: } }; -class SomeScene : public Scene { +class SomeScene : public scene { private: std::unique_ptr someSprite1; std::unique_ptr someSprite2; public: - SomeScene() : Scene(nullptr) { }; + SomeScene() : scene(nullptr) { }; std::vector sprites() override { return { someSprite1.get(), someSprite2.get() diff --git a/test/spritetest.cpp b/test/spritetest.cpp index 5185afe..42db11d 100644 --- a/test/spritetest.cpp +++ b/test/spritetest.cpp @@ -1,6 +1,6 @@ -#include -#include +#include +#include #include "gtest/gtest.h" const u32 kul_data [] = {