From 11c3b6aa4a79c9843b8c9a6448e3e4634d2013c6 Mon Sep 17 00:00:00 2001 From: Danilo Date: Mon, 27 May 2024 17:59:43 -0300 Subject: [PATCH] Corrige StepTimer e Move Texture2DReader --- framework/platform-dx/init.cpp | 2 +- .../readers}/texture2d.hpp | 11 +++++------ inc/platform-dx/steptimer.hpp | 6 +++--- inc/platform-dx/xna-dx.hpp | 5 ++--- 4 files changed, 11 insertions(+), 13 deletions(-) rename inc/{platform-dx/content-readers => graphics/readers}/texture2d.hpp (80%) diff --git a/framework/platform-dx/init.cpp b/framework/platform-dx/init.cpp index 34d61d5..2314582 100644 --- a/framework/platform-dx/init.cpp +++ b/framework/platform-dx/init.cpp @@ -1,6 +1,6 @@ #include "platform-dx/init.hpp" #include "csharp/type.hpp" -#include "platform-dx/content-readers/texture2D.hpp" +#include "graphics/readers/texture2D.hpp" #include "content/typereadermanager.hpp" #include "content/defaultreaders.hpp" #include "platform-dx/implementations.hpp" diff --git a/inc/platform-dx/content-readers/texture2d.hpp b/inc/graphics/readers/texture2d.hpp similarity index 80% rename from inc/platform-dx/content-readers/texture2d.hpp rename to inc/graphics/readers/texture2d.hpp index 4bd1c7b..2385dbb 100644 --- a/inc/platform-dx/content-readers/texture2d.hpp +++ b/inc/graphics/readers/texture2d.hpp @@ -1,11 +1,10 @@ -#ifndef XNA_PLATFORM_CONTENTREADERS_TEXTURE2D_HPP -#define XNA_PLATFORM_CONTENTREADERS_TEXTURE2D_HPP +#ifndef XNA_GRAPHICS_READERS_TEXTURE2D_HPP +#define XNA_GRAPHICS_READERS_TEXTURE2D_HPP -#include "../../content/manager.hpp" -#include "../../content/reader.hpp" -#include "../../csharp/type.hpp" +#include "content/manager.hpp" +#include "content/reader.hpp" +#include "csharp/type.hpp" #include "graphics/texture.hpp" -#include "platform-dx/implementations.hpp" namespace xna { class Texture2DReader : public ContentTypeReaderT { diff --git a/inc/platform-dx/steptimer.hpp b/inc/platform-dx/steptimer.hpp index 5f63b4c..cf9bdfd 100644 --- a/inc/platform-dx/steptimer.hpp +++ b/inc/platform-dx/steptimer.hpp @@ -1,5 +1,5 @@ -#ifndef XNA_PLATFORM_DX_SLEPTIME_HPP -#define XNA_PLATFORM_DX_SLEPTIME_HPP +#ifndef XNA_PLATFORM_DX_STEPTIMER_HPP +#define XNA_PLATFORM_DX_STEPTIMER_HPP // // StepTimer.h - A simple timer that provides elapsed time information // @@ -10,7 +10,7 @@ #include #include #include - +#include "headers.hpp" namespace xna { diff --git a/inc/platform-dx/xna-dx.hpp b/inc/platform-dx/xna-dx.hpp index 1d01fdd..7bf56eb 100644 --- a/inc/platform-dx/xna-dx.hpp +++ b/inc/platform-dx/xna-dx.hpp @@ -1,5 +1,4 @@ -#include "content-readers/texture2d.hpp" -#include "steptimer.hpp" #include "headers.hpp" +#include "implementations.hpp" #include "init.hpp" -#include "implementations.hpp" \ No newline at end of file +#include "steptimer.hpp" \ No newline at end of file