Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
3 changed files with 48 additions and 45 deletions
Showing only changes of commit 950e04ddb7 - Show all commits

View File

@ -1,10 +1,10 @@
{
"slot_0": {
"timer_tests": {
"pattern": "bin/*/src/Overlay/TimerTests/*.o"
},
"gpu_tests": {
"pattern": "bin/*/src/Overlay/GPUTests/*.o"
}
}
{
"slot_0": {
"timer_tests": {
"pattern": "bin/*/src/Overlay/TimerTests2/*.o"
},
"gpu_tests": {
"pattern": "bin/*/src/Overlay/GPUTests/*.o"
}
}
}

View File

@ -1,37 +1,36 @@
#pragma once
#include <PSX/File/Processor/cd_file_processor.hpp>
#include <PSX/GPU/gpu.hpp>
#include <PSX/Timer/frame_timer.hpp>
namespace object {
using namespace JabyEngine;
class Paco {
public:
static constexpr auto TIM = SimpleTIM(896, 0, 960, 510);
private:
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(GPU::TexPage::create(GPU::PositionU16::create(
TIM.get_texture_x(), TIM.get_texture_y()),
GPU::TexturePageColor::$4bit).linked()),
sprite(GPU::SPRT::create(
#pragma GCC warning "This pic used to be 122px (file size) and every tool would except it - however the display would be corrupt"
GPU::AreaI16::create(GPU::PositionI16::create(0, 100), GPU::SizeI16::create(120, 128)),
GPU::PagePositionClut(GPU::PagePosition::create(0, 0), GPU::PageClut::create(TIM.get_clut_x(), TIM.get_clut_y())),
GPU::Color24::Blue()).linked()),
timer(),
color_idx(0) {}
void setup();
void update();
void render();
};
#pragma once
#include <PSX/File/Processor/cd_file_processor.hpp>
#include <PSX/GPU/gpu.hpp>
#include <PSX/Timer/frame_timer.hpp>
namespace object {
using namespace JabyEngine;
class Paco {
public:
static constexpr auto TIM = SimpleTIM(896, 0, 960, 510);
private:
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(GPU::TexPage::create(GPU::PositionU16::create(
TIM.get_texture_x(), TIM.get_texture_y()),
GPU::TexturePageColor::$4bit).linked()),
sprite(GPU::SPRT::create(
GPU::AreaI16::create(GPU::PositionI16::create(0, 100), GPU::SizeI16::create(120, 128)),
GPU::PagePositionClut(GPU::PagePosition::create(0, 0), GPU::PageClut::create(TIM.get_clut_x(), TIM.get_clut_y())),
GPU::Color24::Blue()).linked()),
timer(),
color_idx(0) {}
void setup();
void update();
void render();
};
}

View File

@ -0,0 +1,4 @@
#pragma once
namespace Overlay {
void mesaure_busy_loop();
}