rename 'engine' - 'libgba-sprite-engine' as gnu C conventions will have it

demos/demo1-basicfeatures/src/flying_stuff_scene.cpp

@@ -2,10 +2,10 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/sprites/affine_sprite.h>
-#include <engine/sprites/sprite_builder.h>
-#include <engine/gba/tonc_memmap.h>
-#include <engine/background/text_stream.h>
+#include <libgba-sprite-engine/sprites/affine_sprite.h>
+#include <libgba-sprite-engine/sprites/sprite_builder.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/background/text_stream.h>
 #include "flying_stuff_scene.h"
 #include "kul.h"
 

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 <engine/sprites/sprite.h>
-#include <engine/sprites/affine_sprite.h>
-#include <engine/Scene.h>
-#include <engine/background/background.h>
+#include <libgba-sprite-engine/sprites/sprite.h>
+#include <libgba-sprite-engine/sprites/affine_sprite.h>
+#include <libgba-sprite-engine/scene.h>
+#include <libgba-sprite-engine/background/background.h>
 
-class FlyingStuffScene : public Scene {
+class FlyingStuffScene : public scene {
 private:
     std::unique_ptr<Sprite> smiley;
     std::unique_ptr<AffineSprite> player;
@@ -22,7 +22,7 @@ private:
     int rotation;
     int rotationDiff = 128;
 public:
-    FlyingStuffScene(std::shared_ptr<GBAEngine> engine) : Scene(engine), rotation(0), rotationDiff(128), scrollX(0), scrollY(0) {}
+    FlyingStuffScene(std::shared_ptr<GBAEngine> engine) : scene(engine), rotation(0), rotationDiff(128), scrollX(0), scrollY(0) {}
 
     std::vector<Sprite *> sprites() override;
     std::vector<Background *> backgrounds() override;

demos/demo1-basicfeatures/src/main.cpp

@@ -1,9 +1,9 @@
-#include <engine/Scene.h>
-#include <engine/gba_engine.h>
-#include <engine/background/text.h>
-#include <engine/background/text_stream.h>
-#include <engine/palette/palette_manager.h>
-#include <engine/allocator.h>
+#include <libgba-sprite-engine/scene.h>
+#include <libgba-sprite-engine/gba_engine.h>
+#include <libgba-sprite-engine/background/text.h>
+#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-sprite-engine/allocator.h>
 
 #include "sample_start_scene.h"
 

demos/demo1-basicfeatures/src/sample_start_scene.cpp

@@ -2,11 +2,11 @@
 // Created by Wouter Groeneveld on 02/08/18.
 //
 
-#include <engine/sprites/sprite_builder.h>
-#include <engine/background/text_stream.h>
-#include <engine/gba/tonc_memdef.h>
-#include <engine/gba_engine.h>
-#include <engine/effects/fade_out_scene.h>
+#include <libgba-sprite-engine/sprites/sprite_builder.h>
+#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-sprite-engine/gba/tonc_memdef.h>
+#include <libgba-sprite-engine/gba_engine.h>
+#include <libgba-sprite-engine/effects/fade_out_scene.h>
 #include "sample_start_scene.h"
 #include "flying_stuff_scene.h"
 

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 <engine/Scene.h>
+#include <libgba-sprite-engine/scene.h>
 
-class SampleStartScene : public Scene {
+class SampleStartScene : public scene {
 private:
     std::unique_ptr<Sprite> animation;
     std::unique_ptr<Sprite> smiley;
@@ -16,7 +16,7 @@ public:
     std::vector<Sprite *> sprites() override;
     std::vector<Background *> backgrounds() override;
 
-    SampleStartScene(std::shared_ptr<GBAEngine> engine) : Scene(engine) {}
+    SampleStartScene(std::shared_ptr<GBAEngine> engine) : scene(engine) {}
 
     void load() override;
     void tick(u16 keys) override;

engine/include/libgba-sprite-engine/allocator.h

@@ -7,8 +7,8 @@
 #define GBA_SPRITE_ENGINE_ALLOCATOR_H
 
 
-#include <engine/gba/tonc_types.h>
-#include <engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/gba/tonc_types.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
 #include <vector>
 
 #define MEM_OBJ_VRAM_BASE (MEM_VRAM + VRAM_BG_SIZE)

engine/include/libgba-sprite-engine/background/background.h

@@ -6,7 +6,7 @@
 #define GBA_SPRITE_ENGINE_BACKGROUND_H
 
 
-#include <engine/gba/tonc_types.h>
+#include <libgba-sprite-engine/gba/tonc_types.h>
 
 class Background {
 private:

engine/include/libgba-sprite-engine/background/text_stream.h

@@ -10,7 +10,7 @@
 
 #include <string>
 #include <memory>
-#include <engine/palette/palette_manager.h>
+#include <libgba-sprite-engine/palette/palette_manager.h>
 
 #define CHAR_OFFSET_INDEX 32
 #define TILE_WIDTH 32

engine/include/libgba-sprite-engine/effects/fade_out_scene.h

@@ -6,7 +6,7 @@
 #define GBA_SPRITE_ENGINE_FADE_OUT_SCENE_H
 
 
-#include <engine/Scene.h>
+#include <libgba-sprite-engine/scene.h>
 #include "scene_effect.h"
 
 class FadeOutScene : public SceneEffect {

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 <engine/Scene.h>
+#include <libgba-sprite-engine/scene.h>
 
 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;

engine/include/libgba-sprite-engine/gba_engine.h

@@ -6,18 +6,18 @@
 #define GBA_SPRITE_ENGINE_GBAENGINE_H
 
 
-#include <engine/sprites/sprite_manager.h>
-#include <engine/gba/tonc_memmap.h>
-#include <engine/gba/tonc_memdef.h>
-#include <engine/effects/scene_effect.h>
-#include "Scene.h"
+#include <libgba-sprite-engine/sprites/sprite_manager.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/gba/tonc_memdef.h>
+#include <libgba-sprite-engine/effects/scene_effect.h>
+#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();

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 <engine/gba/tonc_memmap.h>
-#include <engine/gba/tonc_types.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/gba/tonc_types.h>
 #include "combined_palette.h"
 
 #define PALETTE_BANK_SIZE 16

engine/include/libgba-sprite-engine/scene.h

@@ -7,13 +7,13 @@
 
 #include <vector>
 #include <functional>
-#include <engine/background/background.h>
-#include "engine/sprites/sprite.h"
-#include "engine/palette/palette_manager.h"
+#include <libgba-sprite-engine/background/background.h>
+#include <libgba-sprite-engine/sprites/sprite.h>
+#include <libgba-sprite-engine/palette/palette_manager.h>
 
 class GBAEngine;
 
-class Scene {
+class scene {
 protected:
     std::unique_ptr<ForegroundPaletteManager> foregroundPalette;
     std::unique_ptr<BackgroundPaletteManager> backgroundPalette;
@@ -30,8 +30,8 @@ public:
     virtual void load() = 0;
     virtual void tick(u16 i) = 0;
 
-    Scene(std::shared_ptr<GBAEngine> engine) : engine(engine) { }
-    virtual ~Scene() {
+    scene(std::shared_ptr<GBAEngine> engine) : engine(engine) { }
+    virtual ~scene() {
         // scenes should manage their own resources - use std::unique_ptr
     }
 

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 <engine/gba/tonc_types.h>
-#include <engine/gba/tonc_memdef.h>
+#include <libgba-sprite-engine/gba/tonc_types.h>
+#include <libgba-sprite-engine/gba/tonc_memdef.h>
 #include <memory>
-#include <engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
 
 #define CLOCK 16777216
 #define CYCLES_PER_BLANK 280806

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 <engine/gba/tonc_types.h>
+#include <libgba-sprite-engine/gba/tonc_types.h>
 #include <memory>
 
 #define COLOR_MODE_16 0

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 <engine/gba/tonc_types.h>
+#include <libgba-sprite-engine/gba/tonc_types.h>
 #include "sprite.h"
 #include <vector>
 

engine/src/allocator.cpp

@@ -3,7 +3,7 @@
 //
 
 #include <stdexcept>
-#include <engine/allocator.h>
+#include <libgba-sprite-engine/allocator.h>
 
 u32 voidPtrToU32(void* ptr) {
     return static_cast<u32>(reinterpret_cast<intptr_t>(ptr));

engine/src/background/background.cpp

@@ -2,16 +2,16 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
 #include <stdexcept>
-#include <engine/allocator.h>
+#include <libgba-sprite-engine/allocator.h>
 #ifdef CODE_COMPILED_AS_PART_OF_TEST
-#include <engine/gba/tonc_core_stub.h>
+#include <libgba-sprite-engine/gba/tonc_core_stub.h>
 #else
-#include <engine/gba/tonc_core.h>
+#include <libgba-sprite-engine/gba/tonc_core.h>
 #endif
-#include <engine/background/background.h>
-#include <engine/background/text_stream.h>
+#include <libgba-sprite-engine/background/background.h>
+#include <libgba-sprite-engine/background/text_stream.h>
 
 #define TRANSPARENT_TILE_NUMBER 192     // as shown in mGBA, next "free" tile after text. Hardcoded indeed.
 

engine/src/background/text_stream.cpp

@@ -2,9 +2,9 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/gba/tonc_memmap.h>
-#include <engine/palette/palette_manager.h>
-#include <engine/background/text_stream.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/palette/palette_manager.h>
+#include <libgba-sprite-engine/background/text_stream.h>
 
 #include <memory>
 

engine/src/effects/fade_out_scene.cpp

@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 04/08/18.
 //
 
-#include <engine/effects/fade_out_scene.h>
+#include <libgba-sprite-engine/effects/fade_out_scene.h>
 
 FadeOutScene::FadeOutScene(int speed) : timesUpdated(0), speed(speed) {
 }

engine/src/gba_engine.cpp

@@ -2,10 +2,10 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/gba/tonc_memdef.h>
-#include <engine/background/text_stream.h>
-#include <engine/gba_engine.h>
-#include <engine/allocator.h>
+#include <libgba-sprite-engine/gba/tonc_memdef.h>
+#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-sprite-engine/gba_engine.h>
+#include <libgba-sprite-engine/allocator.h>
 
 std::unique_ptr<SoundControl> GBAEngine::activeChannelA;
 std::unique_ptr<SoundControl> 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();

engine/src/palette/combined_palette.cpp

@@ -3,8 +3,8 @@
 //
 
 
-#include <engine/background/text_stream.h>
-#include <engine/palette/palette_manager.h>
+#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-sprite-engine/palette/palette_manager.h>
 
 void CombinedPalette::increaseBrightness(PaletteManager& palette, int bank, int index, u32 intensity) {
     auto current = palette.get(bank, index);

engine/src/palette/palette_manager.cpp

@@ -3,12 +3,12 @@
 //
 
 #ifdef CODE_COMPILED_AS_PART_OF_TEST
-#include <engine/gba/tonc_core_stub.h>
+#include <libgba-sprite-engine/gba/tonc_core_stub.h>
 #else
-#include <engine/gba/tonc_core.h>
+#include <libgba-sprite-engine/gba/tonc_core.h>
 #endif
-#include <engine/background/text_stream.h>
-#include <engine/palette/palette_manager.h>
+#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-sprite-engine/palette/palette_manager.h>
 
 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,

engine/src/sound_control.cpp

@@ -2,8 +2,8 @@
 // Created by Wouter Groeneveld on 07/08/18.
 //
 
-#include <engine/gba/tonc_memmap.h>
-#include <engine/sound_control.h>
+#include <libgba-sprite-engine/gba/tonc_memmap.h>
+#include <libgba-sprite-engine/sound_control.h>
 
 void SoundControl::accept(const void *data, int totalSamples, int ticksPerSample)  {
     this->data = data;

engine/src/sprites/affine_sprite.cpp

@@ -2,10 +2,10 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/gba/tonc_memdef.h>
-#include <engine/gba/tonc_oam.h>
+#include <libgba-sprite-engine/gba/tonc_memdef.h>
+#include <libgba-sprite-engine/gba/tonc_oam.h>
 
-#include <engine/sprites/affine_sprite.h>
+#include <libgba-sprite-engine/sprites/affine_sprite.h>
 
 void AffineSprite::identity() {
     obj_aff_identity(this->affine.get());

engine/src/sprites/sprite.cpp

@@ -3,9 +3,9 @@
 //
 
 #include <cstdlib>
-#include <engine/gba/tonc_memdef.h>
-#include <engine/background/text_stream.h>
-#include <engine/sprites/sprite.h>
+#include <libgba-sprite-engine/gba/tonc_memdef.h>
+#include <libgba-sprite-engine/background/text_stream.h>
+#include <libgba-sprite-engine/sprites/sprite.h>
 
 Sprite::Sprite(const void *imageData, int imageSize, int x, int y, SpriteSize size)
         : x(x), y(y), data(imageData), imageSize(imageSize),

engine/src/sprites/sprite_builder.cpp

@@ -2,4 +2,4 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/sprites/sprite_builder.h>
+#include <libgba-sprite-engine/sprites/sprite_builder.h>

engine/src/sprites/sprite_manager.cpp

@@ -2,11 +2,11 @@
 // Created by Wouter Groeneveld on 26/07/18.
 //
 
-#include <engine/sprites/sprite_manager.h>
-#include <engine/sprites/affine_sprite.h>
+#include <libgba-sprite-engine/sprites/sprite_manager.h>
+#include <libgba-sprite-engine/sprites/affine_sprite.h>
 
-#include <engine/gba/tonc_core.h>
-#include <engine/allocator.h>
+#include <libgba-sprite-engine/gba/tonc_core.h>
+#include <libgba-sprite-engine/allocator.h>
 
 #define MAX_SPRITE_SIZE 128
 #define MAX_AFFINE_SIZE 31

test/allocatortest.cpp

@@ -2,13 +2,13 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/Scene.h>
-#include <engine/sprites/sprite_builder.h>
+#include <libgba-sprite-engine/scene.h>
+#include <libgba-sprite-engine/sprites/sprite_builder.h>
 #include <gtest/gtest.h>
-#include <engine/allocator.h>
+#include <libgba-sprite-engine/allocator.h>
 #include "gtest/gtest.h"
 #include <iostream>
-#include <engine/background/text.h>
+#include <libgba-sprite-engine/background/text.h>
 #include "real_data.h"
 
 using namespace std;

test/palettetest.cpp

@@ -2,7 +2,7 @@
 // Created by Wouter Groeneveld on 04/08/18.
 //
 
-#include <engine/palette/palette_manager.h>
+#include <libgba-sprite-engine/palette/palette_manager.h>
 #include "gtest/gtest.h"
 
 class SomePaletteManager : public PaletteManager {

test/scenetest.cpp

@@ -2,9 +2,9 @@
 // Created by Wouter Groeneveld on 28/07/18.
 //
 
-#include <engine/Scene.h>
-#include <engine/sprites/sprite_builder.h>
-#include <engine/gba_engine.h>
+#include <libgba-sprite-engine/scene.h>
+#include <libgba-sprite-engine/sprites/sprite_builder.h>
+#include <libgba-sprite-engine/gba_engine.h>
 #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<Sprite> someSprite1;
     std::unique_ptr<Sprite> someSprite2;
 public:
-    SomeScene() : Scene(nullptr) { };
+    SomeScene() : scene(nullptr) { };
     std::vector<Sprite *> sprites() override {
         return {
             someSprite1.get(), someSprite2.get()

test/spritetest.cpp

@@ -1,6 +1,6 @@
 
-#include <engine/sprites/sprite.h>
-#include <engine/sprites/sprite_builder.h>
+#include <libgba-sprite-engine/sprites/sprite.h>
+#include <libgba-sprite-engine/sprites/sprite_builder.h>
 #include "gtest/gtest.h"
 
 const u32 kul_data [] = {