fix resize sym

need to find a way to handle mtx stuff in the gfx driver or another way

CMakeLists.txt

@@ -52,6 +52,7 @@ set(PD_SOURCES
     source/lithium/drawlist.cpp
     source/lithium/font.cpp
     source/lithium/math.cpp
+    source/lithium/pools.cpp
 
     # UI7
     source/ui7/io.cpp

backends/CMakeLists.txt

@@ -9,6 +9,7 @@ option(PD_ENABLE_CITRO3D "Enable Citro3D Support (3DS)" OFF)
 option(PD_ENABLE_VULKAN "Not implemented yet" OFF)
 option(PD_ENABLE_HID_GLFW "Enable GLFW Input Driver" ON)
 option(PD_ENABLE_HID_NX "Enable NX Input Driver" OFF)
+option(PD_ENABLE_HID3DS "Enable 3ds Input Driver" OFF)
 
 if(NOT WIN32) # cause we are not on windows...
     set(PD_ENABLE_DIRECTX9 OFF)
@@ -21,6 +22,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
     set(PD_ENABLE_CITRO3D ON)
     set(PD_ENABLE_HID_GLFW OFF)
     set(PD_ENABLE_HID_NX OFF)
+    set(PD_ENABLE_HID3DS ON)
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "NintendoSwitch")
     set(PD_ENABLE_OPENGL2 OFF)
     set(PD_ENABLE_OPENGL3 ON)
@@ -36,6 +38,7 @@ add_library(pd-system STATIC
     ${CMAKE_CURRENT_SOURCE_DIR}/source/gfx_opengl3.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/source/gfx_directx9.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/source/gfx_citro3d.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/source/hid_3ds.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/source/hid_glfw.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/source/hid_nx.cpp
 )
@@ -64,6 +67,7 @@ target_compile_definitions(pd-system
     $<$<BOOL:${PD_ENABLE_CITRO3D}>:PD_ENABLE_CITRO3D>
     $<$<BOOL:${PD_ENABLE_HID_GLFW}>:PD_ENABLE_HID_GLFW>
     $<$<BOOL:${PD_ENABLE_HID_NX}>:PD_ENABLE_HID_NX>
+    $<$<BOOL:${PD_ENABLE_HID3DS}>:PD_ENABLE_HID3DS>
 )
 
 # Palladium

backends/include/pd_system/gfx_citro3d.hpp

@@ -29,6 +29,7 @@ class GfxCitro3D : public GfxDriverBase<GfxCitro3DConfig> {
       TextureFilter filter = TextureFilter::Linear) override;
   void DeleteTexture(const Li::Texture& tex) override;
   void UploadPools() override;
+  void ClipRect() override;
 
  private:
   struct Impl;

backends/include/pd_system/gfx_directx9.hpp

@@ -29,6 +29,7 @@ class GfxDirectX9 : public GfxDriverBase<GfxDirectX9Config> {
       TextureFilter filter = TextureFilter::Linear) override;
   void DeleteTexture(const Li::Texture& tex) override;
   void UploadPools() override;
+  void ClipRect() override;
 
  private:
   struct Impl;

backends/include/pd_system/gfx_opengl2.hpp

@@ -28,6 +28,7 @@ class GfxOpenGL2 : public GfxDriverBase<GfxOpenGL2Config> {
       TextureFilter filter = TextureFilter::Linear) override;
   void DeleteTexture(const Li::Texture& tex) override;
   void UploadPools() override;
+  void ClipRect() override;
 
  private:
   void pSetupShaderAttribs(u32 shader);

backends/include/pd_system/gfx_opengl3.hpp

@@ -28,6 +28,7 @@ class GfxOpenGL3 : public GfxDriverBase<GfxOpenGL3Config> {
       TextureFilter filter = TextureFilter::Linear) override;
   void DeleteTexture(const Li::Texture& tex) override;
   void UploadPools() override;
+  void ClipRect() override;
 
  private:
   u32 pShader = 0;

backends/include/pd_system/hid_3ds.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <pd/drivers/hid.hpp>
+
+namespace PD {
+class Hid3DS : public HidDriver {
+ public:
+  Hid3DS();
+  ~Hid3DS();
+
+  void Update() override;
+
+ private:
+  struct Impl;
+  Impl* impl;
+};
+}  // namespace PD

backends/include/pdsystem

@@ -7,4 +7,5 @@
 #include <pd_system/gfx_opengl3.hpp>
 
 // Hid
+#include <pd_system/hid_3ds.hpp>
 #include <pd_system/hid_glfw.hpp>

backends/source/gfx_citro3d.cpp

@@ -141,6 +141,9 @@ void GfxCitro3D::SysInit() {
   PDLOG("GfxCitro3D::SysInit();");
   impl = new Impl();
   Flags |= PDGfxBackendFlags_FlipUV_Y;
+  Flags |= PDGfxBackendFlags_HasClipRect;
+  Flags |= PDGfxBackendFlags_ReqPow2;
+  Flags |= PDGfxBackendFlags_ApproxSDF;
   impl->pShaderRaw = Pica::AssembleCode(LIShaderCTR);
   impl->pCode = DVLB_ParseFile((uint32_t*)impl->pShaderRaw.data(),
                                impl->pShaderRaw.size());
@@ -264,6 +267,14 @@ void GfxCitro3D::UploadPools() {
   BufInfo_Init(buf);
   BufInfo_Add(buf, GetVertexBufPtr(0), sizeof(Li::Vertex), 3, 0x210);
 }
+
+void GfxCitro3D::ClipRect() {
+  // This is so cursed but it works
+  C3D_SetScissor(CurrentHasClip ? GPU_SCISSOR_NORMAL : GPU_SCISSOR_DISABLE,
+                 ViewPort.y - CurrentClip.w - CurrentClip.y,
+                 ViewPort.x - CurrentClip.z - CurrentClip.x,
+                 ViewPort.y - CurrentClip.y, ViewPort.x - CurrentClip.x);
+}
 }  // namespace PD
 #else
 namespace PD {
@@ -283,5 +294,6 @@ Li::Texture GfxCitro3D::LoadTexture(const std::vector<PD::u8>& pixels, int w,
 }
 void GfxCitro3D::DeleteTexture(const Li::Texture& tex) {}
 void GfxCitro3D::UploadPools() {}
+void GfxCitro3D::ClipRect() {}
 }  // namespace PD
 #endif

backends/source/gfx_directx9.cpp

@@ -112,6 +112,7 @@ void GfxDirectX9::SysInit() {
     }
     if (psBlob) psBlob->Release();
     if (errBlob) errBlob->Release();
+    Flags |= PDGfxBackendFlags_HasClipRect;
   } else {
     PDERR(
         "GfxDirectX9::SysInit Error: pDevice is not set!\nYOu need to include "
@@ -175,6 +176,10 @@ void GfxDirectX9::SysReset() {
   impl->Device->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
   impl->Device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
   impl->Device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
+
+  impl->Device->SetSamplerState(0, D3DSAMP_MINFILTER, D3DTEXF_LINEAR);
+  impl->Device->SetSamplerState(0, D3DSAMP_MAGFILTER, D3DTEXF_LINEAR);
+  impl->Device->SetSamplerState(0, D3DSAMP_MIPFILTER, D3DTEXF_LINEAR);
 }
 
 Li::Texture GfxDirectX9::LoadTexture(const std::vector<PD::u8>& pixels, int w,
@@ -257,30 +262,45 @@ void GfxDirectX9::UploadPools() {
   if (!impl->VBO || impl->VertexBufferSize != GetVertexPoolSize()) {
     if (impl->VBO) impl->VBO->Release();
     impl->Device->CreateVertexBuffer(GetVertexPoolSize() * sizeof(Li::Vertex),
-                                     D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0,
-                                     D3DPOOL_DEFAULT, &impl->VBO, nullptr);
+                                     D3DUSAGE_WRITEONLY, 0, D3DPOOL_MANAGED,
+                                     &impl->VBO, nullptr);
     impl->VertexBufferSize = GetVertexPoolSize();
   }
 
   if (!impl->IBO || impl->IndexBufferSize != GetIndexPoolSize()) {
     if (impl->IBO) impl->IBO->Release();
-    impl->Device->CreateIndexBuffer(
-        GetIndexPoolSize() * sizeof(u16), D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY,
-        D3DFMT_INDEX16, D3DPOOL_DEFAULT, &impl->IBO, nullptr);
+    impl->Device->CreateIndexBuffer(GetIndexPoolSize() * sizeof(u16),
+                                    D3DUSAGE_WRITEONLY, D3DFMT_INDEX16,
+                                    D3DPOOL_MANAGED, &impl->IBO, nullptr);
     impl->IndexBufferSize = GetIndexPoolSize();
   }
 
   void* vptr;
-  impl->VBO->Lock(0, 0, &vptr, D3DLOCK_DISCARD);
+  impl->VBO->Lock(0, 0, &vptr, 0);
   memcpy(vptr, GetVertexBufPtr(0),
          GetVertexPoolSize() * sizeof(PD::Li::Vertex));
   impl->VBO->Unlock();
 
   void* iptr;
-  impl->IBO->Lock(0, 0, &iptr, D3DLOCK_DISCARD);
+  impl->IBO->Lock(0, 0, &iptr, 0);
   memcpy(iptr, GetIndexBufPtr(0), GetIndexPoolSize() * sizeof(u16));
   impl->IBO->Unlock();
 }
+
+void GfxDirectX9::ClipRect() {
+  if (CurrentHasClip) {
+    RECT r;
+    r.left = CurrentClip.x;
+    r.top = CurrentClip.y;
+    r.right = CurrentClip.x + CurrentClip.z;
+    r.bottom = CurrentClip.y + CurrentClip.w;
+
+    impl->Device->SetScissorRect(&r);
+    impl->Device->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE);
+  } else {
+    impl->Device->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE);
+  }
+}
 }  // namespace PD
 #else
 namespace PD {
@@ -300,5 +320,6 @@ Li::Texture GfxDirectX9::LoadTexture(const std::vector<PD::u8>& pixels, int w,
 }
 void GfxDirectX9::DeleteTexture(const Li::Texture& tex) {}
 void GfxDirectX9::UploadPools() {}
+void GfxDirectX9::ClipRect() {}
 }  // namespace PD
 #endif

backends/source/gfx_opengl2.cpp

@@ -73,6 +73,7 @@ void GfxOpenGL2::pSetupShaderAttribs(u32 shader) {
 }
 
 void GfxOpenGL2::SysInit() {
+  Flags |= PDGfxBackendFlags_HasClipRect;
   pShader = CreateShaderProgram(pVertCode, pFragCode);
   glUseProgram(pShader);
   glGenBuffers(1, &VBO);
@@ -183,6 +184,16 @@ void GfxOpenGL2::UploadPools() {
   glBufferData(GL_ELEMENT_ARRAY_BUFFER, GetIndexPoolSize() * sizeof(u16),
                GetIndexBufPtr(0), GL_DYNAMIC_DRAW);
 }
+
+void GfxOpenGL2::ClipRect() {
+  if (CurrentHasClip) {
+    glEnable(GL_SCISSOR_TEST);
+    glScissor(CurrentClip.x, ViewPort.y - (CurrentClip.y + CurrentClip.w),
+              CurrentClip.z, CurrentClip.w);
+  } else {
+    glDisable(GL_SCISSOR_TEST);
+  }
+}
 }  // namespace PD
 #else
 namespace PD {
@@ -203,5 +214,6 @@ Li::Texture GfxOpenGL2::LoadTexture(const std::vector<PD::u8>& pixels, int w,
 void GfxOpenGL2::DeleteTexture(const Li::Texture& tex) {}
 void GfxOpenGL2::pSetupShaderAttribs(u32 shader) {}
 void GfxOpenGL2::UploadPools() {}
+void GfxOpenGL2::ClipRect() {}
 }  // namespace PD
 #endif

backends/source/gfx_opengl3.cpp

@@ -11,6 +11,7 @@
 
 namespace PD {
 void GfxOpenGL3::SysInit() {
+  Flags |= PDGfxBackendFlags_HasClipRect;
   std::string vcode = SpirvHelper::SPV2GLSL(
       std::vector<unsigned int>(
           Shaders::VertexShader,
@@ -159,6 +160,16 @@ void GfxOpenGL3::UploadPools() {
 
   glBindVertexArray(0);
 }
+
+void GfxOpenGL3::ClipRect() {
+  if (CurrentHasClip) {
+    glEnable(GL_SCISSOR_TEST);
+    glScissor(CurrentClip.x, ViewPort.y - (CurrentClip.y + CurrentClip.w),
+              CurrentClip.z, CurrentClip.w);
+  } else {
+    glDisable(GL_SCISSOR_TEST);
+  }
+}
 }  // namespace PD
 #else
 namespace PD {
@@ -178,5 +189,6 @@ Li::Texture GfxOpenGL3::LoadTexture(const std::vector<PD::u8>& pixels, int w,
 }
 void GfxOpenGL3::DeleteTexture(const Li::Texture& tex) {}
 void GfxOpenGL3::UploadPools() {}
+void GfxOpenGL3::ClipRect() {}
 }  // namespace PD
 #endif

backends/source/hid_3ds.cpp

@@ -0,0 +1,82 @@
+#include <pd_system/hid_3ds.hpp>
+#if defined(PD_ENABLE_HID3DS) && defined(__3DS__)
+#include <3ds.h>
+namespace PD {
+struct Hid3DS::Impl {
+  std::string* Text;
+  bool InTextMode = false;
+};
+
+Hid3DS::Hid3DS() : HidDriver("Hid3DS") {
+  impl = new Impl;
+
+  pFlags |= PDHidBackendFlags_HasGamepad;
+  pFlags |= PDHidBackendFlags_HasTouch;
+
+  pGamepad[KEY_A] = HidInternal::Gamepad::A;
+  pGamepad[KEY_B] = HidInternal::Gamepad::B;
+  pGamepad[KEY_X] = HidInternal::Gamepad::X;
+  pGamepad[KEY_Y] = HidInternal::Gamepad::Y;
+  pGamepad[KEY_START] = HidInternal::Gamepad::Start;
+  pGamepad[KEY_SELECT] = HidInternal::Gamepad::Select;
+  pGamepad[KEY_L] = HidInternal::Gamepad::L;
+  pGamepad[KEY_R] = HidInternal::Gamepad::R;
+  pGamepad[KEY_DUP] = HidInternal::Gamepad::DUp;
+  pGamepad[KEY_DDOWN] = HidInternal::Gamepad::DDown;
+  pGamepad[KEY_DLEFT] = HidInternal::Gamepad::DLeft;
+  pGamepad[KEY_DRIGHT] = HidInternal::Gamepad::DRight;
+  pGamepad[KEY_CPAD_UP] = HidInternal::Gamepad::CPUp;
+  pGamepad[KEY_CPAD_DOWN] = HidInternal::Gamepad::CPDown;
+  pGamepad[KEY_CPAD_LEFT] = HidInternal::Gamepad::CPLeft;
+  pGamepad[KEY_CPAD_RIGHT] = HidInternal::Gamepad::CPRight;
+  pGamepad[KEY_CSTICK_UP] = HidInternal::Gamepad::CSUp;
+  pGamepad[KEY_CSTICK_DOWN] = HidInternal::Gamepad::CSDown;
+  pGamepad[KEY_CSTICK_LEFT] = HidInternal::Gamepad::CSLeft;
+  pGamepad[KEY_CSTICK_RIGHT] = HidInternal::Gamepad::CSRight;
+  pGamepad[KEY_ZL] = HidInternal::Gamepad::ZL;
+  pGamepad[KEY_ZR] = HidInternal::Gamepad::ZR;
+  pGamepad[KEY_TOUCH] = HidInternal::Gamepad::Touch;
+}
+
+Hid3DS::~Hid3DS() { delete impl; }
+
+void Hid3DS::Update() {
+  HidDriver::Update();  // clear stats
+  hidScanInput();
+  u32 kd = hidKeysDown();
+  u32 kh = hidKeysHeld();
+  u32 ku = hidKeysUp();
+
+  for (const auto& b : pGamepad) {
+    if (b.first & kd) {
+      pGamepadEvents[0][Event::Down] |= b.second;
+    }
+    if (b.first & kh) {
+      pGamepadEvents[0][Event::Held] |= b.second;
+    }
+    if (b.first & ku) {
+      pGamepadEvents[0][Event::Up] |= b.second;
+    }
+  }
+
+  /*if (pLocked) {
+    SwapTab();
+  }*/
+  touchPosition t;
+  hidTouchRead(&t);
+  pMouse[0] = fvec2(t.px, t.py);
+}
+}  // namespace PD
+#else
+struct GLFWgamepadstate {};
+namespace PD {
+
+Hid3DS::Hid3DS() : HidDriver("Hid3DS") {}
+
+Hid3DS::~Hid3DS() {}
+
+void Hid3DS::Update() {
+  HidDriver::Update();  // clear stats
+}
+}  // namespace PD
+#endif

backends/source/hid_glfw.cpp

@@ -65,7 +65,7 @@ HidGlfw::HidGlfw(GLFWwindow* win) : HidDriver("HidGlfw") {
   }
 }
 
-HidGlfw::~HidGlfw() {}
+HidGlfw::~HidGlfw() { delete impl; }
 
 void HidGlfw::Update() {
   HidDriver::Update();  // clear stats

backends/source/hid_nx.cpp

@@ -11,7 +11,7 @@ struct HidNX::Impl {
 
 HidNX::HidNX() : HidDriver("HidNX") { impl = new Impl; }
 
-HidNX::~HidNX() {}
+HidNX::~HidNX() { delete impl; }
 
 void HidNX::Update() {
   HidDriver::Update();  // clear stats

include/pd/core/mat.hpp

@@ -56,21 +56,9 @@ struct PD_API Mat4 {
   constexpr float* Ptr() { return m.data(); }
   constexpr const float* Ptr() const { return m.data(); }
 
-  constexpr float& operator()(int row, int col) {
-#ifdef __3DS__
-    // 3ds is full reverse order iirc
-    return m[row * 4 + (3 - col)];
-#else
-    return m[col * 4 + row];
-#endif
-  }
+  constexpr float& operator()(int row, int col) { return m[col * 4 + row]; }
   constexpr float operator()(int row, int col) const {
-#ifdef __3DS__
-    // 3ds is full reverse order iirc
-    return m[row * 4 + (3 - col)];
-#else
     return m[col * 4 + row];
-#endif
   }
 
   constexpr Mat4 operator*(const Mat4& v) const {
@@ -122,21 +110,12 @@ struct PD_API Mat4 {
   constexpr static Mat4 Ortho(float l, float r, float b, float t, float n,
                               float f) {
     Mat4 ret;
-#ifdef __3DS__  // Patch to rotate the Matrix correctly
-    ret(0, 1) = 2.f / (t - b);
-    ret(0, 3) = (b + t) / (b - t);
-    ret(1, 0) = 2.f / (l - r);
-    ret(1, 3) = (l + r) / (r - l);
-    ret(2, 2) = 1.f / (n - f);
-    ret(2, 3) = 0.5f * (n + f) / (n - f) - 0.5f;
-#else
     ret(0, 0) = 2.0f / (r - l);
     ret(0, 3) = -(r + l) / (r - l);
     ret(1, 1) = 2.0f / (t - b);
     ret(1, 3) = -(t + b) / (t - b);
     ret(2, 2) = -2.0f / (f - n);
     ret(2, 3) = -(f + n) / (f - n);
-#endif
     ret(3, 3) = 1.f;
     return ret;
   }

include/pd/drivers/gfx.hpp

@@ -2,14 +2,18 @@
 
 #include <pd/core/mat.hpp>
 #include <pd/drivers/interface.hpp>
-#include <pd/lithium/command.hpp>
+#include <pd/lithium/drawlist.hpp>
+#include <pd/lithium/pools.hpp>
 #include <pd/lithium/texture.hpp>
 
 using PDGfxBackendFlags = PD::u32;
 enum PDGfxBackendFlags_ {
   PDGfxBackendFlags_None = 0,
-  PDGfxBackendFlags_FlipUV_Y = 1 << 0,   // Essential for font loading
-  PDGfxBackendFlags_WindingCW = 1 << 0,  // Use CW instead of CCW winding
+  PDGfxBackendFlags_FlipUV_Y = 1 << 0,     // Essential for font loading
+  PDGfxBackendFlags_WindingCW = 1 << 1,    // Use CW instead of CCW winding
+  PDGfxBackendFlags_HasClipRect = 1 << 2,  // Clip rects supported
+  PDGfxBackendFlags_ReqPow2 = 1 << 3,      // Tex size must be pow of 2
+  PDGfxBackendFlags_ApproxSDF = 1 << 4,  // Fake SDF for non smoothstep systems
 };
 
 namespace PD {
@@ -37,7 +41,7 @@ class PD_API GfxDriver : public DriverInterface {
     return Li::Texture();
   }
   virtual void DeleteTexture(const Li::Texture& tex) {}
-  virtual void Draw(const Pool<Li::Command>& commands) {}
+  virtual void Draw(const Li::Drawlist& commands) {}
   Li::Texture::Ptr GetWhiteTexture() { return &pWhite; }
   PDGfxBackendFlags GetFlags() { return Flags; }
 
@@ -64,6 +68,7 @@ class PD_API GfxDriver : public DriverInterface {
   virtual void SysReset() {}
   virtual void Submit(size_t count, size_t start) {}
   virtual void UploadPools() {}  // not every driver requires it
+  virtual void ClipRect() {}
   void RegisterTexture(const Li::Texture& tex);
   void UnregisterTexture(const Li::Texture& tex);
 
@@ -79,6 +84,8 @@ class PD_API GfxDriver : public DriverInterface {
   // State Variables oder so
   TextureID CurrentTex = 0;
   bool CurrentTexIsSDF = false;
+  bool CurrentHasClip = false;
+  fvec4 CurrentClip = 0;
   Mat4 Projection;
   ivec2 ViewPort;
   std::unordered_map<TextureID, Li::Texture> pTextureRegestry;
@@ -110,27 +117,72 @@ class GfxDriverBase : public GfxDriver {
     pWhite = LoadTexture(img, 16, 16);
   }
 
-  void Draw(const Pool<Li::Command>& commands) override {
+  void Draw(const Li::Drawlist& dl) override {
+    const auto& commands = dl.Data();
+    if (commands.size() == 0) return;
     pCountCommands += commands.size();
-    size_t index = 0;
+
+    size_t vtotal = dl.GetNumVertices();
+    size_t itotal = dl.GetNumIndices();
+
+    size_t start_vtx = pVtxPool.size();
+    pVtxPool.Allocate(vtotal);
+    CurrentVertex += vtotal;
+
+    size_t start_idx = pIdxPool.size();
+    pIdxPool.Allocate(itotal);
+    CurrentIndex += itotal;
+
+    size_t current_vtx = start_vtx;
+    size_t current_idx = start_idx;
+
+    const auto& vpool = Li::GetVertexPool();
+    const auto& ipool = Li::GetIndexPool();
+    /** Build Pools */
+    for (size_t i = 0; i < commands.size(); i++) {
+      const auto& cmd = commands[i];
+      if (cmd.VertexCount > 0) {
+        std::memcpy(reinterpret_cast<void*>(pVtxPool.begin() + current_vtx),
+                    vpool.begin() + cmd.FirstVertex,
+                    cmd.VertexCount * sizeof(Li::Vertex));
+      }
+      for (size_t idx = 0; idx < cmd.IndexCount; idx++) {
+        u16 local_idx = ipool[cmd.FirstIndex + idx];
+        pIdxPool[current_idx + idx] = static_cast<u16>(current_vtx + local_idx);
+      }
+      current_vtx += cmd.VertexCount;
+      current_idx += cmd.IndexCount;
+    }
+
     UploadPools();
+
+    size_t index = 0;
+    size_t ioff = start_idx;
+
     while (index < commands.size()) {
       CurrentTex = commands[index].Tex;
       CurrentTexIsSDF = commands[index].SDF;
+      CurrentHasClip = commands[index].ClipRectUsed;
+      CurrentClip = commands[index].ClipRect;
       if (!CurrentTex) {
         CurrentTex = pWhite.GetID();
       }
-      size_t startidx = commands[index].FirstIndex;
       size_t num_indices = 0;
+      ClipRect();
       while (index < commands.size() &&
              CurrentTexIsSDF == commands[index].SDF &&
              (CurrentTex == commands[index].Tex ||
-              (CurrentTex == pWhite.GetID() && commands[index].Tex == 0))) {
+              (CurrentTex == pWhite.GetID() && commands[index].Tex == 0)) &&
+             CurrentClip == commands[index].ClipRect &&
+             CurrentHasClip == commands[index].ClipRectUsed) {
         num_indices += commands[index].IndexCount;
         index++;
       }
-      Submit(num_indices, startidx);
-      pCountDrawcalls++;
+      if (num_indices > 0) {
+        Submit(num_indices, ioff);
+        ioff += num_indices;
+        pCountDrawcalls++;
+      }
     }
   }
 
@@ -210,9 +262,7 @@ class PD_API Gfx {
   static void SetViewPort(const ivec2& vp) { driver->SetViewPort(vp); }
   static void SetViewPort(int w, int h) { driver->SetViewPort(w, h); }
   static void Reset() { driver->Reset(); }
-  static void Draw(const Pool<Li::Command>& commands) {
-    driver->Draw(commands);
-  }
+  static void Draw(const Li::Drawlist& dl) { driver->Draw(dl); }
   static Li::Texture LoadTexture(const std::vector<PD::u8>& pixels, int w,
                                  int h,
                                  TextureFormat type = TextureFormat::RGBA32,

include/pd/lithium/command.hpp

@@ -28,6 +28,9 @@ class Command {
   // Todo: implement
   size_t VertexCountMax = 0;
   size_t IndexCountMax = 0;
+  // ClipRect
+  PD::fvec4 ClipRect;
+  bool ClipRectUsed = false;
 };
 }  // namespace Li
 }  // namespace PD

include/pd/lithium/drawlist.hpp

@@ -42,6 +42,22 @@ class PD_API Drawlist {
   void Copy(Drawlist& other);
   void Optimize();
   void Clear();
+  void SetLayer(int layer) { pCurrentLayer = layer; }
+  void LayerUp() { pCurrentLayer++; }
+  void LayerDown() { pCurrentLayer--; }
+  int GetLayer() const { return pCurrentLayer; }
+
+  size_t GetNumVertices() const {
+    size_t count = 0;
+    for (const auto& cmd : pCommands) count += cmd.VertexCount;
+    return count;
+  }
+
+  size_t GetNumIndices() const {
+    size_t count = 0;
+    for (const auto& cmd : pCommands) count += cmd.IndexCount;
+    return count;
+  }
 
   /** Command Allocation */
   Command& NewCommand();
@@ -112,12 +128,18 @@ class PD_API Drawlist {
   void PrimTriangle(Command& cmd, const fvec2& a, const fvec2& b,
                     const fvec2& c, const PD::Color& color);
 
+  void PushClipRect(const fvec4& r) { pClipRects.push_back(r); }
+  void PopClipRect() {
+    if (!pClipRects.empty()) pClipRects.pop_back();
+  }
+  bool HasClipRect() { return !pClipRects.empty(); }
+
  private:
   Texture pCurrentTexture;
+  int pCurrentLayer = 0;
   Pool<Command> pCommands;
   Pool<fvec2> pPath;
-  Pool<Vertex> pVertices;
-  Pool<u16> pIndices;
+  std::vector<fvec4> pClipRects;
   Font* pFont = nullptr;
   float pFontScale = 1.f;
 };

include/pd/lithium/font.hpp

@@ -56,12 +56,6 @@ class PD_API Font {
    */
   void LoadTTF(const std::vector<u8>& data, int px_height = 32,
                LiFontFlags flags = LiFontFlags_None);
-  /**
-   * Function that loads a default integrated font...
-   * This will only work if PD_LI_INCLUDE_FONTS was set
-   * on lithium build cause otherwise the font data is not included
-   */
-  void LoadDefaultFont(int id = 0, int pixel_height = 32);
   /**
    * Getter for Codepoint reference
    * @return codepoint dataholder reference

include/pd/lithium/lithium.hpp

@@ -4,4 +4,5 @@
 #include <pd/lithium/drawlist.hpp>
 #include <pd/lithium/font.hpp>
 #include <pd/lithium/math.hpp>
+#include <pd/lithium/pools.hpp>
 #include <pd/lithium/vertex.hpp>

include/pd/lithium/pools.hpp

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <pd/core/core.hpp>
+#include <pd/lithium/vertex.hpp>
+
+namespace PD {
+namespace Li {
+PD_API PD::Pool<Vertex>& GetVertexPool();
+PD_API PD::Pool<u16>& GetIndexPool();
+PD_API void ResetPools();
+}  // namespace Li
+}  // namespace PD

include/pd/ui7/container/coloredit.hpp

@@ -47,7 +47,9 @@ class PD_API ColorEdit : public Container {
     this->initial_color = *color;
     this->tdim = io.Font->GetTextBounds(label.c_str(), io.FontScale);
   }
-  ~ColorEdit() = default;
+  ~ColorEdit() {
+    if (layout) delete layout;
+  }
 
   /**
    * Override for the Input Handler
@@ -68,7 +70,7 @@ class PD_API ColorEdit : public Container {
   u32* color_ref = nullptr;  ///< Color Reference
   u32 initial_color;         ///< Initial Color
   std::string label;         ///< Label of the Button
-  Layout* layout;            ///< Layout to open
+  Layout* layout = nullptr;  ///< Layout to open
   bool is_shown = false;     ///< AHow Layout Editor
 };
 }  // namespace UI7

include/pd/ui7/container/container.hpp

@@ -48,7 +48,7 @@ class PD_API Container {
    */
   Container(const fvec4& box)
       : pos(fvec2(box.x, box.y)), size(fvec2(box.z - box.x, box.w - box.y)) {}
-  ~Container() = default;
+  virtual ~Container() = default;
 
   /**
    * Init Function Required by every Object that uses
@@ -59,6 +59,7 @@ class PD_API Container {
   void Init(UI7::IO* io, Li::Drawlist* l) {
     list = l;
     this->io = io;
+    pFont = io->Font;
     // this->screen = io->Ren->CurrentScreen();
   }
 
@@ -75,6 +76,7 @@ class PD_API Container {
   fvec2 GetPos() { return pos; }
   /** Getter for Size */
   fvec2 GetSize() { return size; }
+  Li::Font* GetFont() { return pFont; }
   /**
    * Get the Containers Final Position
    * for Rendering and Input (if it has a parent Object)
@@ -111,6 +113,25 @@ class PD_API Container {
   virtual void Draw() {}
   /** Template function to update internal data (if needed) */
   virtual void Update() {}
+  /** Template as well as base func for Pool based Containers */
+  virtual void Reset() {
+    pos = 0;
+    size = 0;
+    parent = nullptr;
+    id = 0;
+    pFlags = 0;
+    skippable = false;
+    rem = false;
+    inp_done = false;
+    pSelected = false;
+    pPressed = false;
+    pPressedTwice = false;
+    pCLipRectUsed = false;
+    pClipRect = 0;
+    io = nullptr;
+    list = nullptr;
+    last_use = 0;
+  }
 
   /** Internal function */
   void PreDraw();
@@ -155,11 +176,11 @@ class PD_API Container {
   /** Container Size*/
   fvec2 size;
   /** Reference to the Drawlist to Draw to*/
-  Li::Drawlist* list;
+  Li::Drawlist* list = nullptr;
   /** IO Reference for Renderer and Theme */
-  UI7::IO* io;
+  UI7::IO* io = nullptr;
   /** Reference to the parent container*/
-  Container* parent;
+  Container* parent = nullptr;
   /** Object ID (0 if unused)*/
   u32 id = 0;
   /** Internal Flags */
@@ -174,6 +195,7 @@ class PD_API Container {
   fvec4 pClipRect;
   /** Clip Rect used */
   bool pCLipRectUsed = false;
+  Li::Font* pFont = nullptr;
 };
 }  // namespace UI7
 }  // namespace PD

include/pd/ui7/container/dynobj.hpp

@@ -23,9 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#include <functional>
 #include <pd/ui7/container/container.hpp>
 #include <pd/ui7/io.hpp>
-#include <functional>
 
 namespace PD {
 namespace UI7 {
@@ -38,6 +38,7 @@ namespace UI7 {
  */
 class PD_API DynObj : public Container {
  public:
+  DynObj() {}
   /**
    * Button Object constructor
    * @param label Label of the Button
@@ -69,6 +70,14 @@ class PD_API DynObj : public Container {
   /** Function to Update Size if framepadding changes */
   void Update() override;
 
+  void Reset() override {
+    Container::Reset();
+    color = UI7Color_Button;
+    pressed = false;
+    pRenFun = nullptr;
+    pInp = nullptr;
+  }
+
  private:
   UI7Color color = UI7Color_Button;  ///< current button color
   bool pressed = false;              ///< ispressed value

include/pd/ui7/container/image.hpp

@@ -32,6 +32,7 @@ namespace UI7 {
  */
 class PD_API Image : public Container {
  public:
+  Image() {}
   /**
    * Constructor for the Image Object
    * @param img Image Texture Reference
@@ -57,6 +58,13 @@ class PD_API Image : public Container {
    * */
   void Draw() override;
 
+  void Reset() override {
+    Container::Reset();
+    img = Li::Texture();
+    newsize = 0.f;
+    cuv = Li::Rect();
+  }
+
  private:
   Li::Texture img;      ///< Texture
   fvec2 newsize = 0.f;  ///< New Size

include/pd/ui7/container/label.hpp

@@ -32,6 +32,7 @@ namespace UI7 {
  */
 class PD_API Label : public Container {
  public:
+  Label() {}
   /**
    * Constructor for Label Object
    * @param label Label [Text] to Draw
@@ -54,6 +55,13 @@ class PD_API Label : public Container {
    */
   void Update() override;
 
+  void Reset() override {
+    Container::Reset();
+    tdim = 0;
+    color = UI7Color_Text;
+    label.clear();
+  }
+
  private:
   fvec2 tdim;                      ///< Text Size
   UI7Color color = UI7Color_Text;  ///< Color

include/pd/ui7/flags.hpp

@@ -58,6 +58,8 @@ enum UI7MenuFlags_ {
 enum UI7LayoutFlags_ {
   UI7LayoutFlags_None = 0,              ///< No Flags used
   UI7LayoutFlags_UseClipRect = 1 << 0,  ///< Enable ClipRect
+  UI7LayoutFlags_HzScrolling = 1 << 1,  ///< Scrolling Horizontal
+  UI7LayoutFlags_VtScrolling = 1 << 2,  ///< Scrolling Vertical
 };
 
 /** UI7 Context Flags */
@@ -85,6 +87,8 @@ enum UI7LytAdd_ {
   UI7LytAdd_NoCursorUpdate = 1 << 0,  ///< Add without cursor alignment
   UI7LytAdd_NoScrollHandle = 1 << 1,  ///< Skip HandleScrolling
   UI7LytAdd_Front = 1 << 2,           ///< Add in front of the list
+  UI7LytAdd_NoGlobalClipping = 1 << 3,  ///< Dont use global Layout clip rect
+  UI7LytAdd_NoClipTitlebar = 1 << 4,  ///< Dont clip content behind the titlebar
 };
 
 /**

include/pd/ui7/io.hpp

@@ -31,16 +31,14 @@ SOFTWARE.
 #include <pd/ui7/viewport.hpp>
 
 namespace PD {
-class Context;
 namespace UI7 {
+class Label;
+class Image;
+class DynObj;
 class PD_API IO {
  public:
-  IO() : DeltaStats(60), CurrentViewPort("", 0) {
-    /** Probably not the best solution i guess */
-    // CurrentViewPort =
-    //   ViewPort::New("Default", ivec4(ivec2(0, 0), pCtx.Gfx()->ViewPort));
-  }
-  ~IO() {}
+  IO();
+  ~IO();
 
   /**
    * IO Update Internal Variables
@@ -83,6 +81,12 @@ class PD_API IO {
   u32 NumVertices = 0;  ///< Debug Vertices Num
   u32 NumIndices = 0;   ///< Debug Indices Num
   std::vector<u32> MenuOrder;
+  std::vector<Li::Font*> FontStack;
+
+  // Pools
+  PD::Pool<UI7::Label> LabelPool;
+  PD::Pool<UI7::Image> ImagePool;
+  PD::Pool<UI7::DynObj> DynObjPool;
 
   // DrawlistApi
   void RegisterDrawlist(const UI7::ID& id, Li::Drawlist* v) {
@@ -104,6 +108,18 @@ class PD_API IO {
     return ViewPorts[id.RawID()];
   }
 
+  void PushFont(Li::Font* f) {
+    FontStack.push_back(Font);
+    Font = f;
+  }
+
+  void PopFont() {
+    if (!FontStack.empty()) {
+      Font = FontStack.back();
+      FontStack.pop_back();
+    }
+  }
+
   UI7::InputHandler InputHandler;
 };
 }  // namespace UI7

include/pd/ui7/layout.hpp

@@ -47,7 +47,7 @@ class PD_API Layout {
     Size = 0;
     WorkRect = fvec4(IO.MenuPadding, Size - (fvec2(2) * IO.MenuPadding));
   }
-  ~Layout() = default;
+  ~Layout();
 
   /** SECTION CONTAINERS */
   /**
@@ -127,6 +127,8 @@ class PD_API Layout {
   void CursorInit();
   void SameLine();
   void CursorMove(const fvec2& size);
+  void PushFont(Li::Font* f) { IO.PushFont(f); }
+  void PopFont() { IO.PopFont(); }
 
   bool ObjectWorkPos(fvec2& movpos);
 
@@ -163,6 +165,8 @@ class PD_API Layout {
   void SetAlign(UI7Align a) { Alignment = a; }
   void NextAlign(UI7Align a) { TempAlign = a; }
 
+  void HandleScrolling();
+
   void Update();
 
   fvec2 DbgScrollOffset() { return ScrollOffset; }

include/pd/ui7/menu.hpp

@@ -82,7 +82,7 @@ class PD_API Menu {
     Container* r = pLayout.FindObject(id);
     if (!r) {
       r = new UI7::DragData<T>(label, data, num_elms, pIO, min, max, step,
-                                precision);
+                               precision);
       // Isnt This exactly the same line???
       // r = UI7::DragData<T>::New(label, data, num_elms, pIO, min, max, step,
       //                          precision);
@@ -110,7 +110,6 @@ class PD_API Menu {
   void EndTreeNode();
 
   void HandleFocus();
-  void HandleScrolling();
   void HandleTitlebarActions();
   void DrawBaseLayout();
 
@@ -120,6 +119,9 @@ class PD_API Menu {
   }
   Container* FindObject(u32 id) { return pLayout.FindObject(id); }
 
+  void PushFont(Li::Font* f) { pIO.PushFont(f); }
+  void PopFont() { pIO.PopFont(); }
+
   void Update();
 
   void SetSize(PD::fvec2 size) { pLayout.SetSize(size); }

include/pd/ui7/ui7.hpp

@@ -56,8 +56,7 @@ class PD_API Context {
   void AddViewPort(const ID& id, const ivec4& vp);
   void UseViewPort(const ID& id);
   void Update();
-  Menu* BeginMenu(const ID& id, UI7MenuFlags flags = 0,
-                      bool* pShow = nullptr);
+  Menu* BeginMenu(const ID& id, UI7MenuFlags flags = 0, bool* pShow = nullptr);
   Menu* CurrentMenu() { return pCurrent; }
   void EndMenu();
   void AboutMenu(bool* show = nullptr);

source/core/mat.cpp

@@ -85,13 +85,8 @@ PD_API Mat4 Mat4::Perspective(float fov, float aspect, float n, float f) {
   Mat4 ret;
   ret(0, 0) = 1.f / (aspect * _fov);
   ret(1, 1) = 1.f / _fov;
-#ifdef __3DS__
-  ret(2, 3) = f * n / (n - f);
-  ret(2, 2) = -(-1.f) * n / (n - f);
-#else
   ret(2, 2) = -(f + n) / (f - n);
   ret(2, 3) = -(2.f * f * n) / (f - n);
-#endif
   ret(3, 2) = -1.f;
   ret(3, 3) = 0.0f;
   return ret;

source/lithium/command.cpp

@@ -1,23 +1,48 @@
 #include <pd/drivers/gfx.hpp>
 #include <pd/lithium/command.hpp>
+#include <pd/lithium/pools.hpp>
 
 namespace PD {
 namespace Li {
 
 void Command::Reserve(size_t vtx, size_t idx) {
+  auto& vpool = GetVertexPool();
+  auto& ipool = GetIndexPool();
   if (VertexCountMax == 0) {
-    FirstVertex = Gfx::AllocateVertices(vtx, (PD::ptr)this);
+    FirstVertex = vpool.size();
+    vpool.Allocate(vtx);
     VertexCountMax = vtx;
   } else {
-    Gfx::ExpandVertices(vtx, (PD::ptr)this);
-    VertexCountMax += vtx;
+    if (vpool.size() == FirstVertex + VertexCountMax) {
+      vpool.Allocate(vtx);
+      VertexCountMax += vtx;
+    } else {
+      size_t tmp = FirstVertex;
+      FirstVertex = vpool.size();
+      vpool.Allocate(VertexCountMax + vtx);
+      for (size_t i = 0; i < VertexCount; i++) {
+        vpool[FirstVertex + i] = vpool[tmp + i];
+      }
+      VertexCountMax += vtx;
+    }
   }
   if (IndexCountMax == 0) {
-    FirstIndex = Gfx::AllocateIndices(idx, (PD::ptr)this);
+    FirstIndex = ipool.size();
+    ipool.Allocate(idx);
     IndexCountMax = idx;
   } else {
-    Gfx::ExpandIndices(idx, (PD::ptr)this);
-    IndexCountMax += idx;
+    if (ipool.size() == FirstIndex + IndexCountMax) {
+      ipool.Allocate(idx);
+      IndexCountMax += idx;
+    } else {
+      size_t tmp = FirstIndex;
+      FirstIndex = ipool.size();
+      ipool.Allocate(IndexCountMax + idx);
+      for (size_t i = 0; i < IndexCount; i++) {
+        ipool[FirstIndex + i] = ipool[tmp + i];
+      }
+      IndexCountMax += idx;
+    }
   }
 }
 
@@ -31,25 +56,30 @@ void Command::Reset() {
   VertexCount = 0;
   VertexCountMax = 0;
   IndexCountMax = 0;
+  ClipRect = 0.f;
+  ClipRectUsed = false;
 }
 
 Command& Command::Add(const Vertex& vtx) {
-  if (VertexCount <= VertexCountMax)
-    Gfx::PutVertex(FirstVertex + VertexCount++, vtx, (PD::ptr)this);
+  if (VertexCount < VertexCountMax) {
+    GetVertexPool()[FirstVertex + VertexCount++] = vtx;
+  }
   return *this;
 }
 Command& Command::Add(u16 idx) {
-  if (IndexCount <= IndexCountMax)
-    Gfx::PutIndex(FirstIndex + IndexCount++, FirstVertex + VertexCount + idx,
-                  (PD::ptr)this);
+  if (IndexCount < IndexCountMax) {
+    GetIndexPool()[FirstIndex + IndexCount++] =
+        static_cast<u16>(VertexCount + idx);
+  }
   return *this;
 }
 Command& Command::Add(u16 a, u16 b, u16 c) {
   if (IndexCount + 3 <= IndexCountMax) {
+    auto& ip = GetIndexPool();
     size_t idx = FirstIndex + IndexCount;
-    Gfx::PutIndex(idx + 0, FirstVertex + VertexCount + a, (PD::ptr)this);
-    Gfx::PutIndex(idx + 1, FirstVertex + VertexCount + b, (PD::ptr)this);
-    Gfx::PutIndex(idx + 2, FirstVertex + VertexCount + c, (PD::ptr)this);
+    ip[idx + 0] = static_cast<u16>(VertexCount + a);
+    ip[idx + 1] = static_cast<u16>(VertexCount + b);
+    ip[idx + 2] = static_cast<u16>(VertexCount + c);
     IndexCount += 3;
   }
   return *this;

source/lithium/drawlist.cpp

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <iostream>
 #include <pd/drivers/gfx.hpp>
 #include <pd/lithium/drawlist.hpp>
@@ -11,28 +12,50 @@ PD_API Drawlist::Drawlist() { Clear(); }
 PD_API Drawlist::~Drawlist() { Clear(); }
 
 PD_API void Drawlist::Merge(Drawlist& other) {
+  size_t start = pCommands.size();
   pCommands.AppendMove(other.pCommands);
+  for (size_t i = start; i < pCommands.size(); i++) {
+    pCommands[i].Layer += this->pCurrentLayer;
+  }
   other.Clear();
 }
 
 PD_API void Drawlist::Copy(Drawlist& other) {
+  int start = pCommands.size();
   pCommands.AppendCopy(other.pCommands);
+  for (size_t i = start; i < pCommands.size(); i++) {
+    pCommands[i].Layer += this->pCurrentLayer;
+  }
 }
 
-PD_API void Drawlist::Optimize() {}
+PD_API void Drawlist::Optimize() {
+  if (pCommands.size() <= 1) return;
+  std::stable_sort(pCommands.begin(), pCommands.end(),
+                   [](const Command& a, const Command& b) {
+                     if (a.Layer != b.Layer) return a.Layer < b.Layer;
+                     if (a.SDF != b.SDF) return a.SDF < b.SDF;
+                     return a.Tex < b.Tex;
+                   });
+}
 
 PD_API void Drawlist::Clear() {
   UnbindTexture();
   pPath.ResetFast();
-  pVertices.ResetFast();
-  pIndices.ResetFast();
-  pCommands.ResetFast();
+  pCommands.NoReset();
+  pCurrentLayer = 0;
+  pClipRects.clear();
 }
 
 /** Command Allocation */
 PD_API Command& Drawlist::NewCommand() {
   auto cmd = pCommands.Allocate(1);
+  cmd->Reset();
+  cmd->Layer = pCurrentLayer;
   cmd->Tex = pCurrentTexture.GetID();
+  if (HasClipRect()) {
+    cmd->ClipRectUsed = HasClipRect();
+    cmd->ClipRect = pClipRects.back();
+  }
   return *cmd;
 }
 

source/lithium/font.cpp

@@ -195,8 +195,6 @@ PD_API void Font::LoadTTF(const std::vector<u8>& data, int px_height,
   }
 }
 
-PD_API void Font::LoadDefaultFont(int id, int pixel_height) {}
-
 PD_API Font::Codepoint& Font::GetCodepoint(u32 c) {
   if (c < 128) {
     // Direct Access (~11% improvement)
@@ -288,7 +286,8 @@ PD_API void Font::CmdTextEx(Drawlist& dl, const fvec2& pos, u32 color,
     }
 
     if (cp.Size.x > 0 && cp.Size.y > 0) {
-      if (cmd == nullptr || cmd->Tex != Textures[cp.Tex]) {
+      if (cmd == nullptr || cmd->Tex != Textures[cp.Tex] ||
+          cmd->Layer != dl.GetLayer()) {
         if (cp.Tex >= Textures.size()) continue;
         cmd = &dl.NewCommand();
         cmd->Tex = Textures[cp.Tex];

source/lithium/pools.cpp

@@ -0,0 +1,16 @@
+#include <pd/lithium/pools.hpp>
+
+namespace PD {
+namespace Li {
+static PD::Pool<Vertex> gVertexPool;
+static PD::Pool<u16> gIndexPool;
+
+PD_API PD::Pool<Vertex>& GetVertexPool() { return gVertexPool; }
+PD_API PD::Pool<u16>& GetIndexPool() { return gIndexPool; }
+
+PD_API void ResetPools() {
+  gVertexPool.NoReset();
+  gIndexPool.NoReset();
+}
+}  // namespace Li
+}  // namespace PD

source/ui7/container/button.cpp

@@ -49,12 +49,13 @@ PD_API void Button::HandleInput() {
 PD_API void Button::Draw() {
   // Assert(io.get() && list.get(), "Did you run Container::Init correctly?");
   // io->Ren->OnScreen(screen);
+  list->SetFont(GetFont());
   list->PathRect(FinalPos(), FinalPos() + size, io->FrameRounding);
   list->PathFill(io->Theme.Get(color));
- // list->LayerUp();
+  list->LayerUp();
   list->DrawText(FinalPos() + size * 0.5 - tdim * 0.5, label.c_str(),
                  io->Theme.Get(UI7Color_Text));
-  // list->LayerDown();
+  list->LayerDown();
 }
 
 PD_API void Button::Update() {

source/ui7/container/checkbox.cpp

@@ -48,6 +48,7 @@ PD_API void Checkbox::HandleInput() {
 PD_API void Checkbox::Draw() {
   // Assert(list.get() && io.get(), "Did you run Container::Init correctly?");
   // io->Ren->OnScreen(screen);
+  list->SetFont(GetFont());
   list->PathRect(FinalPos(), FinalPos() + cbs, io->FrameRounding);
   list->PathFill(io->Theme.Get(color));
   if (usr_ref) {

source/ui7/container/coloredit.cpp

@@ -33,8 +33,7 @@ PD_API void ColorEdit::HandleInput() {
   }
   // Assert(screen.get(), "Screen is not set up!");
   // if (screen->ScreenType() == Screen::Bottom) {
-  if (io->InputHandler.DragObject(this->GetID() + 2,
-                                   fvec4(FinalPos(), size))) {
+  if (io->InputHandler.DragObject(this->GetID() + 2, fvec4(FinalPos(), size))) {
     if (io->InputHandler.DragReleasedAW) {
       is_shown = !is_shown;
     }
@@ -45,6 +44,7 @@ PD_API void ColorEdit::HandleInput() {
 PD_API void ColorEdit::Draw() {
   // Assert(io.get() && list.get(), "Did you run Container::Init correctly?");
   // io->Ren->OnScreen(screen);
+  list->SetFont(GetFont());
   list->PathRect(FinalPos(), FinalPos() + io->ItemRowHeight, io->FrameRounding);
   list->PathFill(*color_ref);
   list->DrawText(FinalPos() + fvec2(io->ItemSpace.x + io->ItemRowHeight, 0),
@@ -54,27 +54,30 @@ PD_API void ColorEdit::Draw() {
       layout = new UI7::Layout(GetID(), *io);
     }
     layout->SetPosition(FinalPos());
-    layout->AddObjectEx(
-        new DynObj(
-            [=, this](UI7::IO* io, Li::Drawlist* l, Container* thiz) {
-              thiz->SetSize(layout->GetSize());
-              // l->Layer(30);
-              l->PathRect(thiz->GetPos(), thiz->GetPos() + thiz->GetSize(),
-                          io->FrameRounding);
-              l->PathFill(io->Theme.Get(UI7Color_FrameBackground));
-            }),
-        UI7LytAdd_Front | UI7LytAdd_NoCursorUpdate | UI7LytAdd_NoScrollHandle);
-    auto obj = new DynObj(
-        [=, this](UI7::IO* io, Li::Drawlist* l, Container* thiz) {
-          l->PathRect(thiz->FinalPos(), thiz->FinalPos() + io->ItemRowHeight,
-                      io->FrameRounding);
-          l->PathFill(*color_ref);
-          l->DrawText(
-              thiz->FinalPos() + fvec2(io->ItemSpace.x + io->ItemRowHeight, 0),
-              label.c_str(), io->Theme.Get(UI7Color_Text));
-        });
-    obj->SetSize(PD::fvec2(200, io->ItemRowHeight));
-    layout->AddObject(obj);
+    DynObj* r = io->DynObjPool.Allocate();
+    *r = UI7::DynObj([=, this](UI7::IO* io, Li::Drawlist* l, Container* thiz) {
+      list->SetFont(thiz->GetFont());
+      thiz->SetSize(layout->GetSize());
+      // l->Layer(30);
+      l->PathRect(thiz->GetPos(), thiz->GetPos() + thiz->GetSize(),
+                  io->FrameRounding);
+      l->PathFill(io->Theme.Get(UI7Color_FrameBackground));
+      l->SetLayer(0);
+    });
+    layout->AddObjectEx(r, UI7LytAdd_Front | UI7LytAdd_NoCursorUpdate |
+                               UI7LytAdd_NoScrollHandle);
+    r = io->DynObjPool.Allocate();
+    *r = UI7::DynObj([=, this](UI7::IO* io, Li::Drawlist* l, Container* thiz) {
+      list->SetFont(thiz->GetFont());
+      l->PathRect(thiz->FinalPos(), thiz->FinalPos() + io->ItemRowHeight,
+                  io->FrameRounding);
+      l->PathFill(*color_ref);
+      l->DrawText(
+          thiz->FinalPos() + fvec2(io->ItemSpace.x + io->ItemRowHeight, 0),
+          label.c_str(), io->Theme.Get(UI7Color_Text));
+    });
+    r->SetSize(PD::fvec2(200, io->ItemRowHeight));
+    layout->AddObject(r);
     layout->Label("RGBA: ({}, {}, {}, {})", *((u8*)color_ref),
                   *(((u8*)color_ref) + 1), *(((u8*)color_ref) + 2),
                   *(((u8*)color_ref) + 3));
@@ -85,7 +88,9 @@ PD_API void ColorEdit::Draw() {
     layout->Slider<u8>("B", ((u8*)color_ref) + 2);
     layout->Slider<u8>("A", ((u8*)color_ref) + 3);
     layout->Update();
+    list->SetLayer(50);
     list->Merge(layout->GetDrawList());
+    list->SetLayer(0);
     // io->RegisterDrawList(GetID(), layout->GetDrawList());
   }
 }

source/ui7/container/container.cpp

@@ -31,10 +31,10 @@ PD_API void Container::HandleScrolling(fvec2 scrolling, fvec4 viewport) {
   }
   last_use = PD::Os::GetTime();
   pos -= fvec2(0, scrolling.y);
-  skippable = !Li::Math::InBounds(
-      pos, size,
-      fvec4(viewport.x, viewport.y, viewport.x + viewport.z,
-            viewport.y + viewport.w));
+  skippable =
+      !Li::Math::InBounds(pos, size,
+                          fvec4(viewport.x, viewport.y, viewport.x + viewport.z,
+                                viewport.y + viewport.w));
 }
 
 PD_API void Container::HandleInternalInput() {
@@ -44,13 +44,13 @@ PD_API void Container::HandleInternalInput() {
 /** Internal function */
 PD_API void Container::PreDraw() {
   if (pCLipRectUsed) {
-    // list->PushClipRect(pClipRect);
+    list->PushClipRect(pClipRect);
   }
 }
 /** Internal function */
 PD_API void Container::PostDraw() {
   if (pCLipRectUsed) {
-    // list->PopClipRect();
+    list->PopClipRect();
   }
 }
 }  // namespace UI7

source/ui7/container/dragdata.cpp

@@ -21,6 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
+#include <algorithm>
 #include <pd/ui7/container/dragdata.hpp>
 #include <pd/ui7/container/label.hpp>
 #include <type_traits>
@@ -85,21 +86,22 @@ PD_API void DragData<T>::Draw() {
                    FinalPos() + fvec2(off_x, 0) + td + io->FramePadding,
                    io->FrameRounding);
     list->PathFill(io->Theme.Get(UI7Color_Button));
-    // list->LayerUp();
+    list->LayerUp();
     list->DrawTextEx(FinalPos() + fvec2(off_x, 0), p.c_str(),
                      io->Theme.Get(UI7Color_Text), LiTextFlags_AlignMid,
                      td + io->FramePadding);
-    // list->LayerDown();
+    list->LayerDown();
     off_x += td.x + io->ItemSpace.x + io->FramePadding.x;
   }
-  list->DrawText(FinalPos() + fvec2(off_x, io->FramePadding.y * 0.5), label.c_str(),
-                 io->Theme.Get(UI7Color_Text));
+  list->DrawText(FinalPos() + fvec2(off_x, io->FramePadding.y * 0.5),
+                 label.c_str(), io->Theme.Get(UI7Color_Text));
 }
 
 template <typename T>
 PD_API void DragData<T>::Update() {
   // Assert(io.get(), "Did you run Container::Init correctly?");
   //  Probably need to find a faster solution (caching sizes calculated here)
+  list->SetFont(GetFont());
   float off_x = 0;
   for (size_t i = 0; i < elm_count; i++) {
     std::string p;

source/ui7/container/image.cpp

@@ -29,11 +29,11 @@ PD_API void Image::Draw() {
   // Assert(io.get() && list.get(), "Did you run Container::Init correctly?");
   // Assert(img.get(), "Image is nullptr!");
   // io->Ren->OnScreen(screen);
-  // list->LayerUp();
+  list->LayerUp();
   list->BindTexture(img);
   list->DrawRectFilled(FinalPos(), newsize, 0xffffffff);
   list->UnbindTexture();
-  //list->LayerDown();
+  list->LayerDown();
 }
 }  // namespace UI7
 }  // namespace PD

source/ui7/container/label.cpp

@@ -28,6 +28,7 @@ namespace UI7 {
 PD_API void Label::Draw() {
   // Assert(io.get() && list.get(), "Did you run Container::Init correctly?");
   // io->Ren->OnScreen(screen);
+  list->SetFont(GetFont());
   list->DrawTextEx(FinalPos(), label.c_str(), io->Theme.Get(UI7Color_Text),
                    LiTextFlags_NoOOS,
                    PD::fvec2(0, io->CurrentViewPort.pSize.w));

source/ui7/container/slider.cpp

@@ -21,6 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
+#include <algorithm>
 #include <pd/ui7/container/label.hpp>
 #include <pd/ui7/container/slider.hpp>
 #include <type_traits>
@@ -56,9 +57,9 @@ PD_API void Slider<T>::HandleInput() {
           fvec4(FinalPos() + fvec2(2, 0), fvec2(width, GetSize().y)))) {
     if (!io->InputHandler.DragReleasedAW) {
       *data = std::clamp(
-          T(max * (std::clamp(io->InputHandler.DragLastPosition.x - xps, 0.f,
-                              width) /
-                   width)),
+          T(max *
+            (std::clamp(io->InputHandler.DragLastPosition.x - xps, 0.f, width) /
+             width)),
           this->min, this->max);
     }
   }
@@ -69,6 +70,7 @@ template <typename T>
 PD_API void Slider<T>::Draw() {
   // Assert(io.get() && list.get(), "Did you run Container::Init correctly?");
   // io->Ren->OnScreen(screen);
+  list->SetFont(GetFont());
   std::string p;
   if constexpr (std::is_floating_point_v<T>) {
     p = std::format("{:.{}f}", *data, precision);
@@ -83,10 +85,10 @@ PD_API void Slider<T>::Draw() {
                  FinalPos() + fvec2(slp + slw - 2, td.y - 2) + io->FramePadding,
                  io->FrameRounding);
   list->PathFill(io->Theme.Get(UI7Color_ButtonActive));
-  // list->LayerUp();
+  list->LayerUp();
   list->DrawTextEx(FinalPos(), p.c_str(), io->Theme.Get(UI7Color_Text),
                    LiTextFlags_AlignMid, fvec2(width, td.y) + io->FramePadding);
-  // list->LayerDown();
+  list->LayerDown();
   list->DrawText(FinalPos() + fvec2(width + io->FramePadding.x * 2.f,
                                     io->FramePadding.y * 0.5),
                  label.c_str(), io->Theme.Get(UI7Color_Text));

source/ui7/io.cpp

@@ -22,10 +22,23 @@ SOFTWARE.
  */
 
 #include <pd/core/core.hpp>
-#include <pd/ui7/io.hpp>
 #include <pd/drivers/drivers.hpp>
+#include <pd/ui7/containers.hpp>
+#include <pd/ui7/io.hpp>
 
 namespace PD {
+
+PD_API UI7::IO::IO() : CurrentViewPort("", 0), DeltaStats(60) {
+  /** Probably not the best solution i guess */
+  // CurrentViewPort =
+  //   ViewPort::New("Default", ivec4(ivec2(0, 0), pCtx.Gfx()->ViewPort));
+  // Start a little larger on these
+  LabelPool.Init(512);
+  DynObjPool.Init(512);
+}
+
+PD_API UI7::IO::~IO() {}
+
 PD_API void UI7::IO::Update() {
   /** Todo: find out if we even still use the Drawlist regestry */
   u64 current = PD::Os::GetTimeNano();
@@ -39,7 +52,10 @@ PD_API void UI7::IO::Update() {
   DrawlistRegestry.push_front(std::make_pair("CtxBackList", &Back));
   if (Font) ItemRowHeight = FontScale * Font->PixelHeight;
   // RegisterDrawList("CtxBackList", Back);
-  NumIndices = 0;//FDL.pNumIndices;
-  NumVertices = 0;//FDL.pNumVertices;
+  NumIndices = FDL.GetNumIndices();
+  NumVertices = FDL.GetNumVertices();
+  LabelPool.ResetFast();
+  DynObjPool.ResetFast();
+  ImagePool.ResetFast();
 }
 }  // namespace PD

source/ui7/layout.cpp

@@ -21,11 +21,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
  */
 
+#include <algorithm>
 #include <pd/ui7/containers.hpp>
 #include <pd/ui7/layout.hpp>
 
 namespace PD {
 namespace UI7 {
+
+PD_API Layout::~Layout() {
+  // We all love managing memory i guess
+  for (Container* obj : IDObjects) {
+    delete obj;
+  }
+  IDObjects.clear();
+}
+
 PD_API void Layout::CursorInit() { Cursor = fvec2(WorkRect.x, WorkRect.y); }
 
 PD_API void Layout::SameLine() {
@@ -67,6 +77,10 @@ PD_API void Layout::AddObject(Container* obj) {
   obj->Update();
   CursorMove(obj->GetSize());
   obj->HandleScrolling(ScrollOffset, WorkRect);
+  if (Flags & UI7LayoutFlags_UseClipRect) {
+    obj->SetClipRect(
+        fvec4(Pos.x, Pos.y + WorkRect.y, Size.x, Size.y - WorkRect.y));
+  }
   Objects.push_back(obj);
 }
 
@@ -83,6 +97,15 @@ PD_API void Layout::AddObjectEx(Container* obj, u32 flags) {
   if (!(flags & UI7LytAdd_NoScrollHandle)) {
     obj->HandleScrolling(ScrollOffset, WorkRect);
   }
+  if (Flags & UI7LayoutFlags_UseClipRect &&
+      !(flags & UI7LytAdd_NoGlobalClipping)) {
+    if (flags & UI7LytAdd_NoClipTitlebar) {
+      obj->SetClipRect(fvec4(Pos.x, Pos.y, Size.x, Size.y));
+    } else {
+      obj->SetClipRect(
+          fvec4(Pos.x, Pos.y + WorkRect.y, Size.x, Size.y - WorkRect.y));
+    }
+  }
   if (flags & UI7LytAdd_Front) {
     Objects.push_front(obj);
   } else {
@@ -113,6 +136,42 @@ PD_API fvec2 Layout::AlignPosition(fvec2 pos, fvec2 size, fvec4 area,
   return p;
 }
 
+PD_API void Layout::HandleScrolling() {
+  if (Flags & UI7LayoutFlags_VtScrolling) {
+    bool allowed = MaxPosition.y > WorkRect.w;
+    if (allowed) {
+      if (PD::Hid::IsEvent(Hid::Event::Down, PD::Hid::Gamepad::Touch) ||
+          PD::Hid::IsEvent(Hid::Event::Down, PD::Hid::Keyboard::MouseLeft)) {
+        ScrollStart = ScrollOffset;
+      }
+      if (IO.InputHandler.DragObject(UI7::ID("sbg" + ID.GetName()),
+                                     fvec4(Pos, fvec2(0.f)) + WorkRect)) {
+        if (!IO.InputHandler.DragReleasedAW) {
+          ScrollOffset.y =
+              std::clamp(ScrollStart.y + IO.InputHandler.DragSourcePos.y -
+                             IO.InputHandler.DragPosition.y,
+                         -20.f, MaxPosition.y - WorkRect.w + 20.f);
+        }
+      }
+    } else {
+      ScrollOffset.y = 0.f;
+    }
+
+    if (ScrollOffset.y > MaxPosition.y - WorkRect.w) {
+      ScrollOffset.y -= 1.5f;
+      if (ScrollOffset.y < MaxPosition.y - WorkRect.w) {
+        ScrollOffset.y = MaxPosition.y - WorkRect.w;
+      }
+    }
+    if (ScrollOffset.y < 0) {
+      ScrollOffset.y += 1.5f;
+      if (ScrollOffset.y > 0) {
+        ScrollOffset.y = 0;
+      }
+    }
+  }
+}
+
 PD_API void Layout::Update() {
   if (Size == fvec2(0.f)) {
     Size = fvec2(MaxPosition) + IO.MenuPadding * 2;
@@ -125,9 +184,6 @@ PD_API void Layout::Update() {
       it->SetPos(it->GetPos() + Pos);
       it->HandleInput();
       it->UnlockInput();
-      if (Flags & UI7LayoutFlags_UseClipRect) {
-        it->SetClipRect(fvec4(Pos, Size));
-      }
       it->PreDraw();
       it->Draw();
       it->PostDraw();
@@ -136,6 +192,7 @@ PD_API void Layout::Update() {
 
   for (auto it = IDObjects.begin(); it != IDObjects.end();) {
     if ((*it)->Removable()) {
+      delete *it;
       it = IDObjects.erase(it);
     } else {
       it++;
@@ -145,14 +202,16 @@ PD_API void Layout::Update() {
   Objects.clear();
   WorkRect = fvec4(fvec2(WorkRect.x, WorkRect.y), Size - IO.MenuPadding);
   CursorInit();
+  HandleScrolling();
 }
 
 /** SECTION CONTAINERS (STOLEN FROM FORMER MENU) */
 
 PD_API void Layout::Label(const std::string& label) {
   // Layout API
-  auto r = new UI7::Label(label, IO);
-  r->SetClipRect(fvec4(GetPosition(), GetPosition() + GetSize()));
+  auto r = IO.LabelPool.Allocate();
+  *r = UI7::Label(label, IO);
+  // r->SetClipRect(fvec4(GetPosition(), GetSize()));
   AddObject(r);
 }
 
@@ -182,7 +241,8 @@ PD_API void Layout::Checkbox(const std::string& label, bool& v) {
 }
 
 PD_API void Layout::Image(Li::Texture img, fvec2 size, Li::Rect uv) {
-  Container* r = new UI7::Image(img, size, uv);
+  auto r = IO.ImagePool.Allocate();
+  *r = UI7::Image(img, size, uv);
   AddObject(r);
 }
 

source/ui7/menu.cpp

@@ -21,12 +21,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#include <algorithm>
 #include <pd/ui7/containers.hpp>
 #include <pd/ui7/menu.hpp>
 
 namespace PD {
 namespace UI7 {
-Menu::Menu(const ID& id, IO& io) : pIO(io), pID(id), pLayout(id, io) {
+Menu::Menu(const ID& id, IO& io) : pLayout(id, io), pIO(io), pID(id) {
   TitleBarHeight = pIO.FontScale * pIO.Font->PixelHeight + pIO.MenuPadding.y;
   pLayout.WorkRect.y += TitleBarHeight;
   pLayout.Flags |= UI7LayoutFlags_UseClipRect;
@@ -35,7 +36,8 @@ Menu::Menu(const ID& id, IO& io) : pIO(io), pID(id), pLayout(id, io) {
 
 PD_API void Menu::Label(const std::string& label) {
   // Layout API
-  auto r = new UI7::Label(label, pIO);
+  auto r = pIO.LabelPool.Allocate();
+  *r = UI7::Label(label, pIO);
   pLayout.AddObject(r);
 }
 
@@ -67,7 +69,8 @@ PD_API void Menu::Checkbox(const std::string& label, bool& v) {
 }
 
 PD_API void Menu::Image(Li::Texture img, fvec2 size, Li::Rect uv) {
-  Container* r = new UI7::Image(img, size, uv);
+  auto r = pIO.ImagePool.Allocate();
+  *r = UI7::Image(img, size, uv);
   pLayout.AddObject(r);
 }
 
@@ -83,7 +86,8 @@ PD_API void Menu::ColorEdit(const std::string& label, u32& clr) {
 
 PD_API void Menu::Separator() {
   // Dynamic Objects are very simple...
-  Container* r = new DynObj(
+  DynObj* r = pIO.DynObjPool.Allocate();
+  *r = UI7::DynObj(
       [=, this](UI7::IO* io, Li::Drawlist* l, UI7::Container* self) {
         l->DrawRectFilled(self->FinalPos(), self->GetSize(),
                           pIO.Theme.Get(UI7Color_TextDead));
@@ -97,8 +101,10 @@ PD_API void Menu::Separator() {
 
 PD_API void Menu::SeparatorText(const std::string& label) {
   // Also note to use [=] instead of [&] to not undefined access label
-  Container* r = new DynObj([=, this](UI7::IO* io, Li::Drawlist* l,
-                                       UI7::Container* self) {
+  DynObj* r = pIO.DynObjPool.Allocate();
+  *r = UI7::DynObj([=, this](UI7::IO* io, Li::Drawlist* l,
+                             UI7::Container* self) {
+    l->SetFont(self->GetFont());
     fvec2 size = self->GetSize();
     fvec2 tdim = io->Font->GetTextBounds(label.c_str(), io->FontScale);
     fvec2 pos = self->FinalPos();
@@ -134,7 +140,7 @@ PD_API void Menu::HandleFocus() {
        PD::Hid::IsEvent(Hid::Event::Down, Hid::Keyboard::MouseLeft)) &&
       Li::Math::InBounds(PD::Hid::MousePos(), newarea) &&
       !Li::Math::InBounds(PD::Hid::MousePos(),
-                           pIO.InputHandler.FocusedMenuRect)) {
+                          pIO.InputHandler.FocusedMenuRect)) {
     pIO.InputHandler.FocusedMenu = pID;
   }
   if (pIO.InputHandler.FocusedMenu == pID) {
@@ -142,52 +148,13 @@ PD_API void Menu::HandleFocus() {
   }
 }
 
-/** Todo: (func name is self describing) */
-PD_API void Menu::HandleScrolling() {
-  if (Flags & UI7MenuFlags_VtScrolling) {
-    bool allowed =
-        pLayout.MaxPosition.y > (pLayout.WorkRect.w - pLayout.WorkRect.y);
-    if (allowed) {
-      if (PD::Hid::IsEvent(Hid::Event::Down, PD::Hid::Gamepad::Touch)) {
-        pLayout.ScrollStart = pLayout.ScrollOffset;
-      }
-      if (pIO.InputHandler.DragObject(
-              "sbg" + pID.GetName(),
-              fvec4(pLayout.Pos, fvec2(0.f)) + pLayout.WorkRect)) {
-        if (pIO.InputHandler.DragReleasedAW) {
-        } else {
-          pLayout.ScrollOffset.y = std::clamp(
-              pLayout.ScrollStart.y + pIO.InputHandler.DragSourcePos.y -
-                  pIO.InputHandler.DragPosition.y,
-              -20.f, pLayout.MaxPosition.y - 220);
-        }
-      }
-    } else {
-      pLayout.ScrollOffset.y = 0.f;
-    }
-
-    if (pLayout.ScrollOffset.y > pLayout.MaxPosition.y - 240) {
-      pLayout.ScrollOffset.y -= 1.5;
-      if (pLayout.ScrollOffset.y < pLayout.MaxPosition.y - 240) {
-        pLayout.ScrollOffset.y = pLayout.MaxPosition.y - 240;
-      }
-    }
-    if (pLayout.ScrollOffset.y < 0) {
-      pLayout.ScrollOffset.y += 1.5;
-      if (pLayout.ScrollOffset.y > 0) {
-        pLayout.ScrollOffset.y = 0;
-      }
-    }
-  }
-}
-
 PD_API void Menu::HandleTitlebarActions() {
   // Collapse
   if (!(Flags & UI7MenuFlags_NoCollapse)) {
     vec2 cpos = pLayout.Pos + pIO.FramePadding;
     // clr_collapse_tri = UI7Color_FrameBackground;
     if (pIO.InputHandler.DragObject(UI7::ID(pID.GetName() + "clbse"),
-                                     fvec4(cpos, fvec2(18, TitleBarHeight)))) {
+                                    fvec4(cpos, fvec2(18, TitleBarHeight)))) {
       if (pIO.InputHandler.DragReleased) {
         pIsOpen = !pIsOpen;
       }
@@ -203,7 +170,7 @@ PD_API void Menu::HandleTitlebarActions() {
 
     // clr_close_btn = UI7Color_FrameBackground;
     if (pIO.InputHandler.DragObject(UI7::ID(pID.GetName() + "clse"),
-                                     fvec4(cpos, size))) {
+                                    fvec4(cpos, size))) {
       if (pIO.InputHandler.DragReleased) {
         *pIsShown = !(*pIsShown);
       }
@@ -216,7 +183,7 @@ PD_API void Menu::HandleTitlebarActions() {
 
     // clr_close_btn = UI7Color_FrameBackground;
     if (pIO.InputHandler.DragObject(UI7::ID(pID.GetName() + "rszs"),
-                                     fvec4(cpos, fvec2(20)))) {
+                                    fvec4(cpos, fvec2(20)))) {
       fvec2 szs = pLayout.Size + (pIO.InputHandler.DragPosition -
                                   pIO.InputHandler.DragLastPosition);
       if (szs.x < 30) szs.x = 30;
@@ -250,14 +217,15 @@ PD_API void Menu::DrawBaseLayout() {
   if (pIsOpen) {
     /** Resize Sym (Render on Top of Everything) */
     if (!(Flags & UI7MenuFlags_NoResize)) {
-      Container* r =
-          new DynObj([](IO* io, Li::Drawlist* l, UI7::Container* self) {
-            // //l->Layer(1);
-            l->PathAdd(self->FinalPos() + self->GetSize() - fvec2(0, 20));
-            l->PathAdd(self->FinalPos() + self->GetSize());
-            l->PathAdd(self->FinalPos() + self->GetSize() - fvec2(20, 0));
-            l->PathFill(io->Theme.Get(UI7Color_Button));
-          });
+      DynObj* r = pIO.DynObjPool.Allocate();
+      *r = UI7::DynObj([](IO* io, Li::Drawlist* l, UI7::Container* self) {
+        l->SetLayer(21);
+        l->PathAdd(self->FinalPos() + self->GetSize() - fvec2(0, 20));
+        l->PathAdd(self->FinalPos() + self->GetSize());
+        l->PathAdd(self->FinalPos() + self->GetSize() - fvec2(20, 0));
+        l->PathFill(io->Theme.Get(UI7Color_Button));
+        l->SetLayer(0);
+      });
       r->SetSize(
           fvec2(pLayout.GetSize().x, pLayout.GetSize().y - TitleBarHeight));
       r->SetPos(fvec2(0, TitleBarHeight));
@@ -266,9 +234,9 @@ PD_API void Menu::DrawBaseLayout() {
     }
 
     /** Background */
-    Container* r = new DynObj([](IO* io, Li::Drawlist* l,
-                                  UI7::Container* self) {
-      //l->Layer(0);
+    DynObj* r = pIO.DynObjPool.Allocate();
+    *r = UI7::DynObj([](IO* io, Li::Drawlist* l, UI7::Container* self) {
+      l->SetLayer(0);
       l->PathRectEx(self->FinalPos(), self->FinalPos() + self->GetSize(), 10.f,
                     LiPathRectFlags_KeepTop | LiPathRectFlags_KeepBot);
       l->PathFill(io->Theme.Get(UI7Color_Background));
@@ -280,16 +248,18 @@ PD_API void Menu::DrawBaseLayout() {
         fvec2(pLayout.GetSize().x, pLayout.GetSize().y - TitleBarHeight));
     r->SetPos(fvec2(0, TitleBarHeight));
     pLayout.AddObjectEx(r, UI7LytAdd_NoCursorUpdate | UI7LytAdd_NoScrollHandle |
-                               UI7LytAdd_Front);
+                               UI7LytAdd_Front | UI7LytAdd_NoClipTitlebar);
   }
   if (!(Flags & UI7MenuFlags_NoTitlebar)) {
-    Container* r = new  DynObj(
+    DynObj* r = pIO.DynObjPool.Allocate();
+    *r = UI7::DynObj(
         [=, this](UI7::IO* io, Li::Drawlist* l, UI7::Container* self) {
-          //l->Layer(20);
+          l->SetFont(self->GetFont());
+          l->SetLayer(20);
           /** Header Bar */
           l->DrawRectFilled(self->FinalPos(), self->GetSize(),
                             io->Theme.Get(UI7Color_Header));
-          //l->Layer(21);
+          l->SetLayer(21);
           /** Inline if statement to shift the Text if collapse sym is shown */
           /** What the hell is this code btw (didn't found a better way) */
           l->DrawText(self->FinalPos() +
@@ -299,17 +269,20 @@ PD_API void Menu::DrawBaseLayout() {
                                        (io->FramePadding.x * 2)),
                                 2),
                       pID.GetName().c_str(), io->Theme.Get(UI7Color_Text));
+          l->SetLayer(0);
         });
     r->SetSize(fvec2(pLayout.GetSize().x, TitleBarHeight));
     r->SetPos(0);
-    pLayout.AddObjectEx(r, UI7LytAdd_NoCursorUpdate | UI7LytAdd_NoScrollHandle);
+    pLayout.AddObjectEx(r, UI7LytAdd_NoCursorUpdate | UI7LytAdd_NoScrollHandle |
+                               UI7LytAdd_NoClipTitlebar);
 
     /** Collapse Sym */
     if (!(Flags & UI7MenuFlags_NoCollapse)) {
-      r = new DynObj([=, this](UI7::IO* io, Li::Drawlist* l,
-                                UI7::Container* self) {
+      DynObj* r = pIO.DynObjPool.Allocate();
+      *r = UI7::DynObj([=, this](UI7::IO* io, Li::Drawlist* l,
+                                 UI7::Container* self) {
         /** This sym actually requires layer 21 (i dont know why) */
-        //l->Layer(21);
+        l->SetLayer(21);
         /**
          * Symbol (Position Swapping set by pIsOpen ? openpos : closepos;)
          */
@@ -320,11 +293,13 @@ PD_API void Menu::DrawBaseLayout() {
             self->FinalPos() +
                 fvec2(pIsOpen ? self->GetSize().x * 0.5 : 0, self->GetSize().y),
             io->Theme.Get(UI7Color_FrameBackground));
+        l->SetLayer(0);
       });
       r->SetSize(TitleBarHeight - pIO.FramePadding.y * 2);
       r->SetPos(pIO.FramePadding);
-      pLayout.AddObjectEx(r,
-                          UI7LytAdd_NoCursorUpdate | UI7LytAdd_NoScrollHandle);
+      pLayout.AddObjectEx(r, UI7LytAdd_NoCursorUpdate |
+                                 UI7LytAdd_NoScrollHandle |
+                                 UI7LytAdd_NoClipTitlebar);
     }
     /** Close Sym (only shown if pIsShown is not nullptr) */
     if (!(Flags & UI7MenuFlags_NoClose) && pIsShown) {
@@ -337,11 +312,13 @@ PD_API void Menu::DrawBaseLayout() {
       fvec2 cpos =
           fvec2(pLayout.Pos.x + pLayout.Size.x - size.x - pIO.FramePadding.x,
                 pLayout.Pos.y + pIO.FramePadding.y);
+      pLayout.DrawList.SetLayer(21);
       pLayout.DrawList.DrawLine(cpos, cpos + size,
-                                 pIO.Theme.Get(UI7Color_FrameBackground), 2);
+                                pIO.Theme.Get(UI7Color_FrameBackground), 2);
       pLayout.DrawList.DrawLine(cpos + fvec2(0, size.y),
-                                 cpos + fvec2(size.x, 0),
-                                 pIO.Theme.Get(UI7Color_FrameBackground), 2);
+                                cpos + fvec2(size.x, 0),
+                                pIO.Theme.Get(UI7Color_FrameBackground), 2);
+      pLayout.DrawList.SetLayer(0);
     }
   }
 }
@@ -351,6 +328,10 @@ PD_API void Menu::Update() {
   if (pLayout.Size == fvec2(0.f) || Flags & UI7MenuFlags_AlwaysAutoSize) {
     pLayout.Size = fvec2(pLayout.MaxPosition) + pIO.MenuPadding * 2;
   }
+  if (Flags & UI7MenuFlags_VtScrolling)
+    pLayout.Flags |= UI7LayoutFlags_VtScrolling;
+  if (Flags & UI7MenuFlags_HzScrolling)
+    pLayout.Flags |= UI7LayoutFlags_HzScrolling;
   if (!(Flags & UI7MenuFlags_NoTitlebar)) {
     TitleBarHeight = pIO.FontScale * pIO.Font->PixelHeight + pIO.MenuPadding.y;
     pLayout.WorkRect.y = 5.f + TitleBarHeight;
@@ -361,9 +342,6 @@ PD_API void Menu::Update() {
   }
   DrawBaseLayout();
   pLayout.Update();
-  if (Flags & UI7MenuFlags_VtScrolling || Flags & UI7MenuFlags_HzScrolling) {
-    HandleScrolling();
-  }
 }
 
 PD_API bool Menu::BeginTreeNode(const ID& id) {
@@ -382,7 +360,9 @@ PD_API bool Menu::BeginTreeNode(const ID& id) {
   }
 
   // Object
-  auto r = new DynObj([=, this](IO* io, Li::Drawlist* l, Container* self) {
+  DynObj* r = pIO.DynObjPool.Allocate();
+  *r = UI7::DynObj([=, this](IO* io, Li::Drawlist* l, Container* self) {
+    l->SetFont(self->GetFont());
     fvec2 ts = self->FinalPos() + fvec2(0, 7);
     fvec2 pl[2] = {fvec2(10, 5), fvec2(0, 10)};
     if (n->second) {
@@ -393,14 +373,13 @@ PD_API bool Menu::BeginTreeNode(const ID& id) {
     l->DrawTriangleFilled(ts, ts + pl[0], ts + pl[1],
                           io->Theme.Get(UI7Color_FrameBackground));
 
-    l->DrawText(self->FinalPos() + fvec2(10 + io->ItemSpace.x, 0), id.GetName().c_str(),
-                io->Theme.Get(UI7Color_Text));
+    l->DrawText(self->FinalPos() + fvec2(10 + io->ItemSpace.x, 0),
+                id.GetName().c_str(), io->Theme.Get(UI7Color_Text));
   });
   /** Yes this new function handler was created for tree nodes */
   r->AddInputHandler([=, this](IO* io, Container* self) {
-    if (io->InputHandler.DragObject(
-            ID(pID.GetName() + id.GetName()),
-            fvec4(self->FinalPos(), self->GetSize()))) {
+    if (io->InputHandler.DragObject(ID(pID.GetName() + id.GetName()),
+                                    fvec4(self->FinalPos(), self->GetSize()))) {
       if (io->InputHandler.DragReleased) {
         n->second = !n->second;
       }

source/ui7/ui7.cpp

@@ -51,15 +51,14 @@ PD_API void Context::UseViewPort(const ID& id) {
   pIO.CurrentViewPort = pIO.ViewPorts[id.RawID()];
 }
 
-PD_API Menu* Context::BeginMenu(const ID& id, UI7MenuFlags flags,
-                                    bool* pShow) {
+PD_API Menu* Context::BeginMenu(const ID& id, UI7MenuFlags flags, bool* pShow) {
   if (pCurrent) {
     PDERR("UI7: You are already in {} Menu!", pCurrent->pID.GetName());
     return nullptr;
   }
   if (std::find(pCurrentMenus.begin(), pCurrentMenus.end(), (u32)id) !=
       pCurrentMenus.end()) {
-        PDERR("UI7: Menu {} already exists!", id.GetName());
+    PDERR("UI7: Menu {} already exists!", id.GetName());
     return nullptr;
   }
   pCurrent = pGetOrCreateMenu(id);
@@ -144,8 +143,11 @@ PD_API void Context::Update() {
     pMenus[it]->Update(); /** Render */
     this->pIO.InputHandler.CurrentMenu = 0;
   }
+  int base_layer = 0;
   for (int i = (int)FinalList.size() - 1; i >= 0; i--) {
+    pIO.FDL.SetLayer(base_layer);
     pIO.FDL.Merge(pMenus[FinalList[i]]->pLayout.GetDrawList());
+    base_layer += 100;
   }
   pCurrentMenus.clear();
   pIO.Update();
@@ -156,7 +158,7 @@ PD_API void Context::AboutMenu(bool* show) {
   if (auto m = BeginMenu("About UI7", UI7MenuFlags_Scrolling, show)) {
     m->Label("Palladium UI7 " + GetVersion());
     m->Separator();
-    m->Label("(c) 2023-2025 René Amthor");
+    m->Label("(c) 2023-2026 René Amthor");
     m->Label("UI7 is licensed under the MIT License.");
     m->Label("See LICENSE for more information.");
     static bool show_build;
@@ -205,21 +207,31 @@ PD_API void Context::MetricsMenu(bool* show) {
     }
     m->SeparatorText("Palladium Info");
     m->Label("Os Driver: {}", PD::Os::GetDriverName());
-    m->Label("Renderer: {}", PD::Gfx::GetDriverName());
+    if (m->BeginTreeNode(
+            std::format("Gfx Driver: {}", PD::Gfx::GetDriverName()))) {
+      m->SeparatorText("Features");
+      if (PD::Gfx::GetFlags() & PDGfxBackendFlags_HasClipRect)
+        m->Label("ClipRects");
+      if (PD::Gfx::GetFlags() & PDGfxBackendFlags_ReqPow2)
+        m->Label("Texture As Pow of 2");
+      if (PD::Gfx::GetFlags() & PDGfxBackendFlags_ApproxSDF)
+        m->Label("SDF Approximation");
+      m->EndTreeNode();
+    }
     if (m->BeginTreeNode(
             std::string(std::string("Input: ") + PD::Hid::GetDriverName()))) {
-     /* if (pIO.pCtx.Hid()->Flags & PD::HidDriver::Flags_HasKeyboard) {
-        m->Label("- Keyboard Supported");
-      }
-      if (pIO.pCtx.Hid()->Flags & PD::HidDriver::Flags_HasMouse) {
-        m->Label("- Mouse Supported");
-      }
-      if (pIO.pCtx.Hid()->Flags & PD::HidDriver::Flags_HasTouch) {
-        m->Label("- Touch Supported");
-      }
-      if (pIO.pCtx.Hid()->Flags & PD::HidDriver::FLags_HasGamepad) {
-        m->Label("- Gamepad Supported");
-      }*/
+      /* if (pIO.pCtx.Hid()->Flags & PD::HidDriver::Flags_HasKeyboard) {
+         m->Label("- Keyboard Supported");
+       }
+       if (pIO.pCtx.Hid()->Flags & PD::HidDriver::Flags_HasMouse) {
+         m->Label("- Mouse Supported");
+       }
+       if (pIO.pCtx.Hid()->Flags & PD::HidDriver::Flags_HasTouch) {
+         m->Label("- Touch Supported");
+       }
+       if (pIO.pCtx.Hid()->Flags & PD::HidDriver::FLags_HasGamepad) {
+         m->Label("- Gamepad Supported");
+       }*/
       m->EndTreeNode();
     }
     /** Section IO */
@@ -256,8 +268,7 @@ PD_API void Context::MetricsMenu(bool* show) {
           m->Label(std::format("Cursor: {}", pMenus[it]->pLayout.Cursor));
           if (m->BeginTreeNode(
                   "ID Objects (" +
-                  std::to_string(pMenus[it]->pLayout.IDObjects.size()) +
-                  ")")) {
+                  std::to_string(pMenus[it]->pLayout.IDObjects.size()) + ")")) {
             for (auto& jt : pMenus[it]->pLayout.IDObjects) {
               m->Label(std::format("{:08X}", jt->GetID()));
             }
@@ -321,7 +332,7 @@ PD_API void UI7::Context::StyleEditor(bool* show) {
     }
     /// Small trick to print without prefix
 #define ts(x) m->ColorEdit(std::string(#x).substr(9), pIO.Theme.GetRef(x));
-#define ts2(x)                                                                 \
+#define ts2(x)                                                                \
   m->DragData(std::string(#x).substr(9), (u8*)&pIO.Theme.GetRef(x), 4, (u8)0, \
               (u8)255);
     ts(UI7Color_Background);

test/CMakeLists.txt

@@ -0,0 +1,55 @@
+cmake_minimum_required(VERSION 3.22)
+
+project(test)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED true)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+set(CMAKE_EXPORT_COMPILE_COMMANDS true)
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
+    if(${PD_BUILD_SHARED})
+        message(ERROR "3DS Only supports Static libraries")
+    endif()
+endif()
+
+add_subdirectory(../ palladium)
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
+    add_subdirectory(../backends/3ds pd-3ds)
+else()
+    add_subdirectory(../backends/desktop pd-desktop)
+endif()
+
+add_executable(test source/main.cpp
+    ${BKND_SRC})
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
+    target_link_libraries(test PUBLIC pd-3ds palladium)
+else()
+    target_link_libraries(test PUBLIC pd-desktop palladium)
+endif()
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
+    target_compile_options(palladium PRIVATE
+        $<$<COMPILE_LANGUAGE:C>:-Wall>
+        $<$<COMPILE_LANGUAGE:C>:-Wno-psabi>
+        $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
+    )
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    target_compile_options(palladium PRIVATE
+        $<$<CONFIG:Debug>:-O0 -g>
+        $<$<CONFIG:Release>:-O3>
+    )
+endif()
+
+# set(RC_FILES
+# testassets/ComicNeue.ttf
+# testassets/logo.png
+# testassets/test.png)
+# install(FILES ${RC_FILES} DESTINATION ".")
+# else()
+# target_link_libraries(test PUBLIC pd-backend-3ds ctru citro3d)
+# endif()

tests/core/source/main.cpp

@@ -20,9 +20,26 @@ bool ColorTests() {
   return true;
 }
 
+bool IDTests() {
+  std::cout << std::format("HashID32(\"1234\") -> {:016X}",
+                           PD::HashID32("1234").Get())
+            << std::endl;
+  std::cout << std::format("HashID32(\"1235\") -> {:016X}",
+                           PD::HashID32("1235").Get())
+            << std::endl;
+  std::cout << std::format("HashID64(\"1234\") -> {:016X}",
+                           PD::HashID64("1234").Get())
+            << std::endl;
+  std::cout << std::format("HashID64(\"1235\") -> {:016X}",
+                           PD::HashID64("1235").Get())
+            << std::endl;
+  return true;
+}
+
 int main() {
   PD::Os::UseDriver<PD::OsDriver>();
   ColorTests();
+  IDTests();
   std::cout << PD::Os::GetTime() << std::endl;
   PD::Pool<int> pool;
   pool.Init(90);

tests/gfx/include/os-ctx.hpp

@@ -21,6 +21,8 @@ class OsCtx {
   virtual bool Mainloop() { return false; }
   virtual void ClearViewPort() {}
   virtual void SwapBuffers() {}
+  virtual int GetScreenCount() { return 1; }
+  virtual void DrawOnScreen(int s = 0) {}
   PD::fvec2 PositionTranslate(PD::fvec2 in) {
     return fvec2(in.x * pViewPort.x, in.y * pViewPort.y);
   }

tests/gfx/include/os/horizon-ctr.hpp

@@ -13,6 +13,8 @@ class HorizonCtr : public PD::OsCtx {
   bool Mainloop() override;
   void ClearViewPort() override;
   void SwapBuffers() override;
+  int GetScreenCount() override { return 2; }
+  void DrawOnScreen(int s) override;
 
  private:
   struct Impl;

tests/gfx/source/main.cpp

@@ -198,9 +198,9 @@ int main(int argc, char** argv) {
   auto pTex = PD::Gfx::LoadTexture(img, img.Width(), img.Height());
   PD::Li::Font font;
   PD::Li::Font debug_font;
-    font.LoadTTF(ResourcePath("default.ttf"), 32, LiFontFlags_SDF);
-    debug_font.LoadTTF(ResourcePath("JetBrainsMono-Medium.ttf"), 32,
-                       LiFontFlags_SDF | LiFontFlags_Monospace);
+  font.LoadTTF(ResourcePath("default.ttf"), 32, LiFontFlags_SDF);
+  debug_font.LoadTTF(ResourcePath("JetBrainsMono-Medium.ttf"), 32,
+                     LiFontFlags_SDF | LiFontFlags_Monospace);
   pList.SetFont(&font);
   App app(font);
   Cursor LeftStick;
@@ -208,19 +208,25 @@ int main(int argc, char** argv) {
   RightStick.pColor = "#00ffff";
   PD::UI7::Context ui7;
   ui7.GetIO().Font = &font;
+#ifdef __3DS__
+  ui7.AddViewPort("Default", PD::ivec4(0, 0, 320, 240));
+  ui7.GetIO().FontScale = 0.5f;
+#else
   ui7.AddViewPort("Default", PD::ivec4(0, 0, 1280, 720));
+#endif
   ui7.UseViewPort("Default");
+  bool pMetricsWin = true;
   while (pOs->Mainloop()) {
+    PD::TT::End("OSCTX::MainLoop");
+    pOs->DrawOnScreen(0);
+    pOs->ClearViewPort();
     PD::TT::Scope __st("MainLoop");
+    PD::TT::Beg("MainRaw");
     PD::Hid::Update();
     PD::Gfx::NewFrame();
-    pOs->ClearViewPort();
+    PD::Li::ResetPools();
     // app.Update(pOs->GetViewport(), pList);
     pList.SetFontscale(0.7);
-    if (auto m = ui7.BeginMenu("Test")) {
-      m->Label("Hello World!");
-      ui7.EndMenu();
-    }
     if (PD::Hid::IsEvent(PD::Hid::Event::Down, PD::Hid::Gamepad::CPLeft |
                                                    PD::Hid::Gamepad::CPRight)) {
       LeftStick.pPos.x += PD::Hid::GetLeftStick().x * 15;
@@ -299,19 +305,45 @@ int main(int argc, char** argv) {
           "#ff00ff");
     }
     pList.SetFont(&font);
-    ui7.MetricsMenu();
+    PD::TT::Beg("BuildUI7Menus");
+    if (auto m = ui7.BeginMenu("Test")) {
+      m->Label("Hello World!");
+      m->Image(pTex, 128.f);
+      ui7.EndMenu();
+    }
+    if (auto m = ui7.BeginMenu("LI DBG INFO")) {
+      m->PushFont(&debug_font);
+      m->Label("Gfx Driver: {}", PD::Gfx::GetDriverName());
+      m->Separator();
+      m->Label("LI  Draw Comamnds: {}", PD::Gfx::GetNumCommands());
+      m->Label("GFX Draw Calls: {}", PD::Gfx::GetNumDrawcalls());
+      m->Label("GFX Vertices: {}", PD::Gfx::GetNumVertices());
+      m->Label("GFX Triangles: {}", PD::Gfx::GetNumVertices() / 3);
+      m->Label("GFX Indices: {}", PD::Gfx::GetNumIndices());
+      m->PopFont();
+      ui7.EndMenu();
+    }
+    ui7.MetricsMenu(&pMetricsWin);
+    ui7.StyleEditor();
+    PD::TT::End("BuildUI7Menus");
     PD::TT::Beg("UI7::Context::Update");
     ui7.Update();
     PD::TT::End("UI7::Context::Update");
     PD::Gfx::Reset();
     PD::TT::Beg("PD::Gfx::Draw");
-    PD::Gfx::Draw(pList);
+    pOs->DrawOnScreen(1);
+    pOs->ClearViewPort();
     PD::Gfx::Draw(ui7.GetDrawData());
+    pOs->DrawOnScreen(0);
+    PD::Gfx::Draw(pList);
     PD::TT::End("PD::Gfx::Draw");
     pList.Clear();
+    PD::TT::End("MainRaw");
     pOs->SwapBuffers();
+    PD::TT::Beg("OSCTX::MainLoop");
   }
   font.Delete();
+  debug_font.Delete();
   PD::Gfx::DeleteTexture(pTex);
   PD::Gfx::Deinit();
   pOs->Deinit();

tests/gfx/source/os/desktopos.cpp

@@ -18,6 +18,7 @@ struct DesktopOS::Impl {
 #if WIN32
   IDirect3D9* d3d = nullptr;
   IDirect3DDevice9* dx9_device = nullptr;
+  D3DPRESENT_PARAMETERS d3dpp = {};
 #endif
 };
 
@@ -56,17 +57,18 @@ void DesktopOS::Init() {
   if (pDriver == Driver::DirectX9) {
     impl->d3d = Direct3DCreate9(D3D_SDK_VERSION);
     auto hwnd = glfwGetWin32Window(impl->win);
-    D3DPRESENT_PARAMETERS d3dpp = {};
-    d3dpp.Windowed = TRUE;
-    d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
-    d3dpp.hDeviceWindow = hwnd;
-    d3dpp.BackBufferFormat = D3DFMT_UNKNOWN;
-    d3dpp.EnableAutoDepthStencil = TRUE;
-    d3dpp.AutoDepthStencilFormat = D3DFMT_D16;
+
+    impl->d3dpp = D3DPRESENT_PARAMETERS{};
+    impl->d3dpp.Windowed = TRUE;
+    impl->d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
+    impl->d3dpp.hDeviceWindow = hwnd;
+    impl->d3dpp.BackBufferFormat = D3DFMT_UNKNOWN;
+    impl->d3dpp.EnableAutoDepthStencil = TRUE;
+    impl->d3dpp.AutoDepthStencilFormat = D3DFMT_D16;
 
     HRESULT hr = impl->d3d->CreateDevice(
         D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
-        D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &impl->dx9_device);
+        D3DCREATE_HARDWARE_VERTEXPROCESSING, &impl->d3dpp, &impl->dx9_device);
     if (FAILED(hr)) {
       MessageBoxW(nullptr, L"Failed to create D3D9 device", L"Error", MB_OK);
       std::abort();
@@ -100,7 +102,15 @@ void DesktopOS::ClearViewPort() {
     glViewport(0, 0, pViewPort.x, pViewPort.y);
   } else if (pDriver == Driver::DirectX9) {
 #ifdef _WIN32
-    if (impl->dx9_device) {
+    // Resize the swapchain to match the window size
+    if (impl->dx9_device && pViewPort.x > 0 && pViewPort.y > 0) {
+      if (impl->d3dpp.BackBufferWidth != (UINT)pViewPort.x ||
+          impl->d3dpp.BackBufferHeight != (UINT)pViewPort.y) {
+        impl->d3dpp.BackBufferWidth = pViewPort.x;
+        impl->d3dpp.BackBufferHeight = pViewPort.y;
+        impl->dx9_device->Reset(&impl->d3dpp);
+      }
+
       impl->dx9_device->Clear(0, nullptr, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER,
                               D3DCOLOR_XRGB(25, 25, 25), 1.0f, 0);
       impl->dx9_device->BeginScene();
@@ -112,7 +122,8 @@ void DesktopOS::ClearViewPort() {
 void DesktopOS::SwapBuffers() {
   if (pDriver == Driver::DirectX9) {
 #ifdef _WIN32
-    if (impl->dx9_device) {
+    // yes we schould use some safetey checks
+    if (impl->dx9_device && pViewPort.x > 0 && pViewPort.y > 0) {
       impl->dx9_device->EndScene();
       impl->dx9_device->Present(nullptr, nullptr, nullptr, nullptr);
     }

tests/gfx/source/os/horizon-ctr.cpp

@@ -16,6 +16,7 @@ struct HorizonCtr::Impl {
   C3D_RenderTarget* Top = nullptr;
   C3D_RenderTarget* Bottom = nullptr;
   uint32_t* pSocBuf = nullptr;
+  int CurrentScreen = 0;
 };
 
 void HorizonCtr::Init() {
@@ -33,7 +34,7 @@ void HorizonCtr::Init() {
   romfsInit();
   osSetSpeedupEnable(true);
   gfxInitDefault();
-  consoleInit(GFX_BOTTOM, nullptr);
+  // consoleInit(GFX_BOTTOM, nullptr);
   C3D_Init(C3D_DEFAULT_CMDBUF_SIZE);
   impl->Top =
       C3D_RenderTargetCreate(240, 400, GPU_RB_RGBA8, GPU_RB_DEPTH24_STENCIL8);
@@ -43,7 +44,7 @@ void HorizonCtr::Init() {
   C3D_RenderTargetSetOutput(impl->Bottom, GFX_BOTTOM, GFX_LEFT,
                             DisplayTransferFlags);
   PD::Gfx::UseDriver<PD::GfxCitro3D>();
-  PD::Hid::UseDriver<PD::HidDriver>();
+  PD::Hid::UseDriver<PD::Hid3DS>();
 }
 
 void HorizonCtr::Deinit() {
@@ -61,16 +62,27 @@ void HorizonCtr::Deinit() {
 
 bool HorizonCtr::Mainloop() {
   pViewPort = ivec2(400, 240);
-  hidScanInput();
   bool _kill = hidKeysUp() & KEY_START;
+  C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
+  impl->CurrentScreen = 0;
   return aptMainLoop() && !_kill;
 }
 
 void HorizonCtr::ClearViewPort() {
+  C3D_RenderTargetClear(impl->CurrentScreen ? impl->Bottom : impl->Top,
+                        C3D_CLEAR_ALL, PD::Color(25, 25, 25, 25), 0);
+}
+
+void HorizonCtr::DrawOnScreen(int s) {
+  impl->CurrentScreen = s;
+  if (s == 0) {
+    C3D_FrameDrawOn(impl->Top);
+    pViewPort = PD::ivec2(400, 240);
+  } else if (s == 1) {
+    C3D_FrameDrawOn(impl->Bottom);
+    pViewPort = PD::ivec2(320, 240);
+  }
   PD::Gfx::SetViewPort(pViewPort);
-  C3D_FrameBegin(C3D_FRAME_SYNCDRAW);
-  C3D_FrameDrawOn(impl->Top);
-  C3D_RenderTargetClear(impl->Top, C3D_CLEAR_ALL, PD::Color(25, 25, 25, 25), 0);
 }
 
 void HorizonCtr::SwapBuffers() { C3D_FrameEnd(0); }