feat: use sol2 and expose tex manipulation

sol2 lets us do way more C++:y bindings to Lua, here used for exposing
the texture manipulation class used to stack DDS textures and query
image information.

Author: zao

CMakeLists.txt

@@ -115,6 +115,7 @@ find_package(gli CONFIG REQUIRED)
 find_package(LuaJIT REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(re2 CONFIG REQUIRED)
+find_package(sol2 CONFIG REQUIRED)
 find_package(Threads REQUIRED)
 find_package(zstd REQUIRED)
 find_package(ZLIB REQUIRED)
@@ -212,8 +213,10 @@ target_link_libraries(SimpleGraphic
     PkgConfig::libjxl
     PkgConfig::libjxl_threads
     re2::re2
+    sol2
     Threads::Threads
     ZLIB::ZLIB
+    zstd::libzstd_shared
 )
 
 install(FILES $<TARGET_RUNTIME_DLLS:SimpleGraphic> DESTINATION ".")

ui_api.cpp

@@ -7,8 +7,11 @@
 #include "ui_local.h"
 
 #include <filesystem>
+#include <fstream>
 #include <zlib.h>
 
+#include "core/core_tex_manipulation.h"
+
 /* OnFrame()
 ** OnChar("<char>")
 ** OnKeyDown("<keyName>")
@@ -36,6 +39,18 @@
 ** imgHandle:SetLoadingPriority(pri)
 ** width, height = imgHandle:ImageSize()
 **
+** texHandle = NewTexHandle()
+** texHandle:Allocate(format, width, height, layerCount, mipCount)
+** texHandle:Load("<fileName>")
+** texHandle:Save("<fileName>")
+** info = texHandle:Info()
+** isvalid = texHandle:IsValid()
+** texHandle:StackTextures({tex1, tex2, .. texN})  -- all textures must be same shape and format
+** -- texHandle:SetLayer(srcTexHandle, layer)
+** -- texHandle:CopyImage(srcTexHandle, targetX, targetY)
+** -- texHandle:Transcode(newFormat)
+** -- texHandle:GenerateMipmaps()
+**
 ** RenderInit(["flag1"[, "flag2"...]])  flag:{"DPI_AWARE"}
 ** width, height = GetScreenSize()
 ** scaleFactor = GetScreenScale()
@@ -94,7 +109,7 @@
 // Grab UI main pointer from the registry
 static ui_main_c* GetUIPtr(lua_State* L)
 {
-	lua_rawgeti(L, LUA_REGISTRYINDEX, 0);
+	lua_geti(L, LUA_REGISTRYINDEX, ui_main_c::REGISTRY_KEY);
 	ui_main_c* ui = (ui_main_c*)lua_touserdata(L, -1);
 	lua_pop(L, 1);
 	return ui;
@@ -296,7 +311,7 @@ SG_LUA_CPP_FUN_BEGIN(NewArtHandle)
 		return 0;
 
 	const auto comp = component_count(format);
-	if (comp != 1 || comp != 3 || comp != 4)
+	if (comp != 1 && comp != 3 && comp != 4)
 		return 0;
 
 	artHandle_s* artHandle = (artHandle_s*)lua_newuserdata(L, sizeof(artHandle_s));
@@ -1751,6 +1766,7 @@ static int l_Exit(lua_State* L)
 
 int ui_main_c::InitAPI(lua_State* L)
 {
+	sol::state_view lua(L);
 	luaL_openlibs(L);
 
 	// Add "lua/" subdir for non-JIT Lua
@@ -1814,6 +1830,33 @@ int ui_main_c::InitAPI(lua_State* L)
 	lua_setfield(L, -2, "Size");
 	lua_setfield(L, LUA_REGISTRYINDEX, "uiarthandlemeta");
 
+	sol::usertype<Texture_c> textureType = lua.new_usertype<Texture_c>("Texture",
+		sol::constructors<Texture_c()>());
+
+	textureType["Allocate"] = sol::overload(
+		sol::resolve<bool(gli::format,int,int,int,int)>(&Texture_c::Allocate),
+		sol::resolve<bool(std::string_view,int,int,int,int)>(&Texture_c::Allocate));
+	textureType["Load"] = &Texture_c::Load;
+	textureType["Save"] = &Texture_c::Save;
+	textureType["Info"] = &Texture_c::Info;
+	textureType["IsValid"] = &Texture_c::IsValid;
+	
+	//textureType["SetLayer"] = &Texture_c::SetLayer;
+	//textureType["CopyImage"] = &Texture_c::CopyImage;
+	//textureType["Transcode"] = &Texture_c::Transcode;
+	//textureType["GenerateMipmaps"] = &Texture_c::Transcode;
+
+	textureType["StackTextures"] = &Texture_c::StackTextures;
+
+	sol::usertype<TextureInfo_s> textureInfoType = lua.new_usertype<TextureInfo_s>("TextureInfo");
+
+	textureInfoType["formatId"] = &TextureInfo_s::formatId;
+	textureInfoType["formatStr"] = &TextureInfo_s::formatStr;
+	textureInfoType["width"] = &TextureInfo_s::width;
+	textureInfoType["height"] = &TextureInfo_s::height;
+	textureInfoType["layerCount"] = &TextureInfo_s::layerCount;
+	textureInfoType["mipCount"] = &TextureInfo_s::mipCount;
+
 	// Rendering
 	ADDFUNC(RenderInit);
 	ADDFUNC(GetScreenSize);

ui_local.h

@@ -11,21 +11,12 @@
 
 #include "ui.h"
 
-extern "C" {
-#ifdef _WIN32
-#include <luajit/lua.h>
-#include <luajit/lauxlib.h>
-#include <luajit/lualib.h>
-#include <luajit/luajit.h>
-#else
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-#endif
-}
+#define SOL_ALL_SAFETIES_ON 1
+#define SOL_USING_CXX_LUAJIT 1
+#include <sol/sol.hpp>
 
 #include "ui_console.h"
 #include "ui_debug.h"
 #include "ui_subscript.h"
 
-#include "ui_main.h"
+#include "ui_main.h"

ui_main.cpp

@@ -189,7 +189,7 @@ static int traceback (lua_State *L) {
 
 static int l_panicFunc(lua_State* L)
 {
-	lua_rawgeti(L, LUA_REGISTRYINDEX, 0);
+	lua_rawgeti(L, LUA_REGISTRYINDEX, ui_main_c::REGISTRY_KEY);
 	ui_main_c* ui = (ui_main_c*)lua_touserdata(L, -1);
 	lua_pop(L, 1);
 	ui->sys->Error("Unprotected Lua error:\n%s", lua_tostring(L, -1));
@@ -289,11 +289,12 @@ void ui_main_c::ScriptInit()
 
 	// Initialise Lua
 	sys->con->Printf("Initialising Lua...\n");
-	L = luaL_newstate();
+	solState.emplace();
+	L = solState->lua_state();
 	if ( !L ) sys->Error("Error: unable to create Lua state.");
 	lua_atpanic(L, l_panicFunc);
 	lua_pushlightuserdata(L, this);
-	lua_rawseti(L, LUA_REGISTRYINDEX, 0);
+	lua_seti(L, LUA_REGISTRYINDEX, ui_main_c::REGISTRY_KEY);
 	lua_pushcfunction(L, traceback);
 	lua_pushvalue(L, -1);
 	lua_setfield(L, LUA_REGISTRYINDEX, "traceback");
@@ -444,8 +445,8 @@ void ui_main_c::ScriptShutdown()
 	ui_IDebug::FreeHandle(debug);
 
 	// Shutdown Lua
-	lua_close(L);
 	L = NULL;
+	solState.reset();
 }
 
 void ui_main_c::Shutdown()

ui_main.h

@@ -34,6 +34,7 @@ class ui_main_c: public ui_IMain {
 	dword	subScriptSize = 0;
 	ui_ISubScript** subScriptList = nullptr;
 
+	std::optional<sol::state> solState;
 	lua_State* L = nullptr;
 	char*	scriptName = nullptr;
 	char*	scriptCfg = nullptr;
@@ -65,4 +66,6 @@ class ui_main_c: public ui_IMain {
 	void	CallKeyHandler(const char* hname, int key, bool dblclk);
 	const char* NameForKey(int key);
 	int		KeyForName(const char* name);
+
+	enum { REGISTRY_KEY = 1 };
 };

vcpkg.json

@@ -11,6 +11,8 @@
     "luajit",
     "pkgconf",
     "re2",
+    "sol2",
+    "zstd",
     "zlib"
   ]
 }