Added Scripting Dependency to Game-Lib

Removed unused Character Controller code
Reduced Target Highlight Intensity from 1.50 to 1.25
Fixed an issue where CameraSaves would fail to load
Implemented Handling for CreatureInfo Cheat Command
Fixed an issue where Text Max Width would incorrectly fail to calculate when Text already had newlines
Improved GameConsole Command suggestions sorting
Improved ModelLoader with respect to loading order and reporting loading progress
Updated all scripts to match the new event data structure
Implemented new Zenith Scripting Functionality
Added a global Zenith State
Added Scripting EventHandler, all events are registered through a "RegisterEvent" lua function now
Removed the Concept of LuaEventHandlerBase and LuaSystemBase
Added Scripting ZenithUtil to simplify fetching the Global Zenith
Updated Submodule Engine

Author: NixAJ

Source/Game-Lib/Game-Lib.lua

@@ -1,5 +1,5 @@
 -- Dependencies are order sensitive on Linux, keep that in mind when adding new dependencies.
-local mod = Solution.Util.CreateModuleTable("Game-Lib", { "renderer", "fileformat", "gameplay", "input", "meta", "luau-analysis", "luau-compiler", "luau-vm", "luau-codegen", "enkits", "utfcpp", "base64", "jolt" })
+local mod = Solution.Util.CreateModuleTable("Game-Lib", { "renderer", "fileformat", "scripting", "gameplay", "input", "meta", "luau-analysis", "luau-compiler", "luau-vm", "luau-codegen", "enkits", "utfcpp", "base64", "jolt" })
 
 Solution.Util.CreateStaticLib(mod.Name, Solution.Projects.Current.BinDir, mod.Dependencies, function()
     local defines = { "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS", "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS"}

Source/Game-Lib/Game-Lib/Application/Application.cpp

@@ -21,8 +21,12 @@
 #include "Game-Lib/Editor/EditorHandler.h"
 #include "Game-Lib/Gameplay/GameConsole/GameConsole.h"
 #include "Game-Lib/Rendering/GameRenderer.h"
-#include "Game-Lib/Scripting/LuaManager.h"
-#include "Game-Lib/Scripting/Systems/LuaSystemBase.h"
+#include "Game-Lib/Scripting/Handlers/GlobalHandler.h"
+#include "Game-Lib/Scripting/Handlers/EventHandler.h"
+#include "Game-Lib/Scripting/Handlers/DatabaseHandler.h"
+#include "Game-Lib/Scripting/Handlers/UIHandler.h"
+#include "Game-Lib/Scripting/Handlers/GameHandler.h"
+#include "Game-Lib/Scripting/Handlers/UnitHandler.h"
 #include "Game-Lib/Util/ClientDBUtil.h"
 #include "Game-Lib/Util/ServiceLocator.h"
 #include "Game-Lib/Util/TextureUtil.h"
@@ -34,8 +38,13 @@
 #include <Base/Util/DebugHandler.h>
 #include <Base/Util/CPUInfo.h>
 
+#include <Meta/Generated/Game/LuaEnum.h>
+
 #include <Network/Client.h>
 
+#include <Scripting/LuaManager.h>
+#include <Scripting/Zenith.h>
+
 #include <enkiTS/TaskScheduler.h>
 #include <entt/entt.hpp>
 #include <imgui/backends/imgui_impl_vulkan.h>
@@ -328,8 +337,22 @@ bool Application::Init()
     // Initialize Databases
     DatabaseReload();
 
-    _luaManager = new Scripting::LuaManager();
-    ServiceLocator::SetLuaManager(_luaManager);
+    // Init Lua Manager
+    {
+        _luaManager = new Scripting::LuaManager();
+        ServiceLocator::SetLuaManager(_luaManager);
+
+        _luaManager->PrepareToAddLuaHandlers((Scripting::LuaHandlerID)Generated::LuaHandlerTypeEnum::Count);
+        _luaManager->SetLuaHandler((Scripting::LuaHandlerID)Generated::LuaHandlerTypeEnum::Global, new Scripting::GlobalHandler());
+        _luaManager->SetLuaHandler((Scripting::LuaHandlerID)Generated::LuaHandlerTypeEnum::Event, new Scripting::EventHandler());
+        _luaManager->SetLuaHandler((Scripting::LuaHandlerID)Generated::LuaHandlerTypeEnum::Database, new Scripting::Database::DatabaseHandler());
+        _luaManager->SetLuaHandler((Scripting::LuaHandlerID)Generated::LuaHandlerTypeEnum::UI, new Scripting::UI::UIHandler());
+        _luaManager->SetLuaHandler((Scripting::LuaHandlerID)Generated::LuaHandlerTypeEnum::Game, new Scripting::Game::GameHandler());
+        _luaManager->SetLuaHandler((Scripting::LuaHandlerID)Generated::LuaHandlerTypeEnum::Unit, new Scripting::Unit::UnitHandler());
+
+        auto globalKey = Scripting::ZenithInfoKey::MakeGlobal(0, 0);
+        _luaManager->GetZenithStateManager().Add(globalKey);
+    }
     _luaManager->Init();
 
     return true;
@@ -373,7 +396,10 @@ bool Application::Tick(f32 deltaTime)
 
             case MessageInbound::Type::DoString:
             {
-                if (!ServiceLocator::GetLuaManager()->DoString(message.data))
+                auto key = Scripting::ZenithInfoKey::MakeGlobal(0, 0);
+                Scripting::Zenith* zenith = _luaManager->GetZenithStateManager().Get(key);
+
+                if (!zenith || !_luaManager->DoString(zenith, message.data))
                 {
                     NC_LOG_ERROR("Failed to run Lua DoString");
                 }

Source/Game-Lib/Game-Lib/ECS/Systems/CharacterController.cpp

@@ -273,7 +273,7 @@ namespace ECS::Systems
                 if (registry->all_of<Components::Model>(targetEntity))
                 {
                     auto& model = registry->get<Components::Model>(targetEntity);
-                    modelLoader->SetModelHighlight(model, 1.5f);
+                    modelLoader->SetModelHighlight(model, 1.25f);
                 }
             }
 
@@ -374,190 +374,6 @@ namespace ECS::Systems
             return true;
         });
     }
-
-#if USE_CHARACTER_CONTROLLER_V2
-    void CharacterController::Update(entt::registry& registry, f32 deltaTime)
-    {
-        InputManager* inputManager = ServiceLocator::GetInputManager();
-        KeybindGroup* keybindGroup = inputManager->GetKeybindGroupByHash("CharacterController"_h);
-
-        Util::EventUtil::OnEvent<Components::MapLoadedEvent>([&](const Components::MapLoadedEvent& event)
-        {
-            InitCharacterController(registry);
-        });
-
-        if (!keybindGroup->IsActive())
-            return;
-
-        entt::registry::context& ctx = registry.ctx();
-        auto& orbitalCameraSettings = ctx.get<Singletons::OrbitalCameraSettings>();
-        bool isInputForwardDown = keybindGroup->IsKeybindPressed("Forward"_h) || (orbitalCameraSettings.mouseLeftDown && orbitalCameraSettings.mouseRightDown);
-        bool isInputBackwardDown = keybindGroup->IsKeybindPressed("Backward"_h);
-        bool isInputLeftDown = keybindGroup->IsKeybindPressed("Left"_h);
-        bool isInputRightDown = keybindGroup->IsKeybindPressed("Right"_h);
-
-        bool isMovingForward = (isInputForwardDown && !isInputBackwardDown);
-        bool isMovingBackward = (isInputBackwardDown && !isInputForwardDown);
-        bool isMovingLeft = (isInputLeftDown && !isInputRightDown);
-        bool isMovingRight = (isInputRightDown && !isInputLeftDown);
-        bool isMoving = isMovingForward || isMovingBackward || isMovingLeft || isMovingRight;
-
-        auto& characterSingleton = ctx.get<Singletons::CharacterSingleton>();
-        auto& characterMovementInfo = registry.get<Components::MovementInfo>(characterSingleton.modelEntity);
-        auto& characterModelTransform = registry.get<Components::Transform>(characterSingleton.modelEntity);
-
-        DebugRenderer* debugRenderer = ServiceLocator::GetGameRenderer()->GetDebugRenderer();
-        auto& transformSystem = TransformSystem::Get(registry);
-        auto& joltState = ctx.get<Singletons::JoltState>();
-        static vec3 Gravity = vec3(0.0f, -19.291105f, 0.0f);
-
-        quat characterRotation = quat(vec3(characterMovementInfo.pitch, characterMovementInfo.yaw, 0.0f));
-        transformSystem.SetWorldRotation(characterSingleton.modelEntity, characterRotation);
-
-        vec3 characterModelStartPosition = characterModelTransform.GetWorldPosition();
-        vec3 characterModelEndPosition = characterModelStartPosition;
-        quat characterModelRotation = characterModelTransform.GetWorldRotation();
-
-        vec3 horizontalMoveVector = vec3((isMovingLeft * 1.0f) + (isMovingRight * -1.0f), 0.0f, (isMovingForward * -1.0f) + (isMovingBackward * 1.0f));
-        vec3 horizontalVelocity = vec3(0.0f);
-        if (isMoving)
-        {
-            horizontalMoveVector = glm::normalize(horizontalMoveVector);
-        }
-
-        bool wasGrounded = characterMovementInfo.movementFlags.grounded;
-        bool isGrounded = false;
-
-        // Check if we are still grounded
-        if (wasGrounded)
-        {
-            vec3 rayStart = characterModelStartPosition + Components::Transform::WORLD_UP;
-            vec3 rayDirection = -Components::Transform::WORLD_UP * 2.0f;
-            JPH::RayCastResult hitResult;
-
-            if (::Util::Physics::CastRay(joltState.physicsSystem, rayStart, rayDirection, hitResult))
-            {
-                if (hitResult.mFraction <= 0.51f)
-                {
-                    vec3 hitPos = rayStart + (hitResult.mFraction * rayDirection);
-
-                    characterModelStartPosition = hitPos;
-                    isGrounded = true;
-
-                    if (isMoving)
-                    {
-                        if (JPH::Body* body = joltState.physicsSystem.GetBodyLockInterface().TryGetBody(hitResult.mBodyID))
-                        {
-                            JPH::Vec3 surfaceNormal = body->GetWorldSpaceSurfaceNormal(hitResult.mSubShapeID2, JPH::Vec3(characterModelStartPosition.x, characterModelStartPosition.y, characterModelStartPosition.z));
-                            vec3 surfaceNormalVec = glm::normalize(vec3(surfaceNormal.GetX(), surfaceNormal.GetY(), surfaceNormal.GetZ()));
-
-                            vec3 localForward = glm::normalize(characterModelTransform.GetLocalForward());
-                            vec3 rightVec = glm::normalize(glm::cross(surfaceNormalVec, localForward));
-                            vec3 forwardVec = glm::normalize(glm::cross(rightVec, surfaceNormalVec));
-
-                            // Draw Surface Normal, RightVec, ForwardVec
-                            debugRenderer->DrawLine3D(hitPos, hitPos + surfaceNormalVec, Color::Green);
-                            debugRenderer->DrawLine3D(characterModelStartPosition, characterModelStartPosition + rightVec, Color::Red);
-                            debugRenderer->DrawLine3D(characterModelStartPosition, characterModelStartPosition + forwardVec, Color::Blue);
-
-                            horizontalVelocity = forwardVec * horizontalMoveVector.z + rightVec * horizontalMoveVector.x;
-                        };
-                    }
-                }
-            }
-        }
-
-        if (isGrounded)
-        {
-            if (isMoving)
-            {
-                vec3 velocity = horizontalVelocity * characterMovementInfo.speed;
-                vec3 verticalVelocity = vec3(0.0f, 0.0f, 0.0f);
-
-                vec3 horizontalMove = velocity * deltaTime;
-
-                vec3 rayStart = characterModelStartPosition + Components::Transform::WORLD_UP;
-                vec3 rayDirection = horizontalMove;
-                JPH::RayCastResult hitResult;
-
-                if (::Util::Physics::CastRay(joltState.physicsSystem, rayStart, rayDirection, hitResult))
-                {
-                    vec3 hitPos = rayStart + (hitResult.mFraction * rayDirection);
-                    characterModelEndPosition = hitPos;
-                }
-                else
-                {
-                    characterModelEndPosition = characterModelStartPosition + horizontalMove;
-                }
-            }
-        }
-        else
-        {
-            vec3 gravityDirection = Gravity * deltaTime;
-
-            JPH::Vec3 start = JPH::Vec3(characterModelStartPosition.x, characterModelStartPosition.y + 1.0f, characterModelStartPosition.z);
-            JPH::Vec3 direction = JPH::Vec3(gravityDirection.x, gravityDirection.y + -1.0f, gravityDirection.z);
-
-            JPH::RRayCast ray(start, direction);
-            JPH::RayCastResult hit;
-
-            if (joltState.physicsSystem.GetNarrowPhaseQuery().CastRay(ray, hit))
-            {
-                JPH::Vec3 hitPos = ray.GetPointOnRay(hit.mFraction);
-                vec3 hitPosition = vec3(hitPos.GetX(), hitPos.GetY(), hitPos.GetZ());
-
-                characterModelEndPosition = hitPosition;
-                isGrounded = true;
-            }
-            else
-            {
-                characterModelEndPosition = characterModelStartPosition + gravityDirection;
-            }
-        }
-
-        characterMovementInfo.movementFlags.grounded = isGrounded;
-        transformSystem.SetWorldPosition(characterSingleton.entity, characterModelEndPosition);
-    }
-
-    void CharacterController::InitCharacterController(entt::registry& registry)
-    {
-        entt::registry::context& ctx = registry.ctx();
-
-        auto& characterSingleton = ctx.get<Singletons::CharacterSingleton>();
-        auto& movementInfo = registry.get<Components::MovementInfo>(characterSingleton.modelEntity);
-
-        ModelLoader* modelLoader = ServiceLocator::GetGameRenderer()->GetModelLoader();
-        modelLoader->LoadDisplayIDForEntity(characterSingleton.modelEntity, 50);
-
-        MapLoader* mapLoader = ServiceLocator::GetGameRenderer()->GetMapLoader();
-        JPH::Vec3 newPosition = JPH::Vec3(-1500.0f, 350.0f, 1250.0f);
-
-        if (mapLoader->GetCurrentMapID() == std::numeric_limits<u32>().max())
-        {
-            newPosition = JPH::Vec3(0.0f, 0.0f, 0.0f);
-        }
-
-        characterSingleton.targetEntity = entt::null;
-        characterSingleton.positionOrRotationUpdateTimer = 0.0f;
-        characterSingleton.positionOrRotationIsDirty = true;
-        characterSingleton.canControlInAir = true;
-
-        movementInfo.pitch = 0.0f;
-        movementInfo.yaw = 0.0f;
-        movementInfo.speed = 7.1111f;
-        movementInfo.jumpSpeed = 7.9555f;
-        movementInfo.gravityModifier = 1.0f;
-        movementInfo.jumpState = Components::JumpState::None;
-
-        auto& transformSystem = ctx.get<TransformSystem>();
-        auto& orbitalCameraSettings = ctx.get<Singletons::OrbitalCameraSettings>();
-
-        transformSystem.ParentEntityTo(characterSingleton.entity, orbitalCameraSettings.entity);
-        transformSystem.SetLocalPosition(orbitalCameraSettings.entity, orbitalCameraSettings.cameraCurrentZoomOffset);
-        transformSystem.SetWorldPosition(characterSingleton.entity, vec3(newPosition.GetX(), newPosition.GetY(), newPosition.GetZ()));
-    }
-
-#else
     void CharacterController::Update(entt::registry& registry, f32 deltaTime)
     {
         ZoneScopedN("ECS::CharacterController::Preprocessing");
@@ -968,5 +784,4 @@ namespace ECS::Systems
             characterSingleton.moverEntity = entt::null;
         }
     }
-#endif
 }