Fix inconsistent EOL
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
#pragma once
|
||||
#include <FontWriter/Type/types.hpp>
|
||||
#include <FontWriter/font_writer.hpp>
|
||||
|
||||
namespace FontWriter {
|
||||
using namespace JabyEngine;
|
||||
|
||||
extern Wiggle wiggle;
|
||||
extern JabyEngine::FontWriter new_font_writer;
|
||||
extern JabyEngine::FontWriter bios_font_writer;
|
||||
|
||||
void setup();
|
||||
Cursor update(const GPU::PositionI16& start);
|
||||
#pragma once
|
||||
#include <FontWriter/Type/types.hpp>
|
||||
#include <FontWriter/font_writer.hpp>
|
||||
|
||||
namespace FontWriter {
|
||||
using namespace JabyEngine;
|
||||
|
||||
extern Wiggle wiggle;
|
||||
extern JabyEngine::FontWriter new_font_writer;
|
||||
extern JabyEngine::FontWriter bios_font_writer;
|
||||
|
||||
void setup();
|
||||
Cursor update(const GPU::PositionI16& start);
|
||||
}
|
@@ -1,50 +1,50 @@
|
||||
#pragma once
|
||||
#include "font_writer.hpp"
|
||||
#include <FontWriter/font_writer.hpp>
|
||||
#include <PSX/Timer/frame_timer.hpp>
|
||||
|
||||
namespace Menu {
|
||||
using namespace JabyEngine;
|
||||
|
||||
class SimpleMenu {
|
||||
public:
|
||||
struct Entry {
|
||||
const char* name;
|
||||
};
|
||||
|
||||
typedef void (*Callback)(uint32_t selection);
|
||||
|
||||
private:
|
||||
Callback selection_callback;
|
||||
const Entry* entries;
|
||||
size_t size;
|
||||
uint8_t cur_selection;
|
||||
|
||||
public:
|
||||
void setup(Callback callback, const Entry* entries, size_t size);
|
||||
|
||||
template<size_t N>
|
||||
void setup(Callback callback, const Entry (&entries)[N]) {
|
||||
SimpleMenu::setup(callback, entries, N);
|
||||
}
|
||||
|
||||
void update(JabyEngine::FontWriter& font_writer, Cursor& cursor, const GPU::PositionI16& start);
|
||||
};
|
||||
|
||||
class BackMenu {
|
||||
private:
|
||||
JabyEngine::FontWriter* font_writer;
|
||||
SimpleTimer<uint32_t> timeout;
|
||||
bool waiting;
|
||||
|
||||
public:
|
||||
void setup(JabyEngine::FontWriter* font_writer);
|
||||
void reset() {
|
||||
this->timeout.reset();
|
||||
this->waiting = false;
|
||||
}
|
||||
|
||||
bool update(const GPU::PositionI16& position, bool auto_clear = true);
|
||||
void render();
|
||||
};
|
||||
#pragma once
|
||||
#include "font_writer.hpp"
|
||||
#include <FontWriter/font_writer.hpp>
|
||||
#include <PSX/Timer/frame_timer.hpp>
|
||||
|
||||
namespace Menu {
|
||||
using namespace JabyEngine;
|
||||
|
||||
class SimpleMenu {
|
||||
public:
|
||||
struct Entry {
|
||||
const char* name;
|
||||
};
|
||||
|
||||
typedef void (*Callback)(uint32_t selection);
|
||||
|
||||
private:
|
||||
Callback selection_callback;
|
||||
const Entry* entries;
|
||||
size_t size;
|
||||
uint8_t cur_selection;
|
||||
|
||||
public:
|
||||
void setup(Callback callback, const Entry* entries, size_t size);
|
||||
|
||||
template<size_t N>
|
||||
void setup(Callback callback, const Entry (&entries)[N]) {
|
||||
SimpleMenu::setup(callback, entries, N);
|
||||
}
|
||||
|
||||
void update(JabyEngine::FontWriter& font_writer, Cursor& cursor, const GPU::PositionI16& start);
|
||||
};
|
||||
|
||||
class BackMenu {
|
||||
private:
|
||||
JabyEngine::FontWriter* font_writer;
|
||||
SimpleTimer<uint32_t> timeout;
|
||||
bool waiting;
|
||||
|
||||
public:
|
||||
void setup(JabyEngine::FontWriter* font_writer);
|
||||
void reset() {
|
||||
this->timeout.reset();
|
||||
this->waiting = false;
|
||||
}
|
||||
|
||||
bool update(const GPU::PositionI16& position, bool auto_clear = true);
|
||||
void render();
|
||||
};
|
||||
}
|
@@ -1,35 +1,35 @@
|
||||
#pragma once
|
||||
#include "../../include/asset_mgr.hpp"
|
||||
#include <PSX/GPU/make_gpu_primitives.hpp>
|
||||
#include <PSX/Timer/frame_timer.hpp>
|
||||
|
||||
namespace object {
|
||||
using namespace JabyEngine;
|
||||
|
||||
class Paco {
|
||||
private:
|
||||
static constexpr auto Size = Make::SizeI16(120, 128);
|
||||
static const GPU::Color24 Colors[];
|
||||
|
||||
GPU::TexPage::Linked tex_page;
|
||||
GPU::SPRT::Linked sprite;
|
||||
SimpleTimer<uint8_t> timer;
|
||||
uint8_t color_idx;
|
||||
|
||||
public:
|
||||
constexpr Paco() :
|
||||
tex_page(Make::TexPage(Make::PositionU16(
|
||||
Assets::Main::PacoTIM.get_texture_x(), Assets::Main::PacoTIM.get_texture_y()),
|
||||
GPU::TextureColorMode::clut4).linked()),
|
||||
sprite(Make::SPRT(
|
||||
Make::AreaI16(Make::PositionI16(GPU::Display::Width - Size.width, GPU::Display::Height - Size.height), Size),
|
||||
Make::OffsetPageWithClut(Make::PageOffset(0, 0), Make::PageClut(Assets::Main::PacoTIM.get_clut_x(), Assets::Main::PacoTIM.get_clut_y())),
|
||||
GPU::Color24::Blue()).linked()),
|
||||
timer(),
|
||||
color_idx(0) {}
|
||||
|
||||
void setup();
|
||||
void update();
|
||||
void render();
|
||||
};
|
||||
#pragma once
|
||||
#include "../../include/asset_mgr.hpp"
|
||||
#include <PSX/GPU/make_gpu_primitives.hpp>
|
||||
#include <PSX/Timer/frame_timer.hpp>
|
||||
|
||||
namespace object {
|
||||
using namespace JabyEngine;
|
||||
|
||||
class Paco {
|
||||
private:
|
||||
static constexpr auto Size = Make::SizeI16(120, 128);
|
||||
static const GPU::Color24 Colors[];
|
||||
|
||||
GPU::TexPage::Linked tex_page;
|
||||
GPU::SPRT::Linked sprite;
|
||||
SimpleTimer<uint8_t> timer;
|
||||
uint8_t color_idx;
|
||||
|
||||
public:
|
||||
constexpr Paco() :
|
||||
tex_page(Make::TexPage(Make::PositionU16(
|
||||
Assets::Main::PacoTIM.get_texture_x(), Assets::Main::PacoTIM.get_texture_y()),
|
||||
GPU::TextureColorMode::clut4).linked()),
|
||||
sprite(Make::SPRT(
|
||||
Make::AreaI16(Make::PositionI16(GPU::Display::Width - Size.width, GPU::Display::Height - Size.height), Size),
|
||||
Make::OffsetPageWithClut(Make::PageOffset(0, 0), Make::PageClut(Assets::Main::PacoTIM.get_clut_x(), Assets::Main::PacoTIM.get_clut_y())),
|
||||
GPU::Color24::Blue()).linked()),
|
||||
timer(),
|
||||
color_idx(0) {}
|
||||
|
||||
void setup();
|
||||
void update();
|
||||
void render();
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user