From 1fbbdf5f0ac50ae6ed8065c149febd5ffc5c4838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20H=C3=B6hne?= <77296181+THoehne@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:17:08 +0100 Subject: [PATCH] Fixing Math includes --- .vscode/settings.json | 2 +- .vscode/tasks.json | 28 +++++++++++++++ DevPlayground/CMakeLists.txt | 18 ---------- Engine/Source/Runtime/CMakeLists.txt | 5 --- Engine/Source/Runtime/Core/CMakeLists.txt | 29 ---------------- Engine/Source/Runtime/Core/Core.h | 2 ++ .../Runtime/Core/Logging/CMakeLists.txt | 12 ------- .../Core/Math/Detail/IntVector2Decl.inl | 2 +- .../Core/Math/Detail/IntVector3Decl.inl | 2 +- .../Core/Math/Detail/IntVector4Decl.inl | 2 +- .../Runtime/Core/Math/Detail/Matrix3Decl.inl | 4 +-- .../Runtime/Core/Math/Detail/Matrix4Decl.inl | 4 +-- .../Runtime/Core/Math/Detail/PlaneDecl.inl | 2 +- .../Runtime/Core/Math/Detail/Vector2Decl.inl | 4 +-- .../Runtime/Core/Math/Detail/Vector3Decl.inl | 2 +- .../Runtime/Core/Math/Detail/Vector4Decl.inl | 2 +- Engine/Source/Runtime/Core/Math/Include.h | 32 ++++++++--------- Engine/Source/Runtime/Core/Math/IntPoint.hpp | 14 ++++---- .../Source/Runtime/Core/Math/IntVector2.hpp | 10 +++--- .../Source/Runtime/Core/Math/IntVector2.inl | 8 ++--- .../Source/Runtime/Core/Math/IntVector3.hpp | 12 +++---- .../Source/Runtime/Core/Math/IntVector3.inl | 8 ++--- .../Source/Runtime/Core/Math/IntVector4.hpp | 12 +++---- .../Source/Runtime/Core/Math/IntVector4.inl | 8 ++--- Engine/Source/Runtime/Core/Math/Line.hpp | 8 ++--- .../Source/Runtime/Core/Math/MathCommon.hpp | 26 +------------- Engine/Source/Runtime/Core/Math/MathFwd.h | 4 +-- Engine/Source/Runtime/Core/Math/MathPCH.h | 34 +++++++++---------- .../Runtime/Core/Math/MathTypeConversion.hpp | 22 ++++++------ .../Runtime/Core/Math/MathUnitConversion.hpp | 8 ++--- Engine/Source/Runtime/Core/Math/Matrix2.hpp | 8 ++--- Engine/Source/Runtime/Core/Math/Matrix3.hpp | 10 +++--- Engine/Source/Runtime/Core/Math/Matrix3.inl | 8 ++--- Engine/Source/Runtime/Core/Math/Matrix4.hpp | 10 +++--- Engine/Source/Runtime/Core/Math/Matrix4.inl | 8 ++--- Engine/Source/Runtime/Core/Math/Plane.hpp | 12 +++---- Engine/Source/Runtime/Core/Math/Plane.inl | 8 ++--- Engine/Source/Runtime/Core/Math/Point.hpp | 12 +++---- Engine/Source/Runtime/Core/Math/Ray.hpp | 6 ++-- .../Source/Runtime/Core/Math/SIMD/Alignment.h | 2 +- .../Runtime/Core/Math/SIMD/PhanesSIMDTypes.h | 4 +-- .../Core/Math/SIMD/PhanesVectorMathSSE.hpp | 24 ++++++------- .../Source/Runtime/Core/Math/SIMD/Platform.h | 3 +- .../Runtime/Core/Math/SIMD/SIMDIntrinsics.h | 10 +++--- .../Source/Runtime/Core/Math/SIMD/Storage.h | 4 +-- Engine/Source/Runtime/Core/Math/Vector2.hpp | 10 +++--- Engine/Source/Runtime/Core/Math/Vector2.inl | 8 ++--- Engine/Source/Runtime/Core/Math/Vector3.hpp | 12 +++---- Engine/Source/Runtime/Core/Math/Vector3.inl | 8 ++--- Engine/Source/Runtime/Core/Math/Vector4.hpp | 14 ++++---- Engine/Source/Runtime/Core/Math/Vector4.inl | 8 ++--- .../Runtime/Core/StartingPoint/CMakeLists.txt | 13 ------- .../StartingPoint/private/StartingPoint.cpp | 2 -- Engine/Source/Runtime/Phanes.h | 1 - MathTestFPU/main.cpp | 12 +++++++ MathTestFPU/pch.cpp | 7 ---- premake5.lua | 2 ++ 57 files changed, 240 insertions(+), 312 deletions(-) create mode 100644 .vscode/tasks.json delete mode 100644 DevPlayground/CMakeLists.txt delete mode 100644 Engine/Source/Runtime/CMakeLists.txt delete mode 100644 Engine/Source/Runtime/Core/CMakeLists.txt delete mode 100644 Engine/Source/Runtime/Core/Logging/CMakeLists.txt delete mode 100644 Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt create mode 100644 MathTestFPU/main.cpp delete mode 100644 MathTestFPU/pch.cpp create mode 100644 premake5.lua diff --git a/.vscode/settings.json b/.vscode/settings.json index d79b09c..2798997 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -101,5 +101,5 @@ "P_LINUX_BUILD", "__SSE__", ], - "cmake.sourceDirectory": "/home/morthaine/Development/PhanesEngine/DevPlayground", + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..96deeae --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,28 @@ +{ + "tasks": [ + { + "type": "cppbuild", + "label": "C/C++: g++ build active file", + "command": "/sbin/g++", + "args": [ + "-fdiagnostics-color=always", + "-g", + "${file}", + "-o", + "${fileDirname}/${fileBasenameNoExtension}" + ], + "options": { + "cwd": "${fileDirname}" + }, + "problemMatcher": [ + "$gcc" + ], + "group": { + "kind": "build", + "isDefault": true + }, + "detail": "Task generated by Debugger." + } + ], + "version": "2.0.0" +} \ No newline at end of file diff --git a/DevPlayground/CMakeLists.txt b/DevPlayground/CMakeLists.txt deleted file mode 100644 index 8887b04..0000000 --- a/DevPlayground/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.15...3.30) - -project(DevPlayground) - -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../Engine/Source/Runtime ${CMAKE_BINARY_DIR}/Engine) - - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}../Engine/Source/Runtime) - -add_executable(DevPlayground - DevPlayground.cpp -) - - -add_compile_definitions(P_LINUX_BUILD) -add_compile_definitions(P_DEBUG) - -target_link_libraries(DevPlayground PRIVATE PhanesCore) \ No newline at end of file diff --git a/Engine/Source/Runtime/CMakeLists.txt b/Engine/Source/Runtime/CMakeLists.txt deleted file mode 100644 index 13e60e9..0000000 --- a/Engine/Source/Runtime/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required(VERSION 3.15...3.30) - -project(PhanesRuntime) - -add_subdirectory(Core) \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/CMakeLists.txt b/Engine/Source/Runtime/Core/CMakeLists.txt deleted file mode 100644 index e6f5ca0..0000000 --- a/Engine/Source/Runtime/Core/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -cmake_minimum_required(VERSION 3.15...3.30) - -project(PhanesCore) - -set(CMAKE_CXX_STANDARD 20) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -include(Logging/CMakeLists.txt) -include(StartingPoint/CMakeLists.txt) - -add_library(PhanesCore STATIC -Core.h -${Logging} -${StartingPoint} -) - -target_precompile_headers(PhanesCore PUBLIC -${LoggingPCH} -${StartingPointPCH} -) - -add_compile_definitions(P_LINUX_BUILD) -add_compile_definitions(P_DEBUG) - -# fmt for spdlog. It uses the external module which needs to be linked manually -find_package(fmt) -target_link_libraries(PhanesCore fmt::fmt) - -target_include_directories(PhanesCore PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../) \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Core.h b/Engine/Source/Runtime/Core/Core.h index 54e1c68..9567148 100644 --- a/Engine/Source/Runtime/Core/Core.h +++ b/Engine/Source/Runtime/Core/Core.h @@ -38,6 +38,8 @@ #endif + #define FORCEINLINE __attribute__((always_inline)) + #elif defined(P_ARM_BUILD) #error Only Windows is supported at the moment. diff --git a/Engine/Source/Runtime/Core/Logging/CMakeLists.txt b/Engine/Source/Runtime/Core/Logging/CMakeLists.txt deleted file mode 100644 index cd7699a..0000000 --- a/Engine/Source/Runtime/Core/Logging/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.15...3.30) - -project(PhanesLogging) - -set(Logging - Logging/Logging.h - Logging/private/Logging.cpp -) - -set(LoggingPCH - Logging/LoggingPCH.h -) \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/Detail/IntVector2Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/IntVector2Decl.inl index f098116..1b8db56 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/IntVector2Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/IntVector2Decl.inl @@ -1,6 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/IntVector3Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/IntVector3Decl.inl index 612e3d1..6a3e1b2 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/IntVector3Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/IntVector3Decl.inl @@ -1,6 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/IntVector4Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/IntVector4Decl.inl index a66118b..6b50173 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/IntVector4Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/IntVector4Decl.inl @@ -1,6 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/Matrix3Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Matrix3Decl.inl index c2ec5c4..686d0e2 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/Matrix3Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/Matrix3Decl.inl @@ -1,7 +1,7 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/MathCommon.hpp" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/Matrix4Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Matrix4Decl.inl index 88c2b48..9408cbb 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/Matrix4Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/Matrix4Decl.inl @@ -1,7 +1,7 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/MathCommon.hpp" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/PlaneDecl.inl b/Engine/Source/Runtime/Core/Math/Detail/PlaneDecl.inl index eb7b740..49039e6 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/PlaneDecl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/PlaneDecl.inl @@ -1,6 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/Vector2Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Vector2Decl.inl index a43805d..4406e14 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/Vector2Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/Vector2Decl.inl @@ -1,8 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" - -#include +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/Vector3Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Vector3Decl.inl index e05139d..0d7f8da 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/Vector3Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/Vector3Decl.inl @@ -1,6 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Detail/Vector4Decl.inl b/Engine/Source/Runtime/Core/Math/Detail/Vector4Decl.inl index 2a3a3b7..cd62c8e 100644 --- a/Engine/Source/Runtime/Core/Math/Detail/Vector4Decl.inl +++ b/Engine/Source/Runtime/Core/Math/Detail/Vector4Decl.inl @@ -1,6 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::Detail { diff --git a/Engine/Source/Runtime/Core/Math/Include.h b/Engine/Source/Runtime/Core/Math/Include.h index d849d3e..1eaf3fb 100644 --- a/Engine/Source/Runtime/Core/Math/Include.h +++ b/Engine/Source/Runtime/Core/Math/Include.h @@ -4,36 +4,36 @@ #pragma warning(disable : 4244) #endif -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathFwd.h" // --- Vectors ------------------------ -#include "Core/public/Math/Vector2.hpp" -#include "Core/public/Math/Vector3.hpp" -#include "Core/public/Math/Vector4.hpp" +#include "Core/Math/Vector2.hpp" +#include "Core/Math/Vector3.hpp" +#include "Core/Math/Vector4.hpp" -#include "Core/public/Math/IntVector2.hpp" -#include "Core/public/Math/IntVector3.hpp" -#include "Core/public/Math/IntVector4.hpp" +#include "Core/Math/IntVector2.hpp" +#include "Core/Math/IntVector3.hpp" +#include "Core/Math/IntVector4.hpp" -#include "Core/public/Math/Point.hpp" -#include "Core/public/Math/IntPoint.hpp" +#include "Core/Math/Point.hpp" +#include "Core/Math/IntPoint.hpp" // --- Matrices ------------------------ -#include "Core/public/Math/Matrix2.hpp" -#include "Core/public/Math/Matrix3.hpp" -#include "Core/public/Math/Matrix4.hpp" +#include "Core/Math/Matrix2.hpp" +#include "Core/Math/Matrix3.hpp" +#include "Core/Math/Matrix4.hpp" // --- Other Math ---------------------- -#include "Core/public/Math/Plane.hpp" -#include "Core/public/Math/Line.hpp" +#include "Core/Math/Plane.hpp" +#include "Core/Math/Line.hpp" // --- Misc ----------------- -#include "Core/public/Math/MathTypeConversion.hpp" -#include "Core/public/Math/MathUnitConversion.hpp" +#include "Core/Math/MathTypeConversion.hpp" +#include "Core/Math/MathUnitConversion.hpp" diff --git a/Engine/Source/Runtime/Core/Math/IntPoint.hpp b/Engine/Source/Runtime/Core/Math/IntPoint.hpp index 1442b0d..60d8c19 100644 --- a/Engine/Source/Runtime/Core/Math/IntPoint.hpp +++ b/Engine/Source/Runtime/Core/Math/IntPoint.hpp @@ -1,14 +1,14 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathAbstractTypes.h" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathAbstractTypes.h" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/IntVector2.hpp" -#include "Core/public/Math/IntVector3.hpp" -#include "Core/public/Math/IntVector4.hpp" +#include "Core/Math/IntVector2.hpp" +#include "Core/Math/IntVector3.hpp" +#include "Core/Math/IntVector4.hpp" #ifndef P_DEBUG #pragma warning(disable : 4244) diff --git a/Engine/Source/Runtime/Core/Math/IntVector2.hpp b/Engine/Source/Runtime/Core/Math/IntVector2.hpp index 3ee8379..c5b11fa 100644 --- a/Engine/Source/Runtime/Core/Math/IntVector2.hpp +++ b/Engine/Source/Runtime/Core/Math/IntVector2.hpp @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/SIMD/Storage.h" +#include "Core/Math/SIMD/Storage.h" #ifndef P_DEBUG #pragma warning(disable : 4244) @@ -627,4 +627,4 @@ namespace Phanes::Core::Math { #endif // !INTVECTOR2_H -#include "Core/public/Math/IntVector2.inl" \ No newline at end of file +#include "Core/Math/IntVector2.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/IntVector2.inl b/Engine/Source/Runtime/Core/Math/IntVector2.inl index 5d1d86a..245d5ba 100644 --- a/Engine/Source/Runtime/Core/Math/IntVector2.inl +++ b/Engine/Source/Runtime/Core/Math/IntVector2.inl @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/IntVector2Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/IntVector2Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" namespace Phanes::Core::Math { diff --git a/Engine/Source/Runtime/Core/Math/IntVector3.hpp b/Engine/Source/Runtime/Core/Math/IntVector3.hpp index 6d3bc76..90c0b07 100644 --- a/Engine/Source/Runtime/Core/Math/IntVector3.hpp +++ b/Engine/Source/Runtime/Core/Math/IntVector3.hpp @@ -1,13 +1,13 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/SIMD/Storage.h" +#include "Core/Math/SIMD/Storage.h" -#include "Core/public/Math/IntVector4.hpp" +#include "Core/Math/IntVector4.hpp" #ifndef P_DEBUG #pragma warning(disable : 4244) @@ -686,4 +686,4 @@ namespace Phanes::Core::Math { #endif // !INTVECTOR3_H -#include "Core/public/Math/IntVector3.inl" \ No newline at end of file +#include "Core/Math/IntVector3.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/IntVector3.inl b/Engine/Source/Runtime/Core/Math/IntVector3.inl index 619b913..a8dd7e6 100644 --- a/Engine/Source/Runtime/Core/Math/IntVector3.inl +++ b/Engine/Source/Runtime/Core/Math/IntVector3.inl @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/IntVector3Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/IntVector3Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" namespace Phanes::Core::Math diff --git a/Engine/Source/Runtime/Core/Math/IntVector4.hpp b/Engine/Source/Runtime/Core/Math/IntVector4.hpp index 1f08a43..c3334b4 100644 --- a/Engine/Source/Runtime/Core/Math/IntVector4.hpp +++ b/Engine/Source/Runtime/Core/Math/IntVector4.hpp @@ -1,13 +1,13 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/SIMD/Storage.h" +#include "Core/Math/SIMD/Storage.h" -#include "Core/public/Math/IntVector2.hpp" +#include "Core/Math/IntVector2.hpp" #ifndef P_DEBUG #pragma warning(disable : 4244) @@ -640,4 +640,4 @@ namespace Phanes::Core::Math { #endif // !INTVECTOR3_H -#include "Core/public/Math/IntVector4.inl" \ No newline at end of file +#include "Core/Math/IntVector4.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/IntVector4.inl b/Engine/Source/Runtime/Core/Math/IntVector4.inl index 7f4d243..b949f12 100644 --- a/Engine/Source/Runtime/Core/Math/IntVector4.inl +++ b/Engine/Source/Runtime/Core/Math/IntVector4.inl @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/IntVector4Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/IntVector4Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" namespace Phanes::Core::Math { diff --git a/Engine/Source/Runtime/Core/Math/Line.hpp b/Engine/Source/Runtime/Core/Math/Line.hpp index 72257db..5c948cc 100644 --- a/Engine/Source/Runtime/Core/Math/Line.hpp +++ b/Engine/Source/Runtime/Core/Math/Line.hpp @@ -1,12 +1,10 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/Vector3.hpp" - -#include +#include "Core/Math/Vector3.hpp" namespace Phanes::Core::Math diff --git a/Engine/Source/Runtime/Core/Math/MathCommon.hpp b/Engine/Source/Runtime/Core/Math/MathCommon.hpp index a7f4e46..0f12d76 100644 --- a/Engine/Source/Runtime/Core/Math/MathCommon.hpp +++ b/Engine/Source/Runtime/Core/Math/MathCommon.hpp @@ -126,35 +126,11 @@ namespace Phanes::Core::Math { template - FORCEINLINE T Abs(T s) + inline T Abs(T s) { return abs(s); } - template<> - FORCEINLINE float Abs(float s) - { - return (float)fabs(s); - }; - - template<> - FORCEINLINE long long Abs(long long s) - { - return llabs(s); - }; - - template<> - FORCEINLINE long Abs(long s) - { - return labs(s); - }; - - template<> - FORCEINLINE double Abs(double s) - { - return fabsl(s); - }; - } // phanes diff --git a/Engine/Source/Runtime/Core/Math/MathFwd.h b/Engine/Source/Runtime/Core/Math/MathFwd.h index 8787a99..a28b582 100644 --- a/Engine/Source/Runtime/Core/Math/MathFwd.h +++ b/Engine/Source/Runtime/Core/Math/MathFwd.h @@ -9,8 +9,8 @@ #ifndef MATH_FWD_H #define MATH_FWD_H -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" /** * Includes forward declarations, as well as certain useful typedefs. diff --git a/Engine/Source/Runtime/Core/Math/MathPCH.h b/Engine/Source/Runtime/Core/Math/MathPCH.h index b79a1a4..eb2ff3e 100644 --- a/Engine/Source/Runtime/Core/Math/MathPCH.h +++ b/Engine/Source/Runtime/Core/Math/MathPCH.h @@ -3,25 +3,25 @@ #pragma once -#include "Core/public/Math/Point.hpp" -#include "Core/public/Math/Plane.hpp" -#include "Core/public/Math/Line.hpp" -#include "Core/public/Math/Ray.hpp" +#include "Core/Math/Point.hpp" +#include "Core/Math/Plane.hpp" +#include "Core/Math/Line.hpp" +#include "Core/Math/Ray.hpp" -#include "Core/public/Math/Vector2.hpp" -#include "Core/public/Math/Vector3.hpp" -#include "Core/public/Math/Vector4.hpp" +#include "Core/Math/Vector2.hpp" +#include "Core/Math/Vector3.hpp" +#include "Core/Math/Vector4.hpp" -#include "Core/public/Math/IntPoint.hpp" -#include "Core/public/Math/IntVector2.hpp" -#include "Core/public/Math/IntVector3.hpp" -#include "Core/public/Math/IntVector4.hpp" +#include "Core/Math/IntPoint.hpp" +#include "Core/Math/IntVector2.hpp" +#include "Core/Math/IntVector3.hpp" +#include "Core/Math/IntVector4.hpp" -#include "Core/public/Math/Matrix2.hpp" -#include "Core/public/Math/Matrix3.hpp" -#include "Core/public/Math/Matrix4.hpp" +#include "Core/Math/Matrix2.hpp" +#include "Core/Math/Matrix3.hpp" +#include "Core/Math/Matrix4.hpp" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathTypeConversion.hpp" -#include "Core/public/Math/MathUnitConversion.hpp" \ No newline at end of file +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathTypeConversion.hpp" +#include "Core/Math/MathUnitConversion.hpp" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/MathTypeConversion.hpp b/Engine/Source/Runtime/Core/Math/MathTypeConversion.hpp index c62ac1f..0c7ce35 100644 --- a/Engine/Source/Runtime/Core/Math/MathTypeConversion.hpp +++ b/Engine/Source/Runtime/Core/Math/MathTypeConversion.hpp @@ -12,18 +12,18 @@ #include #endif -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathAbstractTypes.h" -#include "Core/public/Math/Vector2.hpp" -#include "Core/public/Math/Vector3.hpp" -#include "Core/public/Math/Vector4.hpp" -#include "Core/public/Math/Matrix2.hpp" -#include "Core/public/Math/Matrix3.hpp" -#include "Core/public/Math/Matrix4.hpp" -#include "Core/public/Math/IntVector2.hpp" -#include "Core/public/Math/IntVector3.hpp" -#include "Core/public/Math/IntVector4.hpp" +#include "Core/Math/MathAbstractTypes.h" +#include "Core/Math/Vector2.hpp" +#include "Core/Math/Vector3.hpp" +#include "Core/Math/Vector4.hpp" +#include "Core/Math/Matrix2.hpp" +#include "Core/Math/Matrix3.hpp" +#include "Core/Math/Matrix4.hpp" +#include "Core/Math/IntVector2.hpp" +#include "Core/Math/IntVector3.hpp" +#include "Core/Math/IntVector4.hpp" #ifndef MATH_TYPE_CONVERSION_H #define MATH_TYPE_CONVERSION_H diff --git a/Engine/Source/Runtime/Core/Math/MathUnitConversion.hpp b/Engine/Source/Runtime/Core/Math/MathUnitConversion.hpp index 66f6db1..dbb6f7b 100644 --- a/Engine/Source/Runtime/Core/Math/MathUnitConversion.hpp +++ b/Engine/Source/Runtime/Core/Math/MathUnitConversion.hpp @@ -4,9 +4,9 @@ // Contains functions to convert units // // ======================================= // -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" +#include "Core/Math/MathCommon.hpp" namespace Phanes::Core::Math::UnitConversion { @@ -14,7 +14,7 @@ namespace Phanes::Core::Math::UnitConversion /** * Converts degrees to radians. * - * @param(deg) Angle in degress (°) + * @param(deg) Angle in degress (�) * * @return Angle in radians */ @@ -42,7 +42,7 @@ namespace Phanes::Core::Math::UnitConversion /** * Converts degrees to gradian. * - * @param(deg) Angle in degress (°) + * @param(deg) Angle in degress (�) * * @return Angle in gradian */ diff --git a/Engine/Source/Runtime/Core/Math/Matrix2.hpp b/Engine/Source/Runtime/Core/Math/Matrix2.hpp index 632ee53..3e2218d 100644 --- a/Engine/Source/Runtime/Core/Math/Matrix2.hpp +++ b/Engine/Source/Runtime/Core/Math/Matrix2.hpp @@ -1,10 +1,10 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/Vector2.hpp" +#include "Core/Math/Vector2.hpp" #ifndef MATRIX2_H #define MATRIX2_H @@ -355,4 +355,4 @@ namespace Phanes::Core::Math { #endif // !MATRIX2_H -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" \ No newline at end of file +#include "Core/Math/SIMD/SIMDIntrinsics.h" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/Matrix3.hpp b/Engine/Source/Runtime/Core/Math/Matrix3.hpp index e0f0e7d..391c65d 100644 --- a/Engine/Source/Runtime/Core/Math/Matrix3.hpp +++ b/Engine/Source/Runtime/Core/Math/Matrix3.hpp @@ -1,10 +1,10 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathAbstractTypes.h" -#include "Core/public/Math/MathFwd.h" -#include "Core/public/Math/Vector3.hpp" +#include "Core/Math/MathAbstractTypes.h" +#include "Core/Math/MathFwd.h" +#include "Core/Math/Vector3.hpp" #ifndef MATRIX3_H #define MATRIX3_H @@ -547,4 +547,4 @@ namespace Phanes::Core::Math { #endif // !MATRIX3_H -#include "Core/public/Math/Matrix3.inl" \ No newline at end of file +#include "Core/Math/Matrix3.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/Matrix3.inl b/Engine/Source/Runtime/Core/Math/Matrix3.inl index 1e6dc9f..6417d5c 100644 --- a/Engine/Source/Runtime/Core/Math/Matrix3.inl +++ b/Engine/Source/Runtime/Core/Math/Matrix3.inl @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/Matrix3Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/Matrix3Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" namespace Phanes::Core::Math { diff --git a/Engine/Source/Runtime/Core/Math/Matrix4.hpp b/Engine/Source/Runtime/Core/Math/Matrix4.hpp index f2ece63..eedbef6 100644 --- a/Engine/Source/Runtime/Core/Math/Matrix4.hpp +++ b/Engine/Source/Runtime/Core/Math/Matrix4.hpp @@ -1,10 +1,10 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathAbstractTypes.h" -#include "Core/public/Math/MathFwd.h" -#include "Core/public/Math/Vector4.hpp" +#include "Core/Math/MathAbstractTypes.h" +#include "Core/Math/MathFwd.h" +#include "Core/Math/Vector4.hpp" #ifndef MATRIX4_H #define MATRIX4_H @@ -331,4 +331,4 @@ namespace Phanes::Core::Math { #endif // !MATRIX4_H -#include "Core/public/Math/Matrix4.inl" \ No newline at end of file +#include "Core/Math/Matrix4.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/Matrix4.inl b/Engine/Source/Runtime/Core/Math/Matrix4.inl index e6bada3..ab7c57d 100644 --- a/Engine/Source/Runtime/Core/Math/Matrix4.inl +++ b/Engine/Source/Runtime/Core/Math/Matrix4.inl @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/Matrix4Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/Matrix4Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" namespace Phanes::Core::Math diff --git a/Engine/Source/Runtime/Core/Math/Plane.hpp b/Engine/Source/Runtime/Core/Math/Plane.hpp index 56c9e35..d75671a 100644 --- a/Engine/Source/Runtime/Core/Math/Plane.hpp +++ b/Engine/Source/Runtime/Core/Math/Plane.hpp @@ -3,12 +3,12 @@ // TODO: Transform -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/Line.hpp" -#include "Core/public/Math/Ray.hpp" -#include "Core/public/Math/Vector3.hpp" +#include "Core/Math/Line.hpp" +#include "Core/Math/Ray.hpp" +#include "Core/Math/Vector3.hpp" namespace Phanes::Core::Math { @@ -953,4 +953,4 @@ namespace Phanes::Core::Math { } // Phanes::Core::Math // Include operator impl. -#include "Core/public/Math/Plane.inl" \ No newline at end of file +#include "Core/Math/Plane.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/Plane.inl b/Engine/Source/Runtime/Core/Math/Plane.inl index 9cc77dc..4683d6c 100644 --- a/Engine/Source/Runtime/Core/Math/Plane.inl +++ b/Engine/Source/Runtime/Core/Math/Plane.inl @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/PlaneDecl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/PlaneDecl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" diff --git a/Engine/Source/Runtime/Core/Math/Point.hpp b/Engine/Source/Runtime/Core/Math/Point.hpp index ea23952..ccc6a83 100644 --- a/Engine/Source/Runtime/Core/Math/Point.hpp +++ b/Engine/Source/Runtime/Core/Math/Point.hpp @@ -1,13 +1,13 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathAbstractTypes.h" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathAbstractTypes.h" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/Vector2.hpp" -#include "Core/public/Math/Vector3.hpp" +#include "Core/Math/Vector2.hpp" +#include "Core/Math/Vector3.hpp" #ifndef P_DEBUG #pragma warning(disable : 4244) diff --git a/Engine/Source/Runtime/Core/Math/Ray.hpp b/Engine/Source/Runtime/Core/Math/Ray.hpp index 92a0d9d..7cd2809 100644 --- a/Engine/Source/Runtime/Core/Math/Ray.hpp +++ b/Engine/Source/Runtime/Core/Math/Ray.hpp @@ -1,9 +1,9 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/Vector3.hpp" +#include "Core/Math/Vector3.hpp" namespace Phanes::Core::Math { diff --git a/Engine/Source/Runtime/Core/Math/SIMD/Alignment.h b/Engine/Source/Runtime/Core/Math/SIMD/Alignment.h index 61c7fdb..2c42d48 100644 --- a/Engine/Source/Runtime/Core/Math/SIMD/Alignment.h +++ b/Engine/Source/Runtime/Core/Math/SIMD/Alignment.h @@ -1,6 +1,6 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" namespace Phanes::Core::Math::SIMD diff --git a/Engine/Source/Runtime/Core/Math/SIMD/PhanesSIMDTypes.h b/Engine/Source/Runtime/Core/Math/SIMD/PhanesSIMDTypes.h index 5347b9e..cd017c3 100644 --- a/Engine/Source/Runtime/Core/Math/SIMD/PhanesSIMDTypes.h +++ b/Engine/Source/Runtime/Core/Math/SIMD/PhanesSIMDTypes.h @@ -4,8 +4,8 @@ // // ARM is not supported. -#include "Core/public/Math/SIMD/Platform.h" -#include "Core/public/Math/MathTypes.h" +#include "Core/Math/SIMD/Platform.h" +#include "Core/Math/MathTypes.h" #if P_INTRINSICS == P_INTRINSICS_AVX2 # include diff --git a/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathSSE.hpp b/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathSSE.hpp index 92208cf..c6ab15c 100644 --- a/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathSSE.hpp +++ b/Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathSSE.hpp @@ -2,23 +2,23 @@ #include -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/MathCommon.hpp" -#include "Core/public/Math/Vector2.hpp" -#include "Core/public/Math/Vector3.hpp" -#include "Core/public/Math/Vector4.hpp" +#include "Core/Math/Vector2.hpp" +#include "Core/Math/Vector3.hpp" +#include "Core/Math/Vector4.hpp" -#include "Core/public/Math/Plane.hpp" +#include "Core/Math/Plane.hpp" -#include "Core/public/Math/IntVector2.hpp" -#include "Core/public/Math/IntVector3.hpp" -#include "Core/public/Math/IntVector4.hpp" +#include "Core/Math/IntVector2.hpp" +#include "Core/Math/IntVector3.hpp" +#include "Core/Math/IntVector4.hpp" -#include "Core/public/Math/Matrix3.hpp" -#include "Core/public/Math/Matrix4.hpp" +#include "Core/Math/Matrix3.hpp" +#include "Core/Math/Matrix4.hpp" diff --git a/Engine/Source/Runtime/Core/Math/SIMD/Platform.h b/Engine/Source/Runtime/Core/Math/SIMD/Platform.h index 9a3833c..4e56ddf 100644 --- a/Engine/Source/Runtime/Core/Math/SIMD/Platform.h +++ b/Engine/Source/Runtime/Core/Math/SIMD/Platform.h @@ -23,9 +23,9 @@ // User defines build platform #ifdef P_WIN_BUILD # define P_PLATFORM P_PLATFORM_WIN +# error Windows system is not yet supported. #elif P_LINUX_BUILD # define P_PLATFORM P_PLATFORM_LIN -# error Linux / Unix system is not yet supported. #elif P_MAC_BUILD # define P_PLATFORM P_PLATFORM_MAC # error Mac target system is not yet supported. @@ -142,7 +142,6 @@ // Clang #elif (defined(__clang__)) -# error PhanesEngine only supports MSVC -> Visual Studio # if defined(__apple_build_version__) # # if (__clang_major__ < 6) diff --git a/Engine/Source/Runtime/Core/Math/SIMD/SIMDIntrinsics.h b/Engine/Source/Runtime/Core/Math/SIMD/SIMDIntrinsics.h index e37d255..2fb3016 100644 --- a/Engine/Source/Runtime/Core/Math/SIMD/SIMDIntrinsics.h +++ b/Engine/Source/Runtime/Core/Math/SIMD/SIMDIntrinsics.h @@ -1,15 +1,15 @@ #pragma once -#include "Core/public/Math/SIMD/Platform.h" +#include "Core/Math/SIMD/Platform.h" #if P_INTRINSICS == P_INTRINSICS_AVX2 -# include "PhanesVectorMathAVX2.hpp" +# include "Core/Math/SIMD/PhanesVectorMathAVX2.hpp" #elif P_INTRINSICS == P_INTRINSICS_AVX -# include "PhanesVectorMathAVX.hpp" +# include "Core/Math/SIMD/PhanesVectorMathAVX.hpp" #elif P_INTRINSICS == P_INTRINSICS_SSE -# include "PhanesVectorMathSSE.hpp" +# include "Core/Math/SIMD/PhanesVectorMathSSE.hpp" #elif P_INTRINSICS == P_INTRINSICS_NEON -# include "PhanesVectorMathNeon.hpp" +# include "Core/Math/SIMD/PhanesVectorMathNeon.hpp" #endif diff --git a/Engine/Source/Runtime/Core/Math/SIMD/Storage.h b/Engine/Source/Runtime/Core/Math/SIMD/Storage.h index cda27c3..8654dfc 100644 --- a/Engine/Source/Runtime/Core/Math/SIMD/Storage.h +++ b/Engine/Source/Runtime/Core/Math/SIMD/Storage.h @@ -1,9 +1,9 @@ // Defines on compile time, whether a xmm register or an array should be used. #pragma once -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" -#include "Core/public/Math/MathTypes.h" +#include "Core/Math/MathTypes.h" namespace Phanes::Core::Math::SIMD { diff --git a/Engine/Source/Runtime/Core/Math/Vector2.hpp b/Engine/Source/Runtime/Core/Math/Vector2.hpp index fcba05c..94dcfb2 100644 --- a/Engine/Source/Runtime/Core/Math/Vector2.hpp +++ b/Engine/Source/Runtime/Core/Math/Vector2.hpp @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/SIMD/Storage.h" +#include "Core/Math/SIMD/Storage.h" #ifndef P_DEBUG #pragma warning(disable : 4244) @@ -1016,4 +1016,4 @@ namespace Phanes::Core::Math { #endif // !VECTOR2_H // Include operator impl. -#include "Core/public/Math/Vector2.inl" \ No newline at end of file +#include "Core/Math/Vector2.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/Vector2.inl b/Engine/Source/Runtime/Core/Math/Vector2.inl index 466b1f1..7a162c6 100644 --- a/Engine/Source/Runtime/Core/Math/Vector2.inl +++ b/Engine/Source/Runtime/Core/Math/Vector2.inl @@ -4,12 +4,12 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/Vector2Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/Vector2Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" diff --git a/Engine/Source/Runtime/Core/Math/Vector3.hpp b/Engine/Source/Runtime/Core/Math/Vector3.hpp index 372df9d..ddc35bf 100644 --- a/Engine/Source/Runtime/Core/Math/Vector3.hpp +++ b/Engine/Source/Runtime/Core/Math/Vector3.hpp @@ -3,13 +3,13 @@ // TODO: Slerp (using Quaternions) -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/MathFwd.h" -#include "Core/public/Math/SIMD/Storage.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/MathFwd.h" +#include "Core/Math/SIMD/Storage.h" -#include "Core/public/Math/Vector4.hpp" +#include "Core/Math/Vector4.hpp" #ifndef P_DEBUG #pragma warning(disable : 4244) @@ -1179,4 +1179,4 @@ namespace Phanes::Core::Math { #endif // !VECTOR3_H -#include "Core/public/Math/Vector3.inl" \ No newline at end of file +#include "Core/Math/Vector3.inl" \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/Math/Vector3.inl b/Engine/Source/Runtime/Core/Math/Vector3.inl index b1d4ecb..89bb6f1 100644 --- a/Engine/Source/Runtime/Core/Math/Vector3.inl +++ b/Engine/Source/Runtime/Core/Math/Vector3.inl @@ -1,11 +1,11 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/Vector3Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/Vector3Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" diff --git a/Engine/Source/Runtime/Core/Math/Vector4.hpp b/Engine/Source/Runtime/Core/Math/Vector4.hpp index 8f7404f..2d3f536 100644 --- a/Engine/Source/Runtime/Core/Math/Vector4.hpp +++ b/Engine/Source/Runtime/Core/Math/Vector4.hpp @@ -1,14 +1,14 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" -#include "Core/public/Math/MathCommon.hpp" -#include "Core/public/Math/SIMD/Storage.h" -#include "Core/public/Math/MathFwd.h" +#include "Core/Math/Boilerplate.h" +#include "Core/Math/MathCommon.hpp" +#include "Core/Math/SIMD/Storage.h" +#include "Core/Math/MathFwd.h" -#include "Core/public/Math/Vector2.hpp" -#include "Core/public/Math/Vector3.hpp" +#include "Core/Math/Vector2.hpp" +#include "Core/Math/Vector3.hpp" #define PZeroVector4(type, aligned) Phanes::Core::Math::TVector4<##type, ##aligned>(0,0,0,0) @@ -864,4 +864,4 @@ namespace Phanes::Core::Math } -#include "Core/public/Math/Vector4.inl" +#include "Core/Math/Vector4.inl" diff --git a/Engine/Source/Runtime/Core/Math/Vector4.inl b/Engine/Source/Runtime/Core/Math/Vector4.inl index 728160a..73309e8 100644 --- a/Engine/Source/Runtime/Core/Math/Vector4.inl +++ b/Engine/Source/Runtime/Core/Math/Vector4.inl @@ -1,12 +1,12 @@ #pragma once -#include "Core/public/Math/Boilerplate.h" +#include "Core/Math/Boilerplate.h" -#include "Core/public/Math/Detail/Vector4Decl.inl" -#include "Core/public/Math/SIMD/SIMDIntrinsics.h" +#include "Core/Math/Detail/Vector4Decl.inl" +#include "Core/Math/SIMD/SIMDIntrinsics.h" -#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" +#include "Core/Math/SIMD/PhanesSIMDTypes.h" namespace Phanes::Core::Math { diff --git a/Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt b/Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt deleted file mode 100644 index f07c155..0000000 --- a/Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 3.15...3.30) - -project(StartingPoint) - -set(StartingPoint - StartingPoint/EntryPoint.h - StartingPoint/StartingPoint.h - StartingPoint/private/StartingPoint.cpp -) - -set(StartingPointPCH - StartingPoint/StartingPointPCH.h -) \ No newline at end of file diff --git a/Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp b/Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp index 0fb3ad1..7cfa83b 100644 --- a/Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp +++ b/Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp @@ -24,8 +24,6 @@ static void IdleMsg() } - - Phanes::Core::Application::PhanesProject::PhanesProject(std::string _ProjectName) : projectName(_ProjectName) { diff --git a/Engine/Source/Runtime/Phanes.h b/Engine/Source/Runtime/Phanes.h index 425e646..a8d0f75 100644 --- a/Engine/Source/Runtime/Phanes.h +++ b/Engine/Source/Runtime/Phanes.h @@ -2,6 +2,5 @@ // --- Core ------------------- -#include "PhanesEnginePCH.h" #include "Core/Include.h" diff --git a/MathTestFPU/main.cpp b/MathTestFPU/main.cpp new file mode 100644 index 0000000..6975e17 --- /dev/null +++ b/MathTestFPU/main.cpp @@ -0,0 +1,12 @@ +#include + +#include "Core/Math/Include.h" + +int main(int argc, char **argv) { + Phanes::Core::Math::Vector3 v1(1.0f, 2.0f, 3.0f); + Phanes::Core::Math::Vector3 v2(1.0f, 2.0f, 3.0f); + + Phanes::Core::Math::Vector3 v3 = v1 + v2; + + std::cout << "v3: " << Phanes::Core::Math::ToString(v3) << std::endl; +} \ No newline at end of file diff --git a/MathTestFPU/pch.cpp b/MathTestFPU/pch.cpp deleted file mode 100644 index be12eaa..0000000 --- a/MathTestFPU/pch.cpp +++ /dev/null @@ -1,7 +0,0 @@ -// -// pch.cpp -// - -#pragma once - -#include "pch.h" diff --git a/premake5.lua b/premake5.lua new file mode 100644 index 0000000..abd0b09 --- /dev/null +++ b/premake5.lua @@ -0,0 +1,2 @@ +workspace "PhanesEngine" + configurations { "Debug", "Release" } \ No newline at end of file