diff options
author | LaG1924 <lag1924@gmail.com> | 2021-06-29 13:22:31 +0200 |
---|---|---|
committer | LaG1924 <lag1924@gmail.com> | 2021-06-29 13:22:31 +0200 |
commit | cfb56c9255fbf37a6bb9f0a6758db87320364cf6 (patch) | |
tree | 3087614059392d5c2b9927ddf37ad01955e7bf84 /src | |
parent | Removed old items ids (diff) | |
download | AltCraft-cfb56c9255fbf37a6bb9f0a6758db87320364cf6.tar AltCraft-cfb56c9255fbf37a6bb9f0a6758db87320364cf6.tar.gz AltCraft-cfb56c9255fbf37a6bb9f0a6758db87320364cf6.tar.bz2 AltCraft-cfb56c9255fbf37a6bb9f0a6758db87320364cf6.tar.lz AltCraft-cfb56c9255fbf37a6bb9f0a6758db87320364cf6.tar.xz AltCraft-cfb56c9255fbf37a6bb9f0a6758db87320364cf6.tar.zst AltCraft-cfb56c9255fbf37a6bb9f0a6758db87320364cf6.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/DebugInfo.cpp | 3 | ||||
-rw-r--r-- | src/DebugInfo.hpp | 3 | ||||
-rw-r--r-- | src/Plugin.cpp | 24 | ||||
-rw-r--r-- | src/RendererWorld.cpp | 2 | ||||
-rw-r--r-- | src/RendererWorld.hpp | 3 |
5 files changed, 30 insertions, 5 deletions
diff --git a/src/DebugInfo.cpp b/src/DebugInfo.cpp index 89e9425..37d181d 100644 --- a/src/DebugInfo.cpp +++ b/src/DebugInfo.cpp @@ -4,4 +4,5 @@ std::atomic_int DebugInfo::totalSections(0); std::atomic_int DebugInfo::renderSections(0); std::atomic_int DebugInfo::readyRenderer(0); std::atomic_int DebugInfo::gameThreadTime(0); -std::atomic_int DebugInfo::renderFaces(0);
\ No newline at end of file +std::atomic_int DebugInfo::renderFaces(0); +std::atomic_int DebugInfo::culledSections(0); diff --git a/src/DebugInfo.hpp b/src/DebugInfo.hpp index e6aa17c..7ba1686 100644 --- a/src/DebugInfo.hpp +++ b/src/DebugInfo.hpp @@ -5,7 +5,8 @@ struct DebugInfo { static std::atomic_int totalSections; static std::atomic_int renderSections; + static std::atomic_int culledSections; static std::atomic_int readyRenderer; static std::atomic_int gameThreadTime; static std::atomic_int renderFaces; -};
\ No newline at end of file +}; diff --git a/src/Plugin.cpp b/src/Plugin.cpp index ce995fc..f759d5f 100644 --- a/src/Plugin.cpp +++ b/src/Plugin.cpp @@ -11,6 +11,7 @@ #include "Event.hpp" #include "AssetManager.hpp" #include "Settings.hpp" +#include "DebugInfo.hpp" struct Plugin { @@ -108,6 +109,25 @@ namespace PluginApi { void SettingsUpdate() { PUSH_EVENT("SettingsUpdate", 0); } + + int GetDebugValue(int valId) { + switch (valId) { + case 0: + return DebugInfo::totalSections; + case 1: + return DebugInfo::renderSections; + case 2: + return DebugInfo::readyRenderer; + case 3: + return DebugInfo::gameThreadTime; + case 4: + return DebugInfo::renderFaces; + case 5: + return DebugInfo::culledSections; + default: + return 0; + } + } } int LoadFileRequire(lua_State* L) { @@ -194,6 +214,8 @@ void PluginSystem::Init() { "GetEntitiesList", &World::GetEntitiesList, "GetEntity",&World::GetEntityPtr, "Raycast", &World::Raycast, + "GetBlockLight", sol::resolve<unsigned char(Vector)const>(&World::GetBlockLight), + "GetBlockSkyLight", sol::resolve<unsigned char(Vector)const>(&World::GetBlockSkyLight), "GetBlockId", &World::GetBlockId, "SetBlockId", &World::SetBlockId); @@ -268,6 +290,8 @@ void PluginSystem::Init() { apiSettings["WriteDouble"] = Settings::WriteDouble; apiTable["SettingsUpdate"] = PluginApi::SettingsUpdate; apiTable["GetTime"] = GetTime; + apiTable["GetBlockInfo"] = GetBlockInfo; + apiTable["GetDebugValue"] = PluginApi::GetDebugValue; } lua_State* PluginSystem::GetLuaState() { diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp index e3ef738..6996762 100644 --- a/src/RendererWorld.cpp +++ b/src/RendererWorld.cpp @@ -428,7 +428,7 @@ void RendererWorld::Render(RenderState & renderState) { section.second.Render(renderState); renderedFaces += section.second.numOfFaces; } - this->culledSections = culledSections; + DebugInfo::culledSections = culledSections; DebugInfo::renderFaces = renderedFaces; glCheckError(); } diff --git a/src/RendererWorld.hpp b/src/RendererWorld.hpp index d031179..85cb736 100644 --- a/src/RendererWorld.hpp +++ b/src/RendererWorld.hpp @@ -60,5 +60,4 @@ public: void Update(double timeToUpdate); - int culledSections = 0; -};
\ No newline at end of file +}; |