fixed shader textures and argb colors

Author: KaleiAlma

LuaSTG/Core/Graphics/Renderer_Shader_OpenGL.cpp

@@ -363,8 +363,8 @@ namespace Core::Graphics
 
         GLint amt_uniforms = 0;
         glGetProgramiv(opengl_prgm, GL_ACTIVE_UNIFORMS, &amt_uniforms);
+        glUseProgram(opengl_prgm);
 
-        GLint amt_samplers = 0;
         GLuint tex_idx = 0;
 
         for (GLuint uniform = 0; uniform < amt_uniforms; uniform++)
@@ -383,8 +383,10 @@ namespace Core::Graphics
             {
                 LocalTexture2D local_texture2d;
                 local_texture2d.index = tex_idx;
-                tex_idx++;
 
+                glUniform1i(uniform, tex_idx);
+
+                tex_idx++;
                 m_texture2d_map.emplace(name, std::move(local_texture2d));
             }
             else // Handle Uniform Buffers

LuaSTG/Core/Type.hpp

@@ -192,11 +192,11 @@ namespace Core
 		uint8_t a;
 
 		Color4B() : r(0), g(0), b(0), a(0) {}
-		Color4B(uint32_t ARGB) : r(0), g(0), b(0), a(0) { color(ARGB); }
+		Color4B(uint32_t ARGB) : r(ARGB >> 16 & 255), g(ARGB >> 8 & 255), b(ARGB & 255), a(ARGB >> 24 & 255) {}
 		Color4B(uint8_t const r_, uint8_t const g_, uint8_t const b_) : r(r_), g(g_), b(b_), a(static_cast<uint8_t>(255u)) {}
 		Color4B(uint8_t const r_, uint8_t const g_, uint8_t const b_, uint8_t const a_) : r(r_), g(g_), b(b_), a(a_) {}
 
-		inline void color(uint32_t ARGB) noexcept { *((uint32_t*)(&r)) = ARGB; }
+		inline void color(uint32_t ABGR) noexcept { *((uint32_t*)(&r)) = ABGR; }
 		inline uint32_t color() const noexcept { return *((uint32_t*)(&r)); }
 
 		bool operator==(Color4B const& right) const noexcept

LuaSTG/LuaSTG/LuaBinding/LW_Render.cpp

@@ -22,7 +22,7 @@ void LuaSTGPlus::LuaWrapper::RenderWrapper::Register(lua_State* L) noexcept
                 ))
             {
                 return luaL_error(L, "can't draw text '%s'.", luaL_checkstring(L, 1));
-            }	
+            }
             return 0;
         }
         static int RenderTTF(lua_State* L) noexcept
@@ -36,7 +36,7 @@ void LuaSTGPlus::LuaWrapper::RenderWrapper::Register(lua_State* L) noexcept
                 (float)luaL_checknumber(L, 6),
                 LRES.GetGlobalImageScaleFactor() * (float)luaL_optnumber(L, 9, 1.0),
                 luaL_checkinteger(L, 7),
-                *LuaWrapper::ColorWrapper::Cast(L, 8)
+                *ColorWrapper::Cast(L, 8)
             ))
             {
                 return luaL_error(L, "can't render font '%s'.", luaL_checkstring(L, 1));
@@ -69,7 +69,7 @@ void LuaSTGPlus::LuaWrapper::RenderWrapper::Register(lua_State* L) noexcept
             // group color
             LPOOL.DrawGroupCollider2(
                 luaL_checkinteger(L, 1),
-                *LuaWrapper::ColorWrapper::Cast(L, 2)
+                *ColorWrapper::Cast(L, 2)
             );
             return 0;
         }