From b1288c52774e9bf7de0a6e0675bcbf80f37fb9a6 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 9 May 2016 19:38:30 +0200 Subject: [PATCH] Sdk/LuaBinding: Make LuaClass members public Former-commit-id: 89e8182c833073e12d18ec5a0f0ae0d0f689c4f1 --- SDK/include/NDK/LuaBinding.hpp | 79 +++++++++++++++++----------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/SDK/include/NDK/LuaBinding.hpp b/SDK/include/NDK/LuaBinding.hpp index 0c1dea15e..cb4fc24e5 100644 --- a/SDK/include/NDK/LuaBinding.hpp +++ b/SDK/include/NDK/LuaBinding.hpp @@ -37,29 +37,6 @@ namespace Ndk void RegisterClasses(Nz::LuaInstance& instance); - private: - void BindCore(); - void BindMath(); - void BindNetwork(); - void BindSDK(); - void BindUtility(); - - void RegisterCore(Nz::LuaInstance& instance); - void RegisterMath(Nz::LuaInstance& instance); - void RegisterNetwork(Nz::LuaInstance& instance); - void RegisterSDK(Nz::LuaInstance& instance); - void RegisterUtility(Nz::LuaInstance& instance); - - #ifndef NDK_SERVER - void BindAudio(); - void BindGraphics(); - void BindRenderer(); - - void RegisterAudio(Nz::LuaInstance& instance); - void RegisterGraphics(Nz::LuaInstance& instance); - void RegisterRenderer(Nz::LuaInstance& instance); - #endif - // Core Nz::LuaClass clockClass; Nz::LuaClass directoryClass; @@ -83,28 +60,12 @@ namespace Ndk Nz::LuaClass nodeClass; // SDK - using AddComponentFunc = int(*)(Nz::LuaInstance&, EntityHandle&); - using GetComponentFunc = int(*)(Nz::LuaInstance&, BaseComponent&); - - struct ComponentBinding - { - AddComponentFunc adder; - ComponentIndex index; - GetComponentFunc getter; - Nz::String name; - }; - - ComponentBinding* QueryComponentIndex(Nz::LuaInstance& lua, int argIndex = 1); - Nz::LuaClass application; Nz::LuaClass entityClass; Nz::LuaClass nodeComponent; Nz::LuaClass velocityComponent; Nz::LuaClass worldClass; - std::vector m_componentBinding; - std::unordered_map m_componentBindingByName; - #ifndef NDK_SERVER // Audio Nz::LuaClass musicClass; @@ -120,6 +81,46 @@ namespace Ndk Nz::LuaClass consoleClass; Nz::LuaClass graphicsComponent; #endif + + private: + void BindCore(); + void BindMath(); + void BindNetwork(); + void BindSDK(); + void BindUtility(); + + void RegisterCore(Nz::LuaInstance& instance); + void RegisterMath(Nz::LuaInstance& instance); + void RegisterNetwork(Nz::LuaInstance& instance); + void RegisterSDK(Nz::LuaInstance& instance); + void RegisterUtility(Nz::LuaInstance& instance); + + #ifndef NDK_SERVER + void BindAudio(); + void BindGraphics(); + void BindRenderer(); + + void RegisterAudio(Nz::LuaInstance& instance); + void RegisterGraphics(Nz::LuaInstance& instance); + void RegisterRenderer(Nz::LuaInstance& instance); + #endif + + + using AddComponentFunc = int(*)(Nz::LuaInstance&, EntityHandle&); + using GetComponentFunc = int(*)(Nz::LuaInstance&, BaseComponent&); + + struct ComponentBinding + { + AddComponentFunc adder; + ComponentIndex index; + GetComponentFunc getter; + Nz::String name; + }; + + ComponentBinding* QueryComponentIndex(Nz::LuaInstance& lua, int argIndex = 1); + + std::vector m_componentBinding; + std::unordered_map m_componentBindingByName; }; template