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

Prepare for textured sprites; better integration of GPU types

Browse Source
This commit is contained in:
Jaby
2023-05-31 22:29:19 +02:00
parent 4136cca2e5
commit 299ba7a9d6
5 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,21 @@ namespace JabyEngine {
constexpr RECT_F(const Color24& color, const Vertex& position) : color(color), code(IdentityCode), position(position) {
}
};
template<typename RectCode::Size Size>
struct RECT_T : public RectCodeInterface<RECT_T<Size>> {
typedef RECT_T<Size>::Code Code;
static constexpr auto IdentityCode = Code(RECT_F<Size>::IdentityCode).set(Code::Textured);
Color24 color;
Code code;
Vertex position;
PagePosition page;
constexpr RECT_T() = default;
constexpr RECT_T(const Color24& color, const Vertex& position, const PagePosition& page) : color(color), code(IdentityCode), position(position), page(page) {
}
};
}
typedef internal::RECT_F<internal::RectCode::Size::Pixel1x1> RECT_F1;
@@ -49,7 +64,18 @@ namespace JabyEngine {
Vertex position_bottom_right;
constexpr RECT_FVAR() = default;
constexpr RECT_FVAR(const Color24& color, const AreaI16& area) : RECT_F(color, area.position), position_bottom_right(area.position.move(area.size.width, area.size.height)) {
constexpr RECT_FVAR(const Color24& color, const AreaI16& area) : RECT_F(color, area.position), position_bottom_right(area.get_bottom_left()) {
}
};
typedef internal::RECT_T<internal::RectCode::Size::Pixel1x1> RECT_T1;
typedef internal::RECT_T<internal::RectCode::Size::Sprite8x8> RECT_T8;
typedef internal::RECT_T<internal::RectCode::Size::Sprite16x16> RECT_T16;
struct RECT_TVAR : public internal::RECT_T<internal::RectCode::Size::Variable> {
Vertex position_bottom_right;
constexpr RECT_TVAR() = default;
constexpr RECT_TVAR(const Color24& color, const AreaI16& area, const PagePosition& page) : RECT_T(color, area.position, page), position_bottom_right(area.get_bottom_left()) {
}
};
@@ -58,6 +84,11 @@ namespace JabyEngine {
__jaby_engine_declare_render_primitive(RECT_F8);
__jaby_engine_declare_render_primitive(RECT_F16);
__jaby_engine_declare_render_primitive(RECT_FVAR);
__jaby_engine_declare_render_primitive(RECT_T1);
__jaby_engine_declare_render_primitive(RECT_T8);
__jaby_engine_declare_render_primitive(RECT_T16);
__jaby_engine_declare_render_primitive(RECT_TVAR);
}
}
}

4
include/PSX/GPU/gpu_types.hpp
View File

@@ -142,6 +142,10 @@ namespace JabyEngine {
}
constexpr Area(T position_x, T position_y, T size_width, T size_height) : position{position_x, position_y}, size{size_width, size_height} {
}
constexpr Position<T> get_bottom_left() const {
return this->position.move(this->size.width, this->size.height);
}
};
// Type used for primitives