jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Remove primitive support types constructor

This commit is contained in:
Jaby Blubb 2023-10-03 09:52:04 +02:00
parent 765cd539fe
commit 2c4583c8d7
7 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/PoolBox/application/src/FontWriter/font_writer.cpp
View File

@ -24,7 +24,7 @@ namespace FontWriter {
for(auto& single_char : this->text_buffer) {
single_char.set_link_identitiy();
single_char->set_identitiy();
single_char->clut = GPU::PageClut(Assets::FontTIM.get_clut_x(), Assets::FontTIM.get_clut_y());
single_char->clut = GPU::PageClut::create(Assets::FontTIM.get_clut_x(), Assets::FontTIM.get_clut_y());
}
}

2
examples/PoolBox/application/src/Objects/paco.hpp
View File

@ -26,7 +26,7 @@ namespace object {
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({0, 100}, {120, 128}),
GPU::PagePositionClut({0, 0}, GPU::PageClut(TIM.get_clut_x(), TIM.get_clut_y())),
GPU::PagePositionClut({0, 0}, GPU::PageClut::create(TIM.get_clut_x(), TIM.get_clut_y())),
GPU::Color24::Blue()).linked()),
timer(),
color_idx(0) {}

8
examples/PoolBox/application/src/Overlay/GPUTests/gpu_tests.cpp
View File

@ -16,13 +16,13 @@ using namespace JabyEngine;
// Some default values for the objects
static constexpr auto TriangleColor = GPU::Color24(0x0, 0xFF, 0xFF);
static constexpr auto TriangleArea = GPU::AreaI16({0, 0}, {64, 64});
static constexpr auto TriangleTPage = GPU::TPage(320, 0, GPU::SemiTransparency::B_Half_add_F_Half, GPU::TexturePageColor::$4bit);
static constexpr auto TriangleClut = GPU::PageClut(320, 511);
static constexpr auto TriangleTPage = GPU::TPage::create(320, 0, GPU::SemiTransparency::B_Half_add_F_Half, GPU::TexturePageColor::$4bit);
static constexpr auto TriangleClut = GPU::PageClut::create(320, 511);
static constexpr auto RectangleColor = GPU::Color24(0x80, 0x80, 0xFF);
static constexpr auto RectangleArea = GPU::AreaI16({0, TriangleArea.size.height}, {80, 80});
static constexpr auto RectangleTPage = GPU::TPage(320, 256, GPU::SemiTransparency::B_Half_add_F_Half, GPU::TexturePageColor::$4bit);
static constexpr auto RectangleClut = GPU::PageClut(320, 510);
static constexpr auto RectangleTPage = GPU::TPage::create(320, 256, GPU::SemiTransparency::B_Half_add_F_Half, GPU::TexturePageColor::$4bit);
static constexpr auto RectangleClut = GPU::PageClut::create(320, 510);
static constexpr auto LineColor = GPU::Color24(0xFF, 0x0, 0x0);

2
include/PSX/GPU/Primitives/primitive_line_types.hpp
View File

@ -15,7 +15,7 @@ namespace JabyEngine {
static constexpr auto SingleLine = !PolyLine;
static constexpr LineCode create() {
return LineCode(CmdValue);
return CodeBase<LineCode>::create(CmdValue);
}
};

2
include/PSX/GPU/Primitives/primitive_poly_types.hpp
View File

@ -15,7 +15,7 @@ namespace JabyEngine {
static constexpr auto TriVertics = !QuadVertics;
static constexpr PolyCode create() {
return PolyCode(CmdValue);
return CodeBase<PolyCode>::create(CmdValue);
}
};

2
include/PSX/GPU/Primitives/primitive_rectangle_types.hpp
View File

@ -23,7 +23,7 @@ namespace JabyEngine {
static constexpr auto Size = BitRange::from_to(27 - BitCorrection, 28 - BitCorrection);
static constexpr RectCode create() {
return RectCode(CmdValue);
return CodeBase<RectCode>::create(CmdValue);
}
};

20
include/PSX/GPU/Primitives/primitive_support_types.hpp
View File

@ -23,10 +23,12 @@ namespace JabyEngine {
static constexpr auto NoBlendTexture = Bit(24 - BitCorrection);
static constexpr auto BlendTexture = !NoBlendTexture;
constexpr CodeBase() = default;
constexpr CodeBase(uint8_t value) : value(bit::value::set_normalized(0u, CmdID.with(value))) {
static constexpr T create(uint8_t value) {
return T{bit::value::set_normalized<uint8_t>(0u, CmdID.with(value))};
}
constexpr CodeBase(const T& code) : value(code.value) {
static constexpr T create(const T& code) {
return CodeBase::create(code.value);
}
constexpr T& set(Bit bit) {
@ -67,10 +69,10 @@ namespace JabyEngine {
}
struct PageClut {
uint16_t value = 0;
uint16_t value;
constexpr PageClut() = default;
constexpr PageClut(uint16_t x, uint16_t y) : value((y << 6) | ((x >> 4) & 0x3f)) {
static constexpr PageClut create(uint16_t x, uint16_t y) {
return PageClut{static_cast<uint16_t>((y << 6) | ((x >> 4) & 0x3f))};
}
};
@ -80,10 +82,10 @@ namespace JabyEngine {
static constexpr auto SemiTransparency = BitRange::from_to(5, 6);
static constexpr auto TextureClut = BitRange::from_to(7, 8);
uint16_t value = 0;
uint16_t value;
constexpr TPage() = default;
constexpr TPage(uint16_t x, uint16_t y, ::JabyEngine::GPU::SemiTransparency transparency, TexturePageColor clut_color) : value(TexturePageX.as_value(x >> 6) | TexturePageY.as_value(y >> 8) | SemiTransparency.as_value(static_cast<uint16_t>(transparency)) | TextureClut.as_value(static_cast<uint16_t>(clut_color))) {
static constexpr TPage create(uint16_t x, uint16_t y, ::JabyEngine::GPU::SemiTransparency transparency, TexturePageColor clut_color) {
return TPage{static_cast<uint16_t>(TexturePageX.as_value(x >> 6) | TexturePageY.as_value(y >> 8) | SemiTransparency.as_value(static_cast<uint16_t>(transparency)) | TextureClut.as_value(static_cast<uint16_t>(clut_color)))};
}
};
}