thoehne/PhanesEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing Math includes

Browse Source
This commit is contained in:
Thorben Höhne 2025-02-19 12:17:08 +01:00
parent d6362a62df
commit 1fbbdf5f0a
57 changed files with 240 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/settings.json vendored
View File

@ -101,5 +101,5 @@
"P_LINUX_BUILD", "P_LINUX_BUILD",
"__SSE__", "__SSE__",
], ],
"cmake.sourceDirectory": "/home/morthaine/Development/PhanesEngine/DevPlayground", "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
} }

28
.vscode/tasks.json vendored Normal file
View File

@ -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"
}

18
DevPlayground/CMakeLists.txt
View File

@ -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)

5
Engine/Source/Runtime/CMakeLists.txt
View File

@ -1,5 +0,0 @@
cmake_minimum_required(VERSION 3.15...3.30)
project(PhanesRuntime)
add_subdirectory(Core)

29
Engine/Source/Runtime/Core/CMakeLists.txt
View File

@ -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}/../)

2
Engine/Source/Runtime/Core/Core.h
View File

@ -38,6 +38,8 @@
#endif #endif
#define FORCEINLINE __attribute__((always_inline))
#elif defined(P_ARM_BUILD) #elif defined(P_ARM_BUILD)
#error Only Windows is supported at the moment. #error Only Windows is supported at the moment.

12
Engine/Source/Runtime/Core/Logging/CMakeLists.txt
View File

@ -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
)

2
Engine/Source/Runtime/Core/Math/Detail/IntVector2Decl.inl
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
namespace Phanes::Core::Math::Detail namespace Phanes::Core::Math::Detail
{ {

2
Engine/Source/Runtime/Core/Math/Detail/IntVector3Decl.inl
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
namespace Phanes::Core::Math::Detail namespace Phanes::Core::Math::Detail
{ {

2
Engine/Source/Runtime/Core/Math/Detail/IntVector4Decl.inl
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
namespace Phanes::Core::Math::Detail namespace Phanes::Core::Math::Detail
{ {

4
Engine/Source/Runtime/Core/Math/Detail/Matrix3Decl.inl
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#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::Detail namespace Phanes::Core::Math::Detail
{ {

4
Engine/Source/Runtime/Core/Math/Detail/Matrix4Decl.inl
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#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::Detail namespace Phanes::Core::Math::Detail
{ {

2
Engine/Source/Runtime/Core/Math/Detail/PlaneDecl.inl
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
namespace Phanes::Core::Math::Detail namespace Phanes::Core::Math::Detail
{ {

4
Engine/Source/Runtime/Core/Math/Detail/Vector2Decl.inl
View File

@ -1,8 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include <iostream>
namespace Phanes::Core::Math::Detail namespace Phanes::Core::Math::Detail
{ {

2
Engine/Source/Runtime/Core/Math/Detail/Vector3Decl.inl
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
namespace Phanes::Core::Math::Detail namespace Phanes::Core::Math::Detail
{ {

2
Engine/Source/Runtime/Core/Math/Detail/Vector4Decl.inl
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
namespace Phanes::Core::Math::Detail namespace Phanes::Core::Math::Detail
{ {

32
Engine/Source/Runtime/Core/Math/Include.h
View File

@ -4,36 +4,36 @@
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
#endif #endif
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
// --- Vectors ------------------------ // --- Vectors ------------------------
#include "Core/public/Math/Vector2.hpp" #include "Core/Math/Vector2.hpp"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#include "Core/public/Math/Vector4.hpp" #include "Core/Math/Vector4.hpp"
#include "Core/public/Math/IntVector2.hpp" #include "Core/Math/IntVector2.hpp"
#include "Core/public/Math/IntVector3.hpp" #include "Core/Math/IntVector3.hpp"
#include "Core/public/Math/IntVector4.hpp" #include "Core/Math/IntVector4.hpp"
#include "Core/public/Math/Point.hpp" #include "Core/Math/Point.hpp"
#include "Core/public/Math/IntPoint.hpp" #include "Core/Math/IntPoint.hpp"
// --- Matrices ------------------------ // --- Matrices ------------------------
#include "Core/public/Math/Matrix2.hpp" #include "Core/Math/Matrix2.hpp"
#include "Core/public/Math/Matrix3.hpp" #include "Core/Math/Matrix3.hpp"
#include "Core/public/Math/Matrix4.hpp" #include "Core/Math/Matrix4.hpp"
// --- Other Math ---------------------- // --- Other Math ----------------------
#include "Core/public/Math/Plane.hpp" #include "Core/Math/Plane.hpp"
#include "Core/public/Math/Line.hpp" #include "Core/Math/Line.hpp"
// --- Misc ----------------- // --- Misc -----------------
#include "Core/public/Math/MathTypeConversion.hpp" #include "Core/Math/MathTypeConversion.hpp"
#include "Core/public/Math/MathUnitConversion.hpp" #include "Core/Math/MathUnitConversion.hpp"

14
Engine/Source/Runtime/Core/Math/IntPoint.hpp
View File

@ -1,14 +1,14 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathAbstractTypes.h" #include "Core/Math/MathAbstractTypes.h"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/IntVector2.hpp" #include "Core/Math/IntVector2.hpp"
#include "Core/public/Math/IntVector3.hpp" #include "Core/Math/IntVector3.hpp"
#include "Core/public/Math/IntVector4.hpp" #include "Core/Math/IntVector4.hpp"
#ifndef P_DEBUG #ifndef P_DEBUG
#pragma warning(disable : 4244) #pragma warning(disable : 4244)

10
Engine/Source/Runtime/Core/Math/IntVector2.hpp
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/SIMD/Storage.h" #include "Core/Math/SIMD/Storage.h"
#ifndef P_DEBUG #ifndef P_DEBUG
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
@ -627,4 +627,4 @@ namespace Phanes::Core::Math {
#endif // !INTVECTOR2_H #endif // !INTVECTOR2_H
#include "Core/public/Math/IntVector2.inl" #include "Core/Math/IntVector2.inl"

8
Engine/Source/Runtime/Core/Math/IntVector2.inl
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/IntVector2Decl.inl" #include "Core/Math/Detail/IntVector2Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
namespace Phanes::Core::Math namespace Phanes::Core::Math
{ {

12
Engine/Source/Runtime/Core/Math/IntVector3.hpp
View File

@ -1,13 +1,13 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathFwd.h" #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 #ifndef P_DEBUG
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
@ -686,4 +686,4 @@ namespace Phanes::Core::Math {
#endif // !INTVECTOR3_H #endif // !INTVECTOR3_H
#include "Core/public/Math/IntVector3.inl" #include "Core/Math/IntVector3.inl"

8
Engine/Source/Runtime/Core/Math/IntVector3.inl
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/IntVector3Decl.inl" #include "Core/Math/Detail/IntVector3Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
namespace Phanes::Core::Math namespace Phanes::Core::Math

12
Engine/Source/Runtime/Core/Math/IntVector4.hpp
View File

@ -1,13 +1,13 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathFwd.h" #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 #ifndef P_DEBUG
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
@ -640,4 +640,4 @@ namespace Phanes::Core::Math {
#endif // !INTVECTOR3_H #endif // !INTVECTOR3_H
#include "Core/public/Math/IntVector4.inl" #include "Core/Math/IntVector4.inl"

8
Engine/Source/Runtime/Core/Math/IntVector4.inl
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/IntVector4Decl.inl" #include "Core/Math/Detail/IntVector4Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
namespace Phanes::Core::Math namespace Phanes::Core::Math
{ {

8
Engine/Source/Runtime/Core/Math/Line.hpp
View File

@ -1,12 +1,10 @@
#pragma once #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/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#include <any>
namespace Phanes::Core::Math namespace Phanes::Core::Math

26
Engine/Source/Runtime/Core/Math/MathCommon.hpp
View File

@ -126,35 +126,11 @@ namespace Phanes::Core::Math {
template<typename T> template<typename T>
FORCEINLINE T Abs(T s) inline T Abs(T s)
{ {
return abs(s); return abs(s);
} }
template<>
FORCEINLINE float Abs<float>(float s)
{
return (float)fabs(s);
};
template<>
FORCEINLINE long long Abs<long long>(long long s)
{
return llabs(s);
};
template<>
FORCEINLINE long Abs<long>(long s)
{
return labs(s);
};
template<>
FORCEINLINE double Abs<double>(double s)
{
return fabsl(s);
};
} // phanes } // phanes

4
Engine/Source/Runtime/Core/Math/MathFwd.h
View File

@ -9,8 +9,8 @@
#ifndef MATH_FWD_H #ifndef MATH_FWD_H
#define MATH_FWD_H #define MATH_FWD_H
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
/** /**
* Includes forward declarations, as well as certain useful typedefs. * Includes forward declarations, as well as certain useful typedefs.

34
Engine/Source/Runtime/Core/Math/MathPCH.h
View File

@ -3,25 +3,25 @@
#pragma once #pragma once
#include "Core/public/Math/Point.hpp" #include "Core/Math/Point.hpp"
#include "Core/public/Math/Plane.hpp" #include "Core/Math/Plane.hpp"
#include "Core/public/Math/Line.hpp" #include "Core/Math/Line.hpp"
#include "Core/public/Math/Ray.hpp" #include "Core/Math/Ray.hpp"
#include "Core/public/Math/Vector2.hpp" #include "Core/Math/Vector2.hpp"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#include "Core/public/Math/Vector4.hpp" #include "Core/Math/Vector4.hpp"
#include "Core/public/Math/IntPoint.hpp" #include "Core/Math/IntPoint.hpp"
#include "Core/public/Math/IntVector2.hpp" #include "Core/Math/IntVector2.hpp"
#include "Core/public/Math/IntVector3.hpp" #include "Core/Math/IntVector3.hpp"
#include "Core/public/Math/IntVector4.hpp" #include "Core/Math/IntVector4.hpp"
#include "Core/public/Math/Matrix2.hpp" #include "Core/Math/Matrix2.hpp"
#include "Core/public/Math/Matrix3.hpp" #include "Core/Math/Matrix3.hpp"
#include "Core/public/Math/Matrix4.hpp" #include "Core/Math/Matrix4.hpp"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathTypeConversion.hpp" #include "Core/Math/MathTypeConversion.hpp"
#include "Core/public/Math/MathUnitConversion.hpp" #include "Core/Math/MathUnitConversion.hpp"

22
Engine/Source/Runtime/Core/Math/MathTypeConversion.hpp
View File

@ -12,18 +12,18 @@
#include <string> #include <string>
#endif #endif
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathAbstractTypes.h" #include "Core/Math/MathAbstractTypes.h"
#include "Core/public/Math/Vector2.hpp" #include "Core/Math/Vector2.hpp"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#include "Core/public/Math/Vector4.hpp" #include "Core/Math/Vector4.hpp"
#include "Core/public/Math/Matrix2.hpp" #include "Core/Math/Matrix2.hpp"
#include "Core/public/Math/Matrix3.hpp" #include "Core/Math/Matrix3.hpp"
#include "Core/public/Math/Matrix4.hpp" #include "Core/Math/Matrix4.hpp"
#include "Core/public/Math/IntVector2.hpp" #include "Core/Math/IntVector2.hpp"
#include "Core/public/Math/IntVector3.hpp" #include "Core/Math/IntVector3.hpp"
#include "Core/public/Math/IntVector4.hpp" #include "Core/Math/IntVector4.hpp"
#ifndef MATH_TYPE_CONVERSION_H #ifndef MATH_TYPE_CONVERSION_H
#define MATH_TYPE_CONVERSION_H #define MATH_TYPE_CONVERSION_H

8
Engine/Source/Runtime/Core/Math/MathUnitConversion.hpp
View File

@ -4,9 +4,9 @@
// Contains functions to convert units // // 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 namespace Phanes::Core::Math::UnitConversion
{ {
@ -14,7 +14,7 @@ namespace Phanes::Core::Math::UnitConversion
/** /**
* Converts degrees to radians. * Converts degrees to radians.
* *
* @param(deg) Angle in degress (°) * @param(deg) Angle in degress (<EFBFBD>)
* *
* @return Angle in radians * @return Angle in radians
*/ */
@ -42,7 +42,7 @@ namespace Phanes::Core::Math::UnitConversion
/** /**
* Converts degrees to gradian. * Converts degrees to gradian.
* *
* @param(deg) Angle in degress (°) * @param(deg) Angle in degress (<EFBFBD>)
* *
* @return Angle in gradian * @return Angle in gradian
*/ */

8
Engine/Source/Runtime/Core/Math/Matrix2.hpp
View File

@ -1,10 +1,10 @@
#pragma once #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 #ifndef MATRIX2_H
#define MATRIX2_H #define MATRIX2_H
@ -355,4 +355,4 @@ namespace Phanes::Core::Math {
#endif // !MATRIX2_H #endif // !MATRIX2_H
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"

10
Engine/Source/Runtime/Core/Math/Matrix3.hpp
View File

@ -1,10 +1,10 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathAbstractTypes.h" #include "Core/Math/MathAbstractTypes.h"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#ifndef MATRIX3_H #ifndef MATRIX3_H
#define MATRIX3_H #define MATRIX3_H
@ -547,4 +547,4 @@ namespace Phanes::Core::Math {
#endif // !MATRIX3_H #endif // !MATRIX3_H
#include "Core/public/Math/Matrix3.inl" #include "Core/Math/Matrix3.inl"

8
Engine/Source/Runtime/Core/Math/Matrix3.inl
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/Matrix3Decl.inl" #include "Core/Math/Detail/Matrix3Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
namespace Phanes::Core::Math namespace Phanes::Core::Math
{ {

10
Engine/Source/Runtime/Core/Math/Matrix4.hpp
View File

@ -1,10 +1,10 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathAbstractTypes.h" #include "Core/Math/MathAbstractTypes.h"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/Vector4.hpp" #include "Core/Math/Vector4.hpp"
#ifndef MATRIX4_H #ifndef MATRIX4_H
#define MATRIX4_H #define MATRIX4_H
@ -331,4 +331,4 @@ namespace Phanes::Core::Math {
#endif // !MATRIX4_H #endif // !MATRIX4_H
#include "Core/public/Math/Matrix4.inl" #include "Core/Math/Matrix4.inl"

8
Engine/Source/Runtime/Core/Math/Matrix4.inl
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/Matrix4Decl.inl" #include "Core/Math/Detail/Matrix4Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
namespace Phanes::Core::Math namespace Phanes::Core::Math

12
Engine/Source/Runtime/Core/Math/Plane.hpp
View File

@ -3,12 +3,12 @@
// TODO: Transform // TODO: Transform
#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/Line.hpp" #include "Core/Math/Line.hpp"
#include "Core/public/Math/Ray.hpp" #include "Core/Math/Ray.hpp"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
namespace Phanes::Core::Math { namespace Phanes::Core::Math {
@ -953,4 +953,4 @@ namespace Phanes::Core::Math {
} // Phanes::Core::Math } // Phanes::Core::Math
// Include operator impl. // Include operator impl.
#include "Core/public/Math/Plane.inl" #include "Core/Math/Plane.inl"

8
Engine/Source/Runtime/Core/Math/Plane.inl
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/PlaneDecl.inl" #include "Core/Math/Detail/PlaneDecl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"

12
Engine/Source/Runtime/Core/Math/Point.hpp
View File

@ -1,13 +1,13 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathAbstractTypes.h" #include "Core/Math/MathAbstractTypes.h"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/Vector2.hpp" #include "Core/Math/Vector2.hpp"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#ifndef P_DEBUG #ifndef P_DEBUG
#pragma warning(disable : 4244) #pragma warning(disable : 4244)

6
Engine/Source/Runtime/Core/Math/Ray.hpp
View File

@ -1,9 +1,9 @@
#pragma once #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/Vector3.hpp" #include "Core/Math/Vector3.hpp"
namespace Phanes::Core::Math namespace Phanes::Core::Math
{ {

2
Engine/Source/Runtime/Core/Math/SIMD/Alignment.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
namespace Phanes::Core::Math::SIMD namespace Phanes::Core::Math::SIMD

4
Engine/Source/Runtime/Core/Math/SIMD/PhanesSIMDTypes.h
View File

@ -4,8 +4,8 @@
// //
// ARM is not supported. // ARM is not supported.
#include "Core/public/Math/SIMD/Platform.h" #include "Core/Math/SIMD/Platform.h"
#include "Core/public/Math/MathTypes.h" #include "Core/Math/MathTypes.h"
#if P_INTRINSICS == P_INTRINSICS_AVX2 #if P_INTRINSICS == P_INTRINSICS_AVX2
# include <immintrin.h> # include <immintrin.h>

24
Engine/Source/Runtime/Core/Math/SIMD/PhanesVectorMathSSE.hpp
View File

@ -2,23 +2,23 @@
#include <nmmintrin.h> #include <nmmintrin.h>
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/Vector2.hpp" #include "Core/Math/Vector2.hpp"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#include "Core/public/Math/Vector4.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/Math/IntVector2.hpp"
#include "Core/public/Math/IntVector3.hpp" #include "Core/Math/IntVector3.hpp"
#include "Core/public/Math/IntVector4.hpp" #include "Core/Math/IntVector4.hpp"
#include "Core/public/Math/Matrix3.hpp" #include "Core/Math/Matrix3.hpp"
#include "Core/public/Math/Matrix4.hpp" #include "Core/Math/Matrix4.hpp"

3
Engine/Source/Runtime/Core/Math/SIMD/Platform.h
View File

@ -23,9 +23,9 @@
// User defines build platform // User defines build platform
#ifdef P_WIN_BUILD #ifdef P_WIN_BUILD
# define P_PLATFORM P_PLATFORM_WIN # define P_PLATFORM P_PLATFORM_WIN
# error Windows system is not yet supported.
#elif P_LINUX_BUILD #elif P_LINUX_BUILD
# define P_PLATFORM P_PLATFORM_LIN # define P_PLATFORM P_PLATFORM_LIN
# error Linux / Unix system is not yet supported.
#elif P_MAC_BUILD #elif P_MAC_BUILD
# define P_PLATFORM P_PLATFORM_MAC # define P_PLATFORM P_PLATFORM_MAC
# error Mac target system is not yet supported. # error Mac target system is not yet supported.
@ -142,7 +142,6 @@
// Clang // Clang
#elif (defined(__clang__)) #elif (defined(__clang__))
# error PhanesEngine only supports MSVC -> Visual Studio
# if defined(__apple_build_version__) # if defined(__apple_build_version__)
# #
# if (__clang_major__ < 6) # if (__clang_major__ < 6)

10
Engine/Source/Runtime/Core/Math/SIMD/SIMDIntrinsics.h
View File

@ -1,15 +1,15 @@
#pragma once #pragma once
#include "Core/public/Math/SIMD/Platform.h" #include "Core/Math/SIMD/Platform.h"
#if P_INTRINSICS == P_INTRINSICS_AVX2 #if P_INTRINSICS == P_INTRINSICS_AVX2
# include "PhanesVectorMathAVX2.hpp" # include "Core/Math/SIMD/PhanesVectorMathAVX2.hpp"
#elif P_INTRINSICS == P_INTRINSICS_AVX #elif P_INTRINSICS == P_INTRINSICS_AVX
# include "PhanesVectorMathAVX.hpp" # include "Core/Math/SIMD/PhanesVectorMathAVX.hpp"
#elif P_INTRINSICS == P_INTRINSICS_SSE #elif P_INTRINSICS == P_INTRINSICS_SSE
# include "PhanesVectorMathSSE.hpp" # include "Core/Math/SIMD/PhanesVectorMathSSE.hpp"
#elif P_INTRINSICS == P_INTRINSICS_NEON #elif P_INTRINSICS == P_INTRINSICS_NEON
# include "PhanesVectorMathNeon.hpp" # include "Core/Math/SIMD/PhanesVectorMathNeon.hpp"
#endif #endif

4
Engine/Source/Runtime/Core/Math/SIMD/Storage.h
View File

@ -1,9 +1,9 @@
// Defines on compile time, whether a xmm register or an array should be used. // Defines on compile time, whether a xmm register or an array should be used.
#pragma once #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 namespace Phanes::Core::Math::SIMD
{ {

10
Engine/Source/Runtime/Core/Math/Vector2.hpp
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/SIMD/Storage.h" #include "Core/Math/SIMD/Storage.h"
#ifndef P_DEBUG #ifndef P_DEBUG
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
@ -1016,4 +1016,4 @@ namespace Phanes::Core::Math {
#endif // !VECTOR2_H #endif // !VECTOR2_H
// Include operator impl. // Include operator impl.
#include "Core/public/Math/Vector2.inl" #include "Core/Math/Vector2.inl"

8
Engine/Source/Runtime/Core/Math/Vector2.inl
View File

@ -4,12 +4,12 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/Vector2Decl.inl" #include "Core/Math/Detail/Vector2Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"

12
Engine/Source/Runtime/Core/Math/Vector3.hpp
View File

@ -3,13 +3,13 @@
// TODO: Slerp (using Quaternions) // TODO: Slerp (using Quaternions)
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/SIMD/Storage.h" #include "Core/Math/SIMD/Storage.h"
#include "Core/public/Math/Vector4.hpp" #include "Core/Math/Vector4.hpp"
#ifndef P_DEBUG #ifndef P_DEBUG
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
@ -1179,4 +1179,4 @@ namespace Phanes::Core::Math {
#endif // !VECTOR3_H #endif // !VECTOR3_H
#include "Core/public/Math/Vector3.inl" #include "Core/Math/Vector3.inl"

8
Engine/Source/Runtime/Core/Math/Vector3.inl
View File

@ -1,11 +1,11 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/Vector3Decl.inl" #include "Core/Math/Detail/Vector3Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"

14
Engine/Source/Runtime/Core/Math/Vector4.hpp
View File

@ -1,14 +1,14 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/MathCommon.hpp" #include "Core/Math/MathCommon.hpp"
#include "Core/public/Math/SIMD/Storage.h" #include "Core/Math/SIMD/Storage.h"
#include "Core/public/Math/MathFwd.h" #include "Core/Math/MathFwd.h"
#include "Core/public/Math/Vector2.hpp" #include "Core/Math/Vector2.hpp"
#include "Core/public/Math/Vector3.hpp" #include "Core/Math/Vector3.hpp"
#define PZeroVector4(type, aligned) Phanes::Core::Math::TVector4<##type, ##aligned>(0,0,0,0) #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"

8
Engine/Source/Runtime/Core/Math/Vector4.inl
View File

@ -1,12 +1,12 @@
#pragma once #pragma once
#include "Core/public/Math/Boilerplate.h" #include "Core/Math/Boilerplate.h"
#include "Core/public/Math/Detail/Vector4Decl.inl" #include "Core/Math/Detail/Vector4Decl.inl"
#include "Core/public/Math/SIMD/SIMDIntrinsics.h" #include "Core/Math/SIMD/SIMDIntrinsics.h"
#include "Core/public/Math/SIMD/PhanesSIMDTypes.h" #include "Core/Math/SIMD/PhanesSIMDTypes.h"
namespace Phanes::Core::Math namespace Phanes::Core::Math
{ {

13
Engine/Source/Runtime/Core/StartingPoint/CMakeLists.txt
View File

@ -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
)

2
Engine/Source/Runtime/Core/StartingPoint/private/StartingPoint.cpp
View File

@ -24,8 +24,6 @@ static void IdleMsg()
} }
Phanes::Core::Application::PhanesProject::PhanesProject(std::string _ProjectName) Phanes::Core::Application::PhanesProject::PhanesProject(std::string _ProjectName)
: projectName(_ProjectName) : projectName(_ProjectName)
{ {

1
Engine/Source/Runtime/Phanes.h
View File

@ -2,6 +2,5 @@
// --- Core ------------------- // --- Core -------------------
#include "PhanesEnginePCH.h"
#include "Core/Include.h" #include "Core/Include.h"

12
MathTestFPU/main.cpp Normal file
View File

@ -0,0 +1,12 @@
#include <iostream>
#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;
}

7
MathTestFPU/pch.cpp
View File

@ -1,7 +0,0 @@
//
// pch.cpp
//
#pragma once
#include "pch.h"

2
premake5.lua Normal file
View File

@ -0,0 +1,2 @@
workspace "PhanesEngine"
configurations { "Debug", "Release" }