SDK/Lua: Rework LuaBinding classes to try to improve compile time and binary size

SDK/include/NDK/Console.hpp

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#ifndef NDK_SERVER
 #ifndef NDK_CONSOLE_HPP
 #define NDK_CONSOLE_HPP
 
@@ -99,3 +100,4 @@ namespace Ndk
 #include <NDK/Console.inl>
 
 #endif // NDK_CONSOLE_HPP
+#endif // NDK_SERVER

SDK/include/NDK/LuaBinding.hpp

@@ -7,28 +7,17 @@
 #ifndef NDK_LUABINDING_HPP
 #define NDK_LUABINDING_HPP
 
-#include <Nazara/Core.hpp>
-#include <Nazara/Lua.hpp>
-#include <Nazara/Math.hpp>
-#include <Nazara/Network.hpp>
-#include <Nazara/Utility.hpp>
-#include <NDK/Application.hpp>
-#include <NDK/Components.hpp>
+#include <NDK/BaseComponent.hpp>
 #include <NDK/Entity.hpp>
-#include <NDK/Systems.hpp>
-#include <NDK/World.hpp>
-
-#ifndef NDK_SERVER
-#include <Nazara/Audio.hpp>
-#include <Nazara/Graphics.hpp>
-#include <Nazara/Renderer.hpp>
-#include <NDK/Console.hpp>
-#endif
+#include <NDK/LuaBinding_Base.hpp>
+#include <memory>
 
 namespace Ndk
 {
 	class NDK_API LuaBinding
 	{
+		friend class LuaBinding_SDK;
+
 		public:
 			LuaBinding();
 			~LuaBinding() = default;
@@ -37,86 +26,24 @@ namespace Ndk
 
 			void RegisterClasses(Nz::LuaInstance& instance);
 
-			// Core
-			Nz::LuaClass<Nz::Clock> clock;
-			Nz::LuaClass<Nz::Directory> directory;
-			Nz::LuaClass<Nz::File> file;
-			Nz::LuaClass<Nz::Stream> stream;
-
-			// Math
-			Nz::LuaClass<Nz::EulerAnglesd> eulerAngles;
-			Nz::LuaClass<Nz::Matrix4d> matrix4d;
-			Nz::LuaClass<Nz::Quaterniond> quaternion;
-			Nz::LuaClass<Nz::Rectd> rect;
-			Nz::LuaClass<Nz::Vector2d> vector2d;
-			Nz::LuaClass<Nz::Vector3d> vector3d;
-
-			// Network
-			Nz::LuaClass<Nz::AbstractSocket> abstractSocket;
-			Nz::LuaClass<Nz::IpAddress> ipAddress;
-
-			// Utility
-			Nz::LuaClass<Nz::AbstractImageRef> abstractImage;
-			Nz::LuaClass<Nz::FontRef> font;
-			Nz::LuaClass<Nz::Keyboard> keyboard;
-			Nz::LuaClass<Nz::Node> node;
-
-			// SDK
-			Nz::LuaClass<Application*> application;
-			Nz::LuaClass<EntityHandle> entity;
-			Nz::LuaClass<NodeComponentHandle> nodeComponent;
-			Nz::LuaClass<VelocityComponentHandle> velocityComponent;
-			Nz::LuaClass<WorldHandle> world;
+			std::unique_ptr<LuaBinding_Base> core;
+			std::unique_ptr<LuaBinding_Base> math;
+			std::unique_ptr<LuaBinding_Base> network;
+			std::unique_ptr<LuaBinding_Base> sdk;
+			std::unique_ptr<LuaBinding_Base> utility;
 
 			#ifndef NDK_SERVER
-			// Audio
-			Nz::LuaClass<Nz::Music> music;
-			Nz::LuaClass<Nz::Sound> sound;
-			Nz::LuaClass<Nz::SoundBufferRef> soundBuffer;
-			Nz::LuaClass<Nz::SoundEmitter> soundEmitter;
-
-			// Graphics
-			Nz::LuaClass<Nz::AbstractViewer> abstractViewer;
-			Nz::LuaClass<Nz::InstancedRenderableRef> instancedRenderable;
-			Nz::LuaClass<Nz::MaterialRef> material;
-			Nz::LuaClass<Nz::ModelRef> model;
-			Nz::LuaClass<Nz::SpriteRef> sprite;
-			Nz::LuaClass<Nz::SpriteLibrary> spriteLibrary;
-			Nz::LuaClass<Nz::TextureLibrary> textureLibrary;
-			Nz::LuaClass<Nz::TextureManager> textureManager;
-
-			// Renderer
-			Nz::LuaClass<Nz::TextureRef> texture;
-
-			// SDK
-			Nz::LuaClass<CameraComponentHandle> cameraComponent;
-			Nz::LuaClass<ConsoleHandle> console;
-			Nz::LuaClass<GraphicsComponentHandle> graphicsComponent;
+			std::unique_ptr<LuaBinding_Base> audio;
+			std::unique_ptr<LuaBinding_Base> graphics;
+			std::unique_ptr<LuaBinding_Base> renderer;
 			#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
+			template<typename T>
+			static int AddComponentOfType(Nz::LuaInstance& lua, EntityHandle& handle);
 
+			template<typename T>
+			static int PushComponentOfType(Nz::LuaInstance& lua, BaseComponent& component);
 
 			using AddComponentFunc = int(*)(Nz::LuaInstance&, EntityHandle&);
 			using GetComponentFunc = int(*)(Nz::LuaInstance&, BaseComponent&);
@@ -134,12 +61,6 @@ namespace Ndk
 			std::vector<ComponentBinding> m_componentBinding;
 			std::unordered_map<Nz::String, ComponentIndex> m_componentBindingByName;
 	};
-
-	template<typename T>
-	int AddComponentOfType(Nz::LuaInstance& lua, EntityHandle& handle);
-
-	template<typename T>
-	int PushComponentOfType(Nz::LuaInstance& lua, BaseComponent& component);
 }
 
 #include <NDK/LuaBinding.inl>

SDK/include/NDK/LuaBinding.inl

@@ -32,18 +32,8 @@ namespace Ndk
 		m_componentBindingByName[name] = T::componentIndex;
 	}
 
-	/*!
-	* \brief Adds a component to an entity
-	* \return 1 in case of success
-	*
-	* \param instance Lua instance that will interact with the component
-	* \param handle Entity which component will be added to
-	*
-	* \remark T must be a subtype of BaseComponent
-	*/
-
 	template<typename T>
-	int AddComponentOfType(Nz::LuaInstance& lua, EntityHandle& handle)
+	int LuaBinding::AddComponentOfType(Nz::LuaInstance& lua, EntityHandle& handle)
 	{
 		static_assert(std::is_base_of<BaseComponent, T>::value, "ComponentType must inherit BaseComponent");
 
@@ -52,18 +42,8 @@ namespace Ndk
 		return 1;
 	}
 
-	/*!
-	* \brief Pushes a component
-	* \return 1 in case of success
-	*
-	* \param instance Lua instance that will interact with the component
-	* \param component Component that will be pushed
-	*
-	* \remark T must be a subtype of BaseComponent
-	*/
-
 	template<typename T>
-	int PushComponentOfType(Nz::LuaInstance& lua, BaseComponent& component)
+	int LuaBinding::PushComponentOfType(Nz::LuaInstance& lua, BaseComponent& component)
 	{
 		static_assert(std::is_base_of<BaseComponent, T>::value, "ComponentType must inherit BaseComponent");
 

SDK/include/NDK/LuaBinding_Audio.hpp

@@ -0,0 +1,33 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_AUDIO_HPP
+#define NDK_LUABINDING_AUDIO_HPP
+
+#include <Nazara/Audio/Music.hpp>
+#include <Nazara/Audio/Sound.hpp>
+#include <Nazara/Audio/SoundBuffer.hpp>
+#include <Nazara/Audio/SoundEmitter.hpp>
+#include <NDK/LuaBinding_Base.hpp>
+
+namespace Ndk
+{
+	class NDK_API LuaBinding_Audio : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_Audio(LuaBinding& binding);
+			~LuaBinding_Audio() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			Nz::LuaClass<Nz::Music> music;
+			Nz::LuaClass<Nz::Sound> sound;
+			Nz::LuaClass<Nz::SoundBufferRef> soundBuffer;
+			Nz::LuaClass<Nz::SoundEmitter> soundEmitter;
+	};
+}
+
+#endif // NDK_LUABINDING_CORE_HPP

SDK/include/NDK/LuaBinding_Base.hpp

@@ -0,0 +1,53 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_BASE_HPP
+#define NDK_LUABINDING_BASE_HPP
+
+#include <Nazara/Lua/LuaClass.hpp>
+#include <Nazara/Lua/LuaInstance.hpp>
+#include <NDK/Prerequesites.hpp>
+
+namespace Ndk
+{
+	class LuaBinding;
+
+	class LuaBinding_Audio;
+	class LuaBinding_Core;
+	class LuaBinding_Graphics;
+	class LuaBinding_Math;
+	class LuaBinding_Network;
+	class LuaBinding_Renderer;
+	class LuaBinding_SDK;
+	class LuaBinding_Utility;
+
+	class NDK_API LuaBinding_Base
+	{
+		public:
+			LuaBinding_Base(LuaBinding& binding);
+			virtual ~LuaBinding_Base();
+
+			virtual void Register(Nz::LuaInstance& instance) = 0;
+
+			// Implementation lies in the respective .cpp files (still searching for a cleaner way..)
+			static std::unique_ptr<LuaBinding_Base> BindCore(LuaBinding& binding);
+			static std::unique_ptr<LuaBinding_Base> BindMath(LuaBinding& binding);
+			static std::unique_ptr<LuaBinding_Base> BindNetwork(LuaBinding& binding);
+			static std::unique_ptr<LuaBinding_Base> BindSDK(LuaBinding& binding);
+			static std::unique_ptr<LuaBinding_Base> BindUtility(LuaBinding& binding);
+
+			#ifndef NDK_SERVER
+			static std::unique_ptr<LuaBinding_Base> BindAudio(LuaBinding& binding);
+			static std::unique_ptr<LuaBinding_Base> BindGraphics(LuaBinding& binding);
+			static std::unique_ptr<LuaBinding_Base> BindRenderer(LuaBinding& binding);
+			#endif
+
+		protected:
+			LuaBinding& m_binding;
+	};
+}
+
+#endif // NDK_LUABINDING_BASE_HPP

SDK/include/NDK/LuaBinding_Core.hpp

@@ -0,0 +1,33 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_CORE_HPP
+#define NDK_LUABINDING_CORE_HPP
+
+#include <Nazara/Core/Clock.hpp>
+#include <Nazara/Core/Directory.hpp>
+#include <Nazara/Core/File.hpp>
+#include <Nazara/Core/Stream.hpp>
+#include <NDK/LuaBinding_Base.hpp>
+
+namespace Ndk
+{
+	class NDK_API LuaBinding_Core : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_Core(LuaBinding& binding);
+			~LuaBinding_Core() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			Nz::LuaClass<Nz::Clock> clock;
+			Nz::LuaClass<Nz::Directory> directory;
+			Nz::LuaClass<Nz::File> file;
+			Nz::LuaClass<Nz::Stream> stream;
+	};
+}
+
+#endif // NDK_LUABINDING_CORE_HPP

SDK/include/NDK/LuaBinding_Graphics.hpp

@@ -0,0 +1,36 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_GRAPHICS_HPP
+#define NDK_LUABINDING_GRAPHICS_HPP
+
+#include <Nazara/Graphics/AbstractViewer.hpp>
+#include <Nazara/Graphics/InstancedRenderable.hpp>
+#include <Nazara/Graphics/Material.hpp>
+#include <Nazara/Graphics/Model.hpp>
+#include <Nazara/Graphics/Sprite.hpp>
+#include <NDK/LuaBinding_Base.hpp>
+
+namespace Ndk
+{
+	class NDK_API LuaBinding_Graphics : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_Graphics(LuaBinding& binding);
+			~LuaBinding_Graphics() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			Nz::LuaClass<Nz::AbstractViewer> abstractViewer;
+			Nz::LuaClass<Nz::InstancedRenderableRef> instancedRenderable;
+			Nz::LuaClass<Nz::MaterialRef> material;
+			Nz::LuaClass<Nz::ModelRef> model;
+			Nz::LuaClass<Nz::SpriteRef> sprite;
+			Nz::LuaClass<Nz::SpriteLibrary> spriteLibrary;
+	};
+}
+
+#endif // NDK_LUABINDING_GRAPHICS_HPP

SDK/include/NDK/LuaBinding_Math.hpp

@@ -0,0 +1,37 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_MATH_HPP
+#define NDK_LUABINDING_MATH_HPP
+
+#include <Nazara/Math/EulerAngles.hpp>
+#include <Nazara/Math/Matrix4.hpp>
+#include <Nazara/Math/Quaternion.hpp>
+#include <Nazara/Math/Rect.hpp>
+#include <Nazara/Math/Vector2.hpp>
+#include <Nazara/Math/Vector3.hpp>
+#include <NDK/LuaBinding_Base.hpp>
+
+namespace Ndk
+{
+	class NDK_API LuaBinding_Math : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_Math(LuaBinding& binding);
+			~LuaBinding_Math() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			Nz::LuaClass<Nz::EulerAnglesd> eulerAngles;
+			Nz::LuaClass<Nz::Matrix4d> matrix4d;
+			Nz::LuaClass<Nz::Quaterniond> quaternion;
+			Nz::LuaClass<Nz::Rectd> rect;
+			Nz::LuaClass<Nz::Vector2d> vector2d;
+			Nz::LuaClass<Nz::Vector3d> vector3d;
+	};
+}
+
+#endif // NDK_LUABINDING_MATH_HPP

SDK/include/NDK/LuaBinding_Network.hpp

@@ -0,0 +1,29 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_NETWORK_HPP
+#define NDK_LUABINDING_NETWORK_HPP
+
+#include <Nazara/Network/AbstractSocket.hpp>
+#include <Nazara/Network/IpAddress.hpp>
+#include <NDK/LuaBinding_Base.hpp>
+
+namespace Ndk
+{
+	class NDK_API LuaBinding_Network : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_Network(LuaBinding& binding);
+			~LuaBinding_Network() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			Nz::LuaClass<Nz::AbstractSocket> abstractSocket;
+			Nz::LuaClass<Nz::IpAddress> ipAddress;
+	};
+}
+
+#endif // NDK_LUABINDING_NETWORK_HPP

SDK/include/NDK/LuaBinding_Renderer.hpp

@@ -0,0 +1,29 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_RENDERER_HPP
+#define NDK_LUABINDING_RENDERER_HPP
+
+#include <Nazara/Renderer/Texture.hpp>
+#include <NDK/LuaBinding_Base.hpp>
+
+namespace Ndk
+{
+	class NDK_API LuaBinding_Renderer : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_Renderer(LuaBinding& binding);
+			~LuaBinding_Renderer() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			Nz::LuaClass<Nz::TextureRef> texture;
+			Nz::LuaClass<Nz::TextureLibrary> textureLibrary;
+			Nz::LuaClass<Nz::TextureManager> textureManager;
+	};
+}
+
+#endif // NDK_LUABINDING_RENDERER_HPP

SDK/include/NDK/LuaBinding_SDK.hpp

@@ -0,0 +1,42 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_SDK_HPP
+#define NDK_LUABINDING_SDK_HPP
+
+#include <NDK/LuaBinding_Base.hpp>
+#include <NDK/Components.hpp>
+#include <NDK/Console.hpp>
+#include <NDK/Entity.hpp>
+
+namespace Ndk
+{
+	class Application;
+
+	class NDK_API LuaBinding_SDK : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_SDK(LuaBinding& binding);
+			~LuaBinding_SDK() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			Nz::LuaClass<Application*> application;
+			Nz::LuaClass<EntityHandle> entity;
+			Nz::LuaClass<NodeComponentHandle> nodeComponent;
+			Nz::LuaClass<VelocityComponentHandle> velocityComponent;
+			Nz::LuaClass<WorldHandle> world;
+
+			#ifndef NDK_SERVER
+			Nz::LuaClass<CameraComponentHandle> cameraComponent;
+			Nz::LuaClass<ConsoleHandle> console;
+			Nz::LuaClass<GraphicsComponentHandle> graphicsComponent;
+			#endif
+
+	};
+}
+
+#endif // NDK_LUABINDING_SDK_HPP

SDK/include/NDK/LuaBinding_Utility.hpp

@@ -0,0 +1,34 @@
+// Copyright (C) 2015 Jérôme Leclercq
+// This file is part of the "Nazara Development Kit"
+// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+
+#pragma once
+
+#ifndef NDK_LUABINDING_UTILITY_HPP
+#define NDK_LUABINDING_UTILITY_HPP
+
+#include <Nazara/Utility/AbstractImage.hpp>
+#include <Nazara/Utility/Font.hpp>
+#include <Nazara/Utility/Keyboard.hpp>
+#include <Nazara/Utility/Node.hpp>
+#include <NDK/LuaBinding_Base.hpp>
+
+namespace Ndk
+{
+	class NDK_API LuaBinding_Utility : public LuaBinding_Base
+	{
+		public:
+			LuaBinding_Utility(LuaBinding& binding);
+			~LuaBinding_Utility() = default;
+
+			void Register(Nz::LuaInstance& instance) override;
+
+			// Utility
+			Nz::LuaClass<Nz::AbstractImageRef> abstractImage;
+			Nz::LuaClass<Nz::FontRef> font;
+			Nz::LuaClass<Nz::Keyboard> keyboard;
+			Nz::LuaClass<Nz::Node> node;
+	};
+}
+
+#endif // NDK_LUABINDING_UTILITY_HPP