rename 'engine' - 'libgba-sprite-engine' as gnu C conventions will have it
This commit is contained in:
parent
2e07cad3ad
commit
fad1953682
|
@ -2,10 +2,10 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// Created by Wouter Groeneveld on 28/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/sprites/affine_sprite.h>
|
#include <libgba-sprite-engine/sprites/affine_sprite.h>
|
||||||
#include <engine/sprites/sprite_builder.h>
|
#include <libgba-sprite-engine/sprites/sprite_builder.h>
|
||||||
#include <engine/gba/tonc_memmap.h>
|
#include <libgba-sprite-engine/gba/tonc_memmap.h>
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
#include "flying_stuff_scene.h"
|
#include "flying_stuff_scene.h"
|
||||||
#include "kul.h"
|
#include "kul.h"
|
||||||
|
|
||||||
|
|
|
@ -5,12 +5,12 @@
|
||||||
#ifndef GBA_SPRITE_ENGINE_FLYING_STUFF_SCENE_H
|
#ifndef GBA_SPRITE_ENGINE_FLYING_STUFF_SCENE_H
|
||||||
#define GBA_SPRITE_ENGINE_FLYING_STUFF_SCENE_H
|
#define GBA_SPRITE_ENGINE_FLYING_STUFF_SCENE_H
|
||||||
|
|
||||||
#include <engine/sprites/sprite.h>
|
#include <libgba-sprite-engine/sprites/sprite.h>
|
||||||
#include <engine/sprites/affine_sprite.h>
|
#include <libgba-sprite-engine/sprites/affine_sprite.h>
|
||||||
#include <engine/Scene.h>
|
#include <libgba-sprite-engine/scene.h>
|
||||||
#include <engine/background/background.h>
|
#include <libgba-sprite-engine/background/background.h>
|
||||||
|
|
||||||
class FlyingStuffScene : public Scene {
|
class FlyingStuffScene : public scene {
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<Sprite> smiley;
|
std::unique_ptr<Sprite> smiley;
|
||||||
std::unique_ptr<AffineSprite> player;
|
std::unique_ptr<AffineSprite> player;
|
||||||
|
@ -22,7 +22,7 @@ private:
|
||||||
int rotation;
|
int rotation;
|
||||||
int rotationDiff = 128;
|
int rotationDiff = 128;
|
||||||
public:
|
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<Sprite *> sprites() override;
|
||||||
std::vector<Background *> backgrounds() override;
|
std::vector<Background *> backgrounds() override;
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#include <engine/Scene.h>
|
#include <libgba-sprite-engine/scene.h>
|
||||||
#include <engine/gba_engine.h>
|
#include <libgba-sprite-engine/gba_engine.h>
|
||||||
#include <engine/background/text.h>
|
#include <libgba-sprite-engine/background/text.h>
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
#include <engine/palette/palette_manager.h>
|
#include <libgba-sprite-engine/palette/palette_manager.h>
|
||||||
#include <engine/allocator.h>
|
#include <libgba-sprite-engine/allocator.h>
|
||||||
|
|
||||||
#include "sample_start_scene.h"
|
#include "sample_start_scene.h"
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
// Created by Wouter Groeneveld on 02/08/18.
|
// Created by Wouter Groeneveld on 02/08/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/sprites/sprite_builder.h>
|
#include <libgba-sprite-engine/sprites/sprite_builder.h>
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
#include <engine/gba/tonc_memdef.h>
|
#include <libgba-sprite-engine/gba/tonc_memdef.h>
|
||||||
#include <engine/gba_engine.h>
|
#include <libgba-sprite-engine/gba_engine.h>
|
||||||
#include <engine/effects/fade_out_scene.h>
|
#include <libgba-sprite-engine/effects/fade_out_scene.h>
|
||||||
#include "sample_start_scene.h"
|
#include "sample_start_scene.h"
|
||||||
#include "flying_stuff_scene.h"
|
#include "flying_stuff_scene.h"
|
||||||
|
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
#ifndef GBA_SPRITE_ENGINE_SAMPLE_START_SCENE_H
|
#ifndef GBA_SPRITE_ENGINE_SAMPLE_START_SCENE_H
|
||||||
#define 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:
|
private:
|
||||||
std::unique_ptr<Sprite> animation;
|
std::unique_ptr<Sprite> animation;
|
||||||
std::unique_ptr<Sprite> smiley;
|
std::unique_ptr<Sprite> smiley;
|
||||||
|
@ -16,7 +16,7 @@ public:
|
||||||
std::vector<Sprite *> sprites() override;
|
std::vector<Sprite *> sprites() override;
|
||||||
std::vector<Background *> backgrounds() 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 load() override;
|
||||||
void tick(u16 keys) override;
|
void tick(u16 keys) override;
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
#define GBA_SPRITE_ENGINE_ALLOCATOR_H
|
#define GBA_SPRITE_ENGINE_ALLOCATOR_H
|
||||||
|
|
||||||
|
|
||||||
#include <engine/gba/tonc_types.h>
|
#include <libgba-sprite-engine/gba/tonc_types.h>
|
||||||
#include <engine/gba/tonc_memmap.h>
|
#include <libgba-sprite-engine/gba/tonc_memmap.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#define MEM_OBJ_VRAM_BASE (MEM_VRAM + VRAM_BG_SIZE)
|
#define MEM_OBJ_VRAM_BASE (MEM_VRAM + VRAM_BG_SIZE)
|
|
@ -6,7 +6,7 @@
|
||||||
#define GBA_SPRITE_ENGINE_BACKGROUND_H
|
#define GBA_SPRITE_ENGINE_BACKGROUND_H
|
||||||
|
|
||||||
|
|
||||||
#include <engine/gba/tonc_types.h>
|
#include <libgba-sprite-engine/gba/tonc_types.h>
|
||||||
|
|
||||||
class Background {
|
class Background {
|
||||||
private:
|
private:
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <engine/palette/palette_manager.h>
|
#include <libgba-sprite-engine/palette/palette_manager.h>
|
||||||
|
|
||||||
#define CHAR_OFFSET_INDEX 32
|
#define CHAR_OFFSET_INDEX 32
|
||||||
#define TILE_WIDTH 32
|
#define TILE_WIDTH 32
|
|
@ -6,7 +6,7 @@
|
||||||
#define GBA_SPRITE_ENGINE_FADE_OUT_SCENE_H
|
#define GBA_SPRITE_ENGINE_FADE_OUT_SCENE_H
|
||||||
|
|
||||||
|
|
||||||
#include <engine/Scene.h>
|
#include <libgba-sprite-engine/scene.h>
|
||||||
#include "scene_effect.h"
|
#include "scene_effect.h"
|
||||||
|
|
||||||
class FadeOutScene : public SceneEffect {
|
class FadeOutScene : public SceneEffect {
|
|
@ -5,14 +5,14 @@
|
||||||
#ifndef GBA_SPRITE_ENGINE_SCENE_EFFECT_H
|
#ifndef GBA_SPRITE_ENGINE_SCENE_EFFECT_H
|
||||||
#define 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 {
|
class SceneEffect {
|
||||||
protected:
|
protected:
|
||||||
// WHY no reference? Scene& operator= is implicitly deleted and no intentions to use that
|
// WHY no reference? Scene& operator= is implicitly deleted and no intentions to use that
|
||||||
Scene* sceneToAffect;
|
scene* sceneToAffect;
|
||||||
public:
|
public:
|
||||||
void setSceneToAffect(Scene* scene) { sceneToAffect = scene; };
|
void setSceneToAffect(scene* scene) { sceneToAffect = scene; };
|
||||||
|
|
||||||
virtual void update() = 0;
|
virtual void update() = 0;
|
||||||
virtual bool isDone() = 0;
|
virtual bool isDone() = 0;
|
|
@ -6,18 +6,18 @@
|
||||||
#define GBA_SPRITE_ENGINE_GBAENGINE_H
|
#define GBA_SPRITE_ENGINE_GBAENGINE_H
|
||||||
|
|
||||||
|
|
||||||
#include <engine/sprites/sprite_manager.h>
|
#include <libgba-sprite-engine/sprites/sprite_manager.h>
|
||||||
#include <engine/gba/tonc_memmap.h>
|
#include <libgba-sprite-engine/gba/tonc_memmap.h>
|
||||||
#include <engine/gba/tonc_memdef.h>
|
#include <libgba-sprite-engine/gba/tonc_memdef.h>
|
||||||
#include <engine/effects/scene_effect.h>
|
#include <libgba-sprite-engine/effects/scene_effect.h>
|
||||||
#include "Scene.h"
|
#include "scene.h"
|
||||||
#include "sound_control.h"
|
#include "sound_control.h"
|
||||||
|
|
||||||
class GBAEngine {
|
class GBAEngine {
|
||||||
private:
|
private:
|
||||||
// WHY raw pointers? the engine does the transition and cleanup work itself
|
// WHY raw pointers? the engine does the transition and cleanup work itself
|
||||||
Scene* currentScene;
|
scene* currentScene;
|
||||||
Scene* sceneToTransitionTo;
|
scene* sceneToTransitionTo;
|
||||||
SceneEffect* currentEffectForTransition;
|
SceneEffect* currentEffectForTransition;
|
||||||
|
|
||||||
SpriteManager spriteManager;
|
SpriteManager spriteManager;
|
||||||
|
@ -36,8 +36,8 @@ private:
|
||||||
public:
|
public:
|
||||||
GBAEngine();
|
GBAEngine();
|
||||||
|
|
||||||
void setScene(Scene* scene);
|
void setScene(scene* scene);
|
||||||
void transitionIntoScene(Scene* scene, SceneEffect* effect);
|
void transitionIntoScene(scene* scene, SceneEffect* effect);
|
||||||
bool isTransitioning() { return currentEffectForTransition != nullptr; }
|
bool isTransitioning() { return currentEffectForTransition != nullptr; }
|
||||||
|
|
||||||
void dequeueAllSounds();
|
void dequeueAllSounds();
|
|
@ -5,8 +5,8 @@
|
||||||
#ifndef GBA_SPRITE_ENGINE_PALETTE_MANAGER_H
|
#ifndef GBA_SPRITE_ENGINE_PALETTE_MANAGER_H
|
||||||
#define GBA_SPRITE_ENGINE_PALETTE_MANAGER_H
|
#define GBA_SPRITE_ENGINE_PALETTE_MANAGER_H
|
||||||
|
|
||||||
#include <engine/gba/tonc_memmap.h>
|
#include <libgba-sprite-engine/gba/tonc_memmap.h>
|
||||||
#include <engine/gba/tonc_types.h>
|
#include <libgba-sprite-engine/gba/tonc_types.h>
|
||||||
#include "combined_palette.h"
|
#include "combined_palette.h"
|
||||||
|
|
||||||
#define PALETTE_BANK_SIZE 16
|
#define PALETTE_BANK_SIZE 16
|
|
@ -7,13 +7,13 @@
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <engine/background/background.h>
|
#include <libgba-sprite-engine/background/background.h>
|
||||||
#include "engine/sprites/sprite.h"
|
#include <libgba-sprite-engine/sprites/sprite.h>
|
||||||
#include "engine/palette/palette_manager.h"
|
#include <libgba-sprite-engine/palette/palette_manager.h>
|
||||||
|
|
||||||
class GBAEngine;
|
class GBAEngine;
|
||||||
|
|
||||||
class Scene {
|
class scene {
|
||||||
protected:
|
protected:
|
||||||
std::unique_ptr<ForegroundPaletteManager> foregroundPalette;
|
std::unique_ptr<ForegroundPaletteManager> foregroundPalette;
|
||||||
std::unique_ptr<BackgroundPaletteManager> backgroundPalette;
|
std::unique_ptr<BackgroundPaletteManager> backgroundPalette;
|
||||||
|
@ -30,8 +30,8 @@ public:
|
||||||
virtual void load() = 0;
|
virtual void load() = 0;
|
||||||
virtual void tick(u16 i) = 0;
|
virtual void tick(u16 i) = 0;
|
||||||
|
|
||||||
Scene(std::shared_ptr<GBAEngine> engine) : engine(engine) { }
|
scene(std::shared_ptr<GBAEngine> engine) : engine(engine) { }
|
||||||
virtual ~Scene() {
|
virtual ~scene() {
|
||||||
// scenes should manage their own resources - use std::unique_ptr
|
// scenes should manage their own resources - use std::unique_ptr
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
#ifndef GBA_SPRITE_ENGINE_SOUND_H
|
#ifndef GBA_SPRITE_ENGINE_SOUND_H
|
||||||
#define GBA_SPRITE_ENGINE_SOUND_H
|
#define GBA_SPRITE_ENGINE_SOUND_H
|
||||||
|
|
||||||
#include <engine/gba/tonc_types.h>
|
#include <libgba-sprite-engine/gba/tonc_types.h>
|
||||||
#include <engine/gba/tonc_memdef.h>
|
#include <libgba-sprite-engine/gba/tonc_memdef.h>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <engine/gba/tonc_memmap.h>
|
#include <libgba-sprite-engine/gba/tonc_memmap.h>
|
||||||
|
|
||||||
#define CLOCK 16777216
|
#define CLOCK 16777216
|
||||||
#define CYCLES_PER_BLANK 280806
|
#define CYCLES_PER_BLANK 280806
|
|
@ -5,7 +5,7 @@
|
||||||
#ifndef GBA_SPRITE_ENGINE_SPRITE_H
|
#ifndef GBA_SPRITE_ENGINE_SPRITE_H
|
||||||
#define 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>
|
#include <memory>
|
||||||
|
|
||||||
#define COLOR_MODE_16 0
|
#define COLOR_MODE_16 0
|
|
@ -5,7 +5,7 @@
|
||||||
#ifndef GBA_SPRITE_ENGINE_SPRITE_MANAGER_H
|
#ifndef GBA_SPRITE_ENGINE_SPRITE_MANAGER_H
|
||||||
#define 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 "sprite.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <engine/allocator.h>
|
#include <libgba-sprite-engine/allocator.h>
|
||||||
|
|
||||||
u32 voidPtrToU32(void* ptr) {
|
u32 voidPtrToU32(void* ptr) {
|
||||||
return static_cast<u32>(reinterpret_cast<intptr_t>(ptr));
|
return static_cast<u32>(reinterpret_cast<intptr_t>(ptr));
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// 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 <stdexcept>
|
||||||
#include <engine/allocator.h>
|
#include <libgba-sprite-engine/allocator.h>
|
||||||
#ifdef CODE_COMPILED_AS_PART_OF_TEST
|
#ifdef CODE_COMPILED_AS_PART_OF_TEST
|
||||||
#include <engine/gba/tonc_core_stub.h>
|
#include <libgba-sprite-engine/gba/tonc_core_stub.h>
|
||||||
#else
|
#else
|
||||||
#include <engine/gba/tonc_core.h>
|
#include <libgba-sprite-engine/gba/tonc_core.h>
|
||||||
#endif
|
#endif
|
||||||
#include <engine/background/background.h>
|
#include <libgba-sprite-engine/background/background.h>
|
||||||
#include <engine/background/text_stream.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.
|
#define TRANSPARENT_TILE_NUMBER 192 // as shown in mGBA, next "free" tile after text. Hardcoded indeed.
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// Created by Wouter Groeneveld on 28/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/gba/tonc_memmap.h>
|
#include <libgba-sprite-engine/gba/tonc_memmap.h>
|
||||||
#include <engine/palette/palette_manager.h>
|
#include <libgba-sprite-engine/palette/palette_manager.h>
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
// Created by Wouter Groeneveld on 04/08/18.
|
// 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) {
|
FadeOutScene::FadeOutScene(int speed) : timesUpdated(0), speed(speed) {
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// Created by Wouter Groeneveld on 28/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/gba/tonc_memdef.h>
|
#include <libgba-sprite-engine/gba/tonc_memdef.h>
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
#include <engine/gba_engine.h>
|
#include <libgba-sprite-engine/gba_engine.h>
|
||||||
#include <engine/allocator.h>
|
#include <libgba-sprite-engine/allocator.h>
|
||||||
|
|
||||||
std::unique_ptr<SoundControl> GBAEngine::activeChannelA;
|
std::unique_ptr<SoundControl> GBAEngine::activeChannelA;
|
||||||
std::unique_ptr<SoundControl> GBAEngine::activeChannelB;
|
std::unique_ptr<SoundControl> GBAEngine::activeChannelB;
|
||||||
|
@ -119,7 +119,7 @@ void GBAEngine::update() {
|
||||||
spriteManager.render();
|
spriteManager.render();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GBAEngine::transitionIntoScene(Scene *scene, SceneEffect* effect) {
|
void GBAEngine::transitionIntoScene(scene *scene, SceneEffect* effect) {
|
||||||
sceneToTransitionTo = scene;
|
sceneToTransitionTo = scene;
|
||||||
currentEffectForTransition = effect;
|
currentEffectForTransition = effect;
|
||||||
currentEffectForTransition->setSceneToAffect(this->currentScene);
|
currentEffectForTransition->setSceneToAffect(this->currentScene);
|
||||||
|
@ -131,7 +131,7 @@ void GBAEngine::cleanupPreviousScene() {
|
||||||
delete currentEffectForTransition;
|
delete currentEffectForTransition;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GBAEngine::setScene(Scene* scene) {
|
void GBAEngine::setScene(scene* scene) {
|
||||||
dequeueAllSounds();
|
dequeueAllSounds();
|
||||||
if(this->currentScene) {
|
if(this->currentScene) {
|
||||||
cleanupPreviousScene();
|
cleanupPreviousScene();
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
|
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
#include <engine/palette/palette_manager.h>
|
#include <libgba-sprite-engine/palette/palette_manager.h>
|
||||||
|
|
||||||
void CombinedPalette::increaseBrightness(PaletteManager& palette, int bank, int index, u32 intensity) {
|
void CombinedPalette::increaseBrightness(PaletteManager& palette, int bank, int index, u32 intensity) {
|
||||||
auto current = palette.get(bank, index);
|
auto current = palette.get(bank, index);
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#ifdef CODE_COMPILED_AS_PART_OF_TEST
|
#ifdef CODE_COMPILED_AS_PART_OF_TEST
|
||||||
#include <engine/gba/tonc_core_stub.h>
|
#include <libgba-sprite-engine/gba/tonc_core_stub.h>
|
||||||
#else
|
#else
|
||||||
#include <engine/gba/tonc_core.h>
|
#include <libgba-sprite-engine/gba/tonc_core.h>
|
||||||
#endif
|
#endif
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
#include <engine/palette/palette_manager.h>
|
#include <libgba-sprite-engine/palette/palette_manager.h>
|
||||||
|
|
||||||
const COLOR defaultPaletteData[PALETTE_MAX_SIZE] __attribute__((aligned(4))) = {
|
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,
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
// Created by Wouter Groeneveld on 07/08/18.
|
// Created by Wouter Groeneveld on 07/08/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/gba/tonc_memmap.h>
|
#include <libgba-sprite-engine/gba/tonc_memmap.h>
|
||||||
#include <engine/sound_control.h>
|
#include <libgba-sprite-engine/sound_control.h>
|
||||||
|
|
||||||
void SoundControl::accept(const void *data, int totalSamples, int ticksPerSample) {
|
void SoundControl::accept(const void *data, int totalSamples, int ticksPerSample) {
|
||||||
this->data = data;
|
this->data = data;
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// Created by Wouter Groeneveld on 28/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/gba/tonc_memdef.h>
|
#include <libgba-sprite-engine/gba/tonc_memdef.h>
|
||||||
#include <engine/gba/tonc_oam.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() {
|
void AffineSprite::identity() {
|
||||||
obj_aff_identity(this->affine.get());
|
obj_aff_identity(this->affine.get());
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <engine/gba/tonc_memdef.h>
|
#include <libgba-sprite-engine/gba/tonc_memdef.h>
|
||||||
#include <engine/background/text_stream.h>
|
#include <libgba-sprite-engine/background/text_stream.h>
|
||||||
#include <engine/sprites/sprite.h>
|
#include <libgba-sprite-engine/sprites/sprite.h>
|
||||||
|
|
||||||
Sprite::Sprite(const void *imageData, int imageSize, int x, int y, SpriteSize size)
|
Sprite::Sprite(const void *imageData, int imageSize, int x, int y, SpriteSize size)
|
||||||
: x(x), y(y), data(imageData), imageSize(imageSize),
|
: x(x), y(y), data(imageData), imageSize(imageSize),
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// Created by Wouter Groeneveld on 28/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/sprites/sprite_builder.h>
|
#include <libgba-sprite-engine/sprites/sprite_builder.h>
|
||||||
|
|
|
@ -2,11 +2,11 @@
|
||||||
// Created by Wouter Groeneveld on 26/07/18.
|
// Created by Wouter Groeneveld on 26/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/sprites/sprite_manager.h>
|
#include <libgba-sprite-engine/sprites/sprite_manager.h>
|
||||||
#include <engine/sprites/affine_sprite.h>
|
#include <libgba-sprite-engine/sprites/affine_sprite.h>
|
||||||
|
|
||||||
#include <engine/gba/tonc_core.h>
|
#include <libgba-sprite-engine/gba/tonc_core.h>
|
||||||
#include <engine/allocator.h>
|
#include <libgba-sprite-engine/allocator.h>
|
||||||
|
|
||||||
#define MAX_SPRITE_SIZE 128
|
#define MAX_SPRITE_SIZE 128
|
||||||
#define MAX_AFFINE_SIZE 31
|
#define MAX_AFFINE_SIZE 31
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// Created by Wouter Groeneveld on 28/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/Scene.h>
|
#include <libgba-sprite-engine/scene.h>
|
||||||
#include <engine/sprites/sprite_builder.h>
|
#include <libgba-sprite-engine/sprites/sprite_builder.h>
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <engine/allocator.h>
|
#include <libgba-sprite-engine/allocator.h>
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <engine/background/text.h>
|
#include <libgba-sprite-engine/background/text.h>
|
||||||
#include "real_data.h"
|
#include "real_data.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
// Created by Wouter Groeneveld on 04/08/18.
|
// 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"
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
class SomePaletteManager : public PaletteManager {
|
class SomePaletteManager : public PaletteManager {
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
// Created by Wouter Groeneveld on 28/07/18.
|
// Created by Wouter Groeneveld on 28/07/18.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include <engine/Scene.h>
|
#include <libgba-sprite-engine/scene.h>
|
||||||
#include <engine/sprites/sprite_builder.h>
|
#include <libgba-sprite-engine/sprites/sprite_builder.h>
|
||||||
#include <engine/gba_engine.h>
|
#include <libgba-sprite-engine/gba_engine.h>
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
class SceneSuite : public ::testing::Test {
|
class SceneSuite : public ::testing::Test {
|
||||||
|
@ -17,12 +17,12 @@ protected:
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
class SomeScene : public Scene {
|
class SomeScene : public scene {
|
||||||
private:
|
private:
|
||||||
std::unique_ptr<Sprite> someSprite1;
|
std::unique_ptr<Sprite> someSprite1;
|
||||||
std::unique_ptr<Sprite> someSprite2;
|
std::unique_ptr<Sprite> someSprite2;
|
||||||
public:
|
public:
|
||||||
SomeScene() : Scene(nullptr) { };
|
SomeScene() : scene(nullptr) { };
|
||||||
std::vector<Sprite *> sprites() override {
|
std::vector<Sprite *> sprites() override {
|
||||||
return {
|
return {
|
||||||
someSprite1.get(), someSprite2.get()
|
someSprite1.get(), someSprite2.get()
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
#include <engine/sprites/sprite.h>
|
#include <libgba-sprite-engine/sprites/sprite.h>
|
||||||
#include <engine/sprites/sprite_builder.h>
|
#include <libgba-sprite-engine/sprites/sprite_builder.h>
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
const u32 kul_data [] = {
|
const u32 kul_data [] = {
|
||||||
|
|
Loading…
Reference in New Issue