finish up some Font stuff, etc

lovebrew · Jan 5, 2023 · 84997dc · 84997dc
1 parent c46f221
commit 84997dc
Show file tree

Hide file tree

Showing 29 changed files with 169 additions and 68 deletions.
diff --git a/include/common/luax.hpp b/include/common/luax.hpp
@@ -88,7 +88,7 @@ namespace luax
     void RegisterTypeInner(lua_State* L, std::span<const luaL_Reg> values);
 
     template<typename... T>
-    int RegisterType(lua_State* L, love::Type* type, T&&... values)
+    inline int RegisterType(lua_State* L, love::Type* type, T&&... values)
     {
         RegisterTypeInit(L, type);
         (RegisterTypeInner(L, std::forward<T>(values)), ...);

diff --git a/include/common/screen.hpp b/include/common/screen.hpp
@@ -20,7 +20,7 @@ namespace love
 
     enum Screen : int8_t;
 
-    static Screen currentScreen            = (Screen)0;
+    inline Screen currentScreen            = (Screen)0;
     static constexpr Screen SCREEN_INVALID = (Screen)-1;
 
     const ScreenInfo& GetScreenInfo(Screen);
@@ -49,15 +49,13 @@ namespace love
     inline int GetScreenWidth(Screen id = currentScreen)
     {
         const auto& info = GetScreenInfo(id);
-        LOG("%d", info.width);
 
         return info.width;
     }
 
     inline int GetScreenHeight(Screen id = currentScreen)
     {
         const auto& info = GetScreenInfo(id);
-        LOG("%d", info.height);
 
         return info.height;
     }

diff --git a/include/objects/font/wrap_font.hpp b/include/objects/font/wrap_font.hpp
@@ -42,4 +42,6 @@ namespace Wrap_Font
     int Register(lua_State* L);
 
     extern std::function<void(lua_State*)> wrap_extension;
+
+    extern std::span<const luaL_Reg> extensions;
 } // namespace Wrap_Font
diff --git a/platform/cafe/CMakeLists.txt b/platform/cafe/CMakeLists.txt
@@ -31,6 +31,7 @@ target_sources(${PROJECT_NAME} PRIVATE
     source/objects/shader_ext.cpp
     source/objects/source_ext.cpp
     source/objects/texture_ext.cpp
+    source/objects/wrap_font_ext.cpp
     source/objects/wrap_imagedata_ext.cpp
     source/utilities/driver/dsp_ext.cpp
     source/utilities/driver/framebuffer.cpp

diff --git a/platform/cafe/include/common/screen_ext.hpp b/platform/cafe/include/common/screen_ext.hpp
@@ -18,7 +18,7 @@ namespace love
     };
     // clang-format on
 
-    void SetScreenSize(Screen id, int width, int height)
+    inline void SetScreenSize(Screen id, int width, int height)
     {
         auto& info = screenInfo[id];
 

diff --git a/platform/cafe/include/modules/keyboard_ext.hpp b/platform/cafe/include/modules/keyboard_ext.hpp
@@ -2,11 +2,14 @@
 
 #include <modules/keyboard/keyboard.tcc>
 
+#include <objects/shader_ext.hpp>
+#include <utilities/driver/framebuffer.hpp>
+
 #include <coreinit/filesystem.h>
 #include <coreinit/memdefaultheap.h>
-#include <nn/swkbd.h>
 
-#include <utilities/driver/framebuffer.hpp>
+#include <gx2/context.h>
+#include <nn/swkbd.h>
 
 namespace love
 {
@@ -22,19 +25,22 @@ namespace love
 
         virtual ~Keyboard();
 
-        void Draw()
+        void Draw(GX2ContextState* restored)
         {
             if (!this->showing)
                 return;
 
             nn::swkbd::DrawDRC();
+
+            GX2SetContextState(restored);
+            Shader<>::current->Attach(true);
         }
 
         void SetTextInput(const KeyboardOptions& options);
 
         const uint32_t GetMaxEncodingLength(const uint32_t in)
         {
-            return in * 0x03;
+            return in * 0x04;
         }
 
         const bool IsShowing() const
@@ -44,6 +50,7 @@ namespace love
 
         void HideKeyboard()
         {
+            nn::swkbd::DisappearInputForm();
             this->showing = false;
         }
 
@@ -58,12 +65,13 @@ namespace love
         // clang-format on
 
       private:
+        GX2ContextState* state;
+
         nn::swkbd::CreateArg createArgs;
         nn::swkbd::AppearArg appearArgs;
         FSClient* client;
 
         bool inited;
         bool showing;
-        Screen screen;
     };
 } // namespace love
diff --git a/platform/cafe/include/objects/shader_ext.hpp b/platform/cafe/include/objects/shader_ext.hpp
@@ -16,7 +16,7 @@ namespace love
 
         virtual ~Shader();
 
-        void Attach();
+        void Attach(bool forced = false);
 
         static void AttachDefault(StandardShader type);
 

diff --git a/platform/cafe/include/utilities/driver/buffer.hpp b/platform/cafe/include/utilities/driver/buffer.hpp
@@ -42,8 +42,8 @@ namespace love
             }
 
           private:
-            Vertex* data;
             GX2RBuffer* buffer;
+            Vertex* data;
         };
 
       public:

diff --git a/platform/cafe/include/utilities/driver/framebuffer.hpp b/platform/cafe/include/utilities/driver/framebuffer.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <common/screen_ext.hpp>
 #include <common/vector.hpp>
 
 #include <coreinit/memfrmheap.h>

diff --git a/platform/cafe/source/modules/keyboard_ext.cpp b/platform/cafe/source/modules/keyboard_ext.cpp
@@ -2,14 +2,15 @@
 
 #include <utilities/result.hpp>
 
-#include <codecvt>
-#include <locale>
-#include <string>
+#include <utf8.h>
+
+#include <malloc.h>
 
 using namespace love;
 
 Keyboard<Console::CAFE>::Keyboard() :
     Keyboard<>(this->GetMaxEncodingLength(MAX_INPUT_LENGTH)),
+    state(nullptr),
     createArgs {},
     appearArgs {},
     client(nullptr),
@@ -19,7 +20,10 @@ Keyboard<Console::CAFE>::Keyboard() :
 
 void Keyboard<Console::CAFE>::Initialize()
 {
+    this->state = (GX2ContextState*)memalign(GX2_CONTEXT_STATE_ALIGNMENT, sizeof(GX2ContextState));
+
     this->client = (FSClient*)MEMAllocFromDefaultHeap(sizeof(FSClient));
+    GX2SetupContextStateEx(this->state, false);
 
     if (!this->client)
         throw love::Exception("Failed to allocate FSClient for nn::swkbd!");
@@ -52,11 +56,18 @@ Keyboard<Console::CAFE>::~Keyboard()
 
 void Keyboard<Console::CAFE>::Utf16toUtf8Text()
 {
-    const auto* str = nn::swkbd::GetInputFormString();
-    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> to_utf8;
+    const auto* line = nn::swkbd::GetInputFormString();
+    const auto utf8  = utf8::utf16to8(line);
+
+    std::copy_n(utf8.c_str(), utf8.size(), this->text.get());
+}
+
+static nn::swkbd::PasswordMode GetPasswordMode(bool isPassword)
+{
+    if (isPassword)
+        return nn::swkbd::PasswordMode::Fade;
 
-    std::string converted = to_utf8.to_bytes(str);
-    std::copy_n(converted.c_str(), converted.size(), this->text.get());
+    return nn::swkbd::PasswordMode::Clear;
 }
 
 void Keyboard<Console::CAFE>::SetTextInput(const KeyboardOptions& options)
@@ -66,14 +77,11 @@ void Keyboard<Console::CAFE>::SetTextInput(const KeyboardOptions& options)
 
     this->appearArgs.keyboardArg.configArg.languageType = nn::swkbd::LanguageType::English;
 
-    /* utf8 to utf16le needed */
-    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> to_utf16;
-    std::u16string hintText = to_utf16.from_bytes(options.hint.data());
+    const auto hintText = utf8::utf8to16(options.hint);
 
     this->appearArgs.inputFormArg.hintText      = hintText.c_str();
     this->appearArgs.inputFormArg.maxTextLength = options.maxLength;
-    this->appearArgs.inputFormArg.passwordMode =
-        options.isPassword ? nn::swkbd::PasswordMode::Fade : nn::swkbd::PasswordMode::Clear;
+    this->appearArgs.inputFormArg.passwordMode  = GetPasswordMode(options.isPassword);
 
     if (!nn::swkbd::AppearInputForm(this->appearArgs))
         return;

diff --git a/platform/cafe/source/objects/font_ext.cpp b/platform/cafe/source/objects/font_ext.cpp
@@ -303,10 +303,10 @@ const Font<Console::CAFE>::Glyph& Font<Console::CAFE>::AddGlyph(uint32_t glyph)
         const vertex::Vertex vertices[4] =
         {
             /* x                                      y                             z                u                                                 v                                                  */
-            {{ -offset,                               -offset,                      0.0f }, color, { vertex::normto16t((x - offset) / _width),         vertex::normto16t((y - offset) / _height)          }},
-            {{ -offset,                               (height + offset) / dpiScale, 0.0f }, color, { vertex::normto16t((x - offset) / _width),         vertex::normto16t((y + height + offset) / _height) }},
-            {{ (width + offset) / dpiScale,           (height + offset) / dpiScale, 0.0f }, color, { vertex::normto16t((x + width + offset) / _width), vertex::normto16t((y + height + offset) / _height) }},
-            {{ (width + offset) / dpiScale,           -offset,                      0.0f }, color, { vertex::normto16t((x + width + offset) / _width), vertex::normto16t((y - offset) / _height)          }}
+            {{ -offset,                               -offset,                      0.0f }, color, { float((x - offset) / _width),         float((y - offset) / _height)          }},
+            {{ -offset,                               (height + offset) / dpiScale, 0.0f }, color, { float((x - offset) / _width),         float((y + height + offset) / _height) }},
+            {{ (width + offset) / dpiScale,           (height + offset) / dpiScale, 0.0f }, color, { float((x + width + offset) / _width), float((y + height + offset) / _height) }},
+            {{ (width + offset) / dpiScale,           -offset,                      0.0f }, color, { float((x + width + offset) / _width), float((y - offset) / _height)          }}
         };
         // clang-format on
 
@@ -641,7 +641,7 @@ std::vector<Font<Console::CAFE>::DrawCommand> Font<Console::CAFE>::GenerateVerti
                 auto previous = commands.back();
 
                 size_t total = (previous.start + previous.count);
-                if (previous.texture == first->texture && total == first->start)
+                if (previous.texture == first->texture && (int)total == first->start)
                 {
                     commands.back().count += first->count;
                     ++first;
@@ -684,7 +684,7 @@ void Font<Console::CAFE>::Printv(Graphics<Console::CAFE>& graphics,
         drawCommand.shader       = Shader<>::STANDARD_TEXTURE;
         drawCommand.format       = vertex::CommonFormat::TEXTURE;
         drawCommand.primitveType = vertex::PRIMITIVE_QUADS;
-        drawCommand.handles      = { command.texture->GetHandle() };
+        drawCommand.handles      = { command.texture };
 
         matrix.TransformXYVert(drawCommand.Positions().get(), &vertices[command.start],
                                command.count);

diff --git a/platform/cafe/source/objects/shader_ext.cpp b/platform/cafe/source/objects/shader_ext.cpp
@@ -69,9 +69,9 @@ void Shader<Console::CAFE>::AttachDefault(StandardShader type)
         defaultshader->Attach();
 }
 
-void Shader<Console::CAFE>::Attach()
+void Shader<Console::CAFE>::Attach(bool forced)
 {
-    if (Shader::current != this)
+    if (Shader::current != this || forced)
     {
         Renderer<Console::CAFE>::Instance().UseProgram(this->program);
         Renderer<>::shaderSwitches++;

diff --git a/platform/cafe/source/objects/wrap_font_ext.cpp b/platform/cafe/source/objects/wrap_font_ext.cpp
@@ -0,0 +1,42 @@
+#include <objects/font/wrap_font.hpp>
+
+using namespace love;
+
+int Wrap_Font::GetWrap(lua_State* L)
+{
+    auto* self = Wrap_Font::CheckFont(L, 1);
+
+    std::vector<Font<>::ColoredString> text;
+    Wrap_Font::CheckColoredString(L, 2, text);
+
+    float wrap = luaL_checknumber(L, 3);
+
+    int maxWidth = 0;
+    std::vector<std::string> lines;
+    std::vector<int> widths;
+
+    luax::CatchException(L, [&]() { self->GetWrap(text, wrap, lines, &widths); });
+
+    for (const auto width : widths)
+        maxWidth = std::max(maxWidth, width);
+
+    lua_pushinteger(L, maxWidth);
+
+    lua_createtable(L, (int)lines.size(), 0);
+    for (size_t index = 0; index < lines.size(); index++)
+    {
+        lua_pushstring(L, lines[index].c_str());
+        lua_rawseti(L, -2, index + 1);
+    }
+
+    return 2;
+}
+
+// clang-format off
+static constexpr luaL_Reg functions[] =
+{
+    { "getWrap", Wrap_Font::GetWrap }
+};
+// clang-format on
+
+std::span<const luaL_Reg> Wrap_Font::extensions = functions;
diff --git a/platform/cafe/source/objects/wrap_imagedata_ext.cpp b/platform/cafe/source/objects/wrap_imagedata_ext.cpp
@@ -72,10 +72,10 @@ int Wrap_ImageData::__MapPixelUnsafe(lua_State* L)
 }
 
 // clang-format off
-static constexpr luaL_Reg extensions[] =
+static constexpr luaL_Reg functions[] =
 {
     { "_mapPixelUnsafe", Wrap_ImageData::__MapPixelUnsafe }
 };
 // clang-forma ton
 
-std::span<const luaL_Reg> Wrap_ImageData::extensions = extensions;
+std::span<const luaL_Reg> Wrap_ImageData::extensions = functions;
diff --git a/platform/cafe/source/utilities/driver/hid_ext.cpp b/platform/cafe/source/utilities/driver/hid_ext.cpp
@@ -41,7 +41,6 @@ void HID<Console::CAFE>::CheckSoftwareKeyboard(VPADStatus vpadStatus)
 
     if (isOkButtonPressed || isCancelPressed)
     {
-        nn::swkbd::DisappearInputForm();
         Keyboard()->HideKeyboard();
 
         if (isOkButtonPressed)

diff --git a/platform/cafe/source/utilities/driver/renderer_ext.cpp b/platform/cafe/source/utilities/driver/renderer_ext.cpp
@@ -63,7 +63,7 @@ Renderer<Console::CAFE>::Renderer() :
     GX2SetupContextStateEx(this->state, false);
     GX2SetContextState(this->state);
 
-    GX2SetDepthOnlyControl(false, false, GX2_COMPARE_FUNC_ALWAYS);
+    GX2SetDepthOnlyControl(true, true, GX2_COMPARE_FUNC_ALWAYS);
 
     GX2SetColorControl(GX2_LOGIC_OP_COPY, 0xFF, false, true);
     GX2SetSwapInterval(1);
@@ -249,12 +249,12 @@ void Renderer<Console::CAFE>::BindFramebuffer(Texture<Console::CAFE>* texture)
 
 void Renderer<Console::CAFE>::Present()
 {
+    if (Keyboard() != nullptr)
+        Keyboard()->Draw(this->state);
+
     /* flush commands before copying color buffers */
     GX2Flush();
 
-    if (Keyboard() != nullptr)
-        Keyboard()->Draw();
-
     /* copy our color buffers to their scan buffers */
     for (auto& framebuffer : this->framebuffers)
         framebuffer.second.CopyScanBuffer();

diff --git a/platform/ctr/include/common/screen_ext.hpp b/platform/ctr/include/common/screen_ext.hpp
@@ -12,20 +12,20 @@ namespace love
     };
 
     // clang-format off
-    static constexpr ScreenInfo screenInfo[0x03] =
+    inline constinit ScreenInfo screenInfo[0x03] =
     {
         { Screen::LEFT,   "left",   400, 240 },
         { Screen::RIGHT,  "right",  400, 240 },
         { Screen::BOTTOM, "bottom", 320, 240 }
     };
 
-    static constexpr ScreenInfo altScreenInfo[0x02] =
+    inline constinit ScreenInfo altScreenInfo[0x02] =
     {
         { Screen::LEFT,   "top",    400, 240 },
         { Screen::BOTTOM, "bottom", 320, 240 }
     };
 
-    static constexpr ScreenInfo wideScreenInfo[0x02] =
+    inline constinit ScreenInfo wideScreenInfo[0x02] =
     {
         { Screen::LEFT,   "top",    800, 240 },
         { Screen::BOTTOM, "bottom", 320, 240 }