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

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +20 -20
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit df75784ba7 - Show all commits

21
examples/PoolBox/application/src/Overlay/ControllerTest/controller_state.cpp
View File

@ -5,25 +5,6 @@ namespace ControllerTest {
using DigitalButton = Periphery::AnalogeController::Button;
using namespace JabyEngine;
// This should go to JabyEngine eventually
template<typename T>
static GPU::Link* link_array(GPU::Link* last_prim, T* elements, size_t length) {
for(size_t n = 0; n < length; n++) {
last_prim->concat(elements[n]);
last_prim = &elements[n];
}
last_prim->terminate();
return last_prim;
}
template<typename T, size_t N>
static GPU::Link* link_array(GPU::Link* last_prim, T(&elements)[N]) {
return link_array(last_prim, elements, N);
}
// --------------------------------------------------------------------------------------------------------------------------
static void set_active(GPU::SPRT_16::Linked& sprt, bool is_active) {
sprt->tex_offset.y = is_active ? 16 : 0;
}
@ -71,7 +52,7 @@ namespace ControllerTest {
void ControllerState :: setup() {
for(size_t n = 0; n < 2; n++) {
link_array(link_array(&this->tex_page[n], this->buttons[n]), this->arrows[n]);
GPU::LinkHelper::link_array(GPU::LinkHelper::link_array(&this->tex_page[n], this->buttons[n]), this->arrows[n]);
}
}

18
include/PSX/GPU/Primitives/linked_elements.hpp
View File

@ -88,5 +88,23 @@ namespace JabyEngine {
}
};
}
namespace LinkHelper {
template<typename T>
static Link* link_array(Link* last_prim, T* elements, size_t length) {
for(size_t n = 0; n < length; n++) {
last_prim->concat(elements[n]);
last_prim = &elements[n];
}
last_prim->terminate();
return last_prim;
}
template<typename T, size_t N>
static Link* link_array(Link* last_prim, T(&elements)[N]) {
return link_array(last_prim, elements, N);
}
}
}
}

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

@ -70,6 +70,7 @@ namespace JabyEngine {
Body points[N];
Termination end;
// Could also be none const in the future
template<typename T = Body>
constexpr typename enable_if<is_same<T, Vertex>::value, Vertex>::type operator[](size_t idx) const {
if(idx == 0) {