From cc937302964a04aa8e7cdc0e6796503559efaa69 Mon Sep 17 00:00:00 2001
From: LaG1924 <lag1924@gmail.com>
Date: Sun, 13 Jun 2021 21:20:25 +0500
Subject: Improved RmlUi integration

---
 src/Plugin.cpp |  4 ++++
 src/Plugin.hpp |  3 +++
 src/Render.cpp | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 src/Rml.cpp    |  6 ++++--
 4 files changed, 57 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Plugin.cpp b/src/Plugin.cpp
index 83e9bdd..d7a9820 100644
--- a/src/Plugin.cpp
+++ b/src/Plugin.cpp
@@ -214,6 +214,10 @@ void PluginSystem::Init() {
 	apiTable["RegisterDimension"] = PluginApi::RegisterDimension;
 }
 
+lua_State* PluginSystem::GetLuaState() {
+	return lua.lua_state();
+}
+
 void PluginSystem::Execute(const std::string &luaCode, bool except) {
 	OPTICK_EVENT();
 	try {
diff --git a/src/Plugin.hpp b/src/Plugin.hpp
index a849f5c..7af27a4 100644
--- a/src/Plugin.hpp
+++ b/src/Plugin.hpp
@@ -5,10 +5,13 @@
 #include "Vector.hpp"
 
 class BlockInfo;
+struct lua_State;
 
 namespace PluginSystem {
 	void Init();
 
+	lua_State* GetLuaState();
+
 	void Execute(const std::string &luaCode, bool except = false);
 
 	void CallOnChangeState(std::string newState);
diff --git a/src/Render.cpp b/src/Render.cpp
index 0f04992..48bbadd 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -3,6 +3,7 @@
 #include <easylogging++.h>
 #include <optick.h>
 #include <RmlUi/Core.h>
+#include <RmlUi/Lua.h>
 
 #include "Shader.hpp"
 #include "AssetManager.hpp"
@@ -276,6 +277,13 @@ void Render::HandleEvents() {
 
                     case SDL_SCANCODE_SLASH:
                     case SDL_SCANCODE_T: {
+                        auto state = GetState();
+                        if (state == State::Playing) {
+                            SetState(State::Chat);
+                        }
+                        else if (state == State::Chat) {
+                            SetState(State::Playing);
+                        }
                         break;
                     }
 
@@ -287,14 +295,50 @@ void Render::HandleEvents() {
             }
 
             case SDL_MOUSEMOTION: {
+                if (isMouseCaptured) {
+                    double deltaX = event.motion.xrel;
+                    double deltaY = event.motion.yrel;
+                    deltaX *= sensetivity;
+                    deltaY *= sensetivity * -1;
+                    PUSH_EVENT("MouseMove", std::make_tuple(deltaX, deltaY));
+                } else {
+                    int mouseX, mouseY;
+                    SDL_GetMouseState(&mouseX, &mouseY);
+                    rmlContext->ProcessMouseMove(mouseX, mouseY, 0);
+                }
                 break;
             }
 
             case SDL_MOUSEBUTTONDOWN: {
+                if (isMouseCaptured) {
+                    if (event.button.button == SDL_BUTTON_LEFT)
+                        PUSH_EVENT("LmbPressed", 0);
+                    else if (event.button.button == SDL_BUTTON_RIGHT)
+                        PUSH_EVENT("RmbPressed", 0);
+                } else {
+                    if (event.button.button == SDL_BUTTON_MIDDLE)
+                        event.button.button = SDL_BUTTON_RIGHT;
+                    else if (event.button.button == SDL_BUTTON_RIGHT)
+                        event.button.button = SDL_BUTTON_MIDDLE;
+                    rmlContext->ProcessMouseButtonDown(event.button.button - 1, 0);
+                }
+                    
                 break;
             }
 
             case SDL_MOUSEBUTTONUP: {
+                if (isMouseCaptured) {
+                    if (event.button.button == SDL_BUTTON_LEFT)
+                        PUSH_EVENT("LmbReleased", 0);
+                    else if (event.button.button == SDL_BUTTON_RIGHT)
+                        PUSH_EVENT("RmbReleased", 0);
+                } else {
+                    if (event.button.button == SDL_BUTTON_MIDDLE)
+                        event.button.button = SDL_BUTTON_RIGHT;
+                    else if (event.button.button == SDL_BUTTON_RIGHT)
+                        event.button.button = SDL_BUTTON_MIDDLE;
+                    rmlContext->ProcessMouseButtonUp(event.button.button - 1, 0);
+                }
                 break;
             }
 
@@ -437,6 +481,8 @@ void Render::InitRml() {
     if (!Rml::Initialise())
         LOG(WARNING) << "Rml not initialized";
 
+    Rml::Lua::Initialise(PluginSystem::GetLuaState());
+
     rmlContext = Rml::CreateContext("default", Rml::Vector2i(renderState.WindowWidth, renderState.WindowHeight));
 
     if (!Rml::LoadFontFace("OpenSans-Regular.ttf"))
diff --git a/src/Rml.cpp b/src/Rml.cpp
index 7987121..bcdca0c 100644
--- a/src/Rml.cpp
+++ b/src/Rml.cpp
@@ -84,10 +84,12 @@ RmlRenderInterface::~RmlRenderInterface() {
 void RmlRenderInterface::RenderGeometry(Rml::Vertex* vertices, int num_vertices, int* indices, int num_indices, Rml::TextureHandle texture, const Rml::Vector2f& translation) {
     if (texture) {
         AssetManager::GetAsset<AssetShader>("/altcraft/shaders/rmltex")->shader->Activate();
+        AssetManager::GetAsset<AssetShader>("/altcraft/shaders/rmltex")->shader->SetUniform("translation", glm::vec2(translation.x, translation.y));
         glBindTexture(GL_TEXTURE_2D, texture);
-    }
-    else
+    } else {
         AssetManager::GetAsset<AssetShader>("/altcraft/shaders/rml")->shader->Activate();
+        AssetManager::GetAsset<AssetShader>("/altcraft/shaders/rml")->shader->SetUniform("translation", glm::vec2(translation.x, translation.y));
+    }   
     glCheckError();
 
     glBindVertexArray(Vao);
-- 
cgit v1.2.3