From 01af08b711c97a452f2b48b59bba75f0ed4edab5 Mon Sep 17 00:00:00 2001 From: Danilo Date: Thu, 23 May 2024 16:50:41 -0300 Subject: [PATCH] Implementa PlatformInit --- framework/platform/init-dx.cpp | 8 +++++--- framework/xna.cpp | 2 +- inc/graphics/vertexposition.hpp | 6 +++--- inc/platform-dx/init-dx.hpp | 5 +++-- inc/platforminit.hpp | 10 ++++++++++ inc/xna.hpp | 2 +- 6 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 inc/platforminit.hpp diff --git a/framework/platform/init-dx.cpp b/framework/platform/init-dx.cpp index b030e0b..84f7ee8 100644 --- a/framework/platform/init-dx.cpp +++ b/framework/platform/init-dx.cpp @@ -6,9 +6,11 @@ #include "platform-dx/implementations.hpp" namespace xna { - + void Platform::Init() { + PlatformInit::Init(); + } - void InitPlatform::InitRegisteredTypes() + void PlatformInit::InitRegisteredTypes() { insertRegisteredReader("ObjecReader"); insertRegisteredReader("BooleanReader"); @@ -35,7 +37,7 @@ namespace xna { insertRegisteredReader("Texture2DReader"); } - void InitPlatform::InitActivadors() + void PlatformInit::InitActivadors() { insertActivadorReader(); insertActivadorReader(); diff --git a/framework/xna.cpp b/framework/xna.cpp index 418c88e..2ed6dda 100644 --- a/framework/xna.cpp +++ b/framework/xna.cpp @@ -62,7 +62,7 @@ namespace xna { int APIENTRY WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow) { - xna::InitPlatform::Init(); + xna::Platform::Init(); auto game = xna::Game1(); const auto result = game.Run(); diff --git a/inc/graphics/vertexposition.hpp b/inc/graphics/vertexposition.hpp index 3f03aad..f8ef31f 100644 --- a/inc/graphics/vertexposition.hpp +++ b/inc/graphics/vertexposition.hpp @@ -30,7 +30,7 @@ namespace xna { && textureCoordinate == other.textureCoordinate; } - VertexPositionTexture(const Vector3& position, const Vector2& textureCoordinate) + constexpr VertexPositionTexture(const Vector3& position, const Vector2& textureCoordinate) : position(position), textureCoordinate(textureCoordinate) { } @@ -49,7 +49,7 @@ namespace xna { && color == other.color; } - VertexPositionColorTexture(const Vector3& position, const Vector2& textureCoodinate, const Color& color) + constexpr VertexPositionColorTexture(const Vector3& position, const Vector2& textureCoodinate, const Color& color) : position(position), textureCoodinate(textureCoodinate), color(color) { } @@ -68,7 +68,7 @@ namespace xna { && textureCoodinate == other.textureCoodinate; } - VertexPositionNormalTexture(const Vector3& position, const Vector3& normal, const Vector2& textureCoodinate) + constexpr VertexPositionNormalTexture(const Vector3& position, const Vector3& normal, const Vector2& textureCoodinate) : position(position), normal(normal), textureCoodinate(textureCoodinate) { } diff --git a/inc/platform-dx/init-dx.hpp b/inc/platform-dx/init-dx.hpp index 29cacb7..3c8e278 100644 --- a/inc/platform-dx/init-dx.hpp +++ b/inc/platform-dx/init-dx.hpp @@ -4,9 +4,10 @@ #include "../default.hpp" #include "../csharp/type.hpp" #include "../content/typereadermanager.hpp" +#include "../platforminit.hpp" namespace xna { - struct InitPlatform { + struct PlatformInit { static void Init() { InitRegisteredTypes(); InitActivadors(); @@ -30,7 +31,7 @@ namespace xna { return reinterpret_pointer_cast(obj); }); } - }; + }; } #endif \ No newline at end of file diff --git a/inc/platforminit.hpp b/inc/platforminit.hpp new file mode 100644 index 0000000..9c869b7 --- /dev/null +++ b/inc/platforminit.hpp @@ -0,0 +1,10 @@ +#ifndef XNA_PLATFORMINIT_HPP +#define XNA_PLATFORMINIT_HPP + +namespace xna { + struct Platform { + static void Init(); + }; +} + +#endif \ No newline at end of file diff --git a/inc/xna.hpp b/inc/xna.hpp index 4339fd0..cba8b0f 100644 --- a/inc/xna.hpp +++ b/inc/xna.hpp @@ -50,5 +50,5 @@ #include "input/gamepad.hpp" #include "input/keyboard.hpp" #include "input/mouse.hpp" - +#include "platforminit.hpp" #include "platform-dx/xna-dx.hpp" \ No newline at end of file