sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes

This commit is contained in:
SirLynix 2023-12-23 14:01:04 +01:00
parent 6dc27e7948
commit 91221a9b4a
4 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/ShaderReflection.hpp
View File

@ -11,8 +11,8 @@
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Renderer/RenderPipelineLayout.hpp>
#include <NZSL/Ast/Module.hpp>
#include <NZSL/Ast/RecursiveVisitor.hpp>
#include <NZSL/Ast/Option.hpp>
#include <NZSL/Ast/RecursiveVisitor.hpp>
#include <NZSL/Math/FieldOffsets.hpp>
#include <unordered_map>

45
include/Nazara/Math/Angle.inl
View File

@ -22,7 +22,8 @@ namespace Nz
template<AngleUnit Unit>
struct AngleConversion<Unit, Unit>
{
template<typename T> static constexpr T Convert(T angle)
template<typename T>
static constexpr T Convert(T angle)
{
return angle;
}
@ -31,7 +32,8 @@ namespace Nz
template<>
struct AngleConversion<AngleUnit::Degree, AngleUnit::Radian>
{
template<typename T> static constexpr T Convert(T angle)
template<typename T>
static constexpr T Convert(T angle)
{
return DegreeToRadian(angle);
}
@ -40,7 +42,8 @@ namespace Nz
template<>
struct AngleConversion<AngleUnit::Degree, AngleUnit::Turn>
{
template<typename T> static constexpr T Convert(T angle)
template<typename T>
static constexpr T Convert(T angle)
{
return angle / T(360);
}
@ -49,7 +52,8 @@ namespace Nz
template<>
struct AngleConversion<AngleUnit::Radian, AngleUnit::Degree>
{
template<typename T> static constexpr T Convert(T angle)
template<typename T>
static constexpr T Convert(T angle)
{
return RadianToDegree(angle);
}
@ -58,7 +62,8 @@ namespace Nz
template<>
struct AngleConversion<AngleUnit::Radian, AngleUnit::Turn>
{
template<typename T> static constexpr T Convert(T angle)
template<typename T>
static constexpr T Convert(T angle)
{
return angle / (T(2) * Pi<T>);
}
@ -67,7 +72,8 @@ namespace Nz
template<>
struct AngleConversion<AngleUnit::Turn, AngleUnit::Degree>
{
template<typename T> static constexpr T Convert(T angle)
template<typename T>
static constexpr T Convert(T angle)
{
return angle * T(360);
}
@ -76,7 +82,8 @@ namespace Nz
template<>
struct AngleConversion<AngleUnit::Turn, AngleUnit::Radian>
{
template<typename T> static constexpr T Convert(T angle)
template<typename T>
static constexpr T Convert(T angle)
{
return angle * T(2) * Pi<T>;
}
@ -87,12 +94,14 @@ namespace Nz
template<>
struct AngleUtils<AngleUnit::Degree>
{
template<typename T> static constexpr T GetEpsilon()
template<typename T>
static constexpr T GetEpsilon()
{
return T(1e-4);
}
template<typename T> static constexpr T GetLimit()
template<typename T>
static constexpr T GetLimit()
{
return 360;
}
@ -106,17 +115,20 @@ namespace Nz
template<>
struct AngleUtils<AngleUnit::Radian>
{
template<typename T> static constexpr T GetEpsilon()
template<typename T>
static constexpr T GetEpsilon()
{
return T(1e-5);
}
template<typename T> static constexpr T GetLimit()
template<typename T>
static constexpr T GetLimit()
{
return T(2) * Pi<T>;
}
template<typename T> static std::ostream& ToString(std::ostream& out, T value)
template<typename T>
static std::ostream& ToString(std::ostream& out, T value)
{
return out << "Angle(" << value << "rad)";
}
@ -125,17 +137,20 @@ namespace Nz
template<>
struct AngleUtils<AngleUnit::Turn>
{
template<typename T> static constexpr T GetEpsilon()
template<typename T>
static constexpr T GetEpsilon()
{
return T(1e-5);
}
template<typename T> static constexpr T GetLimit()
template<typename T>
static constexpr T GetLimit()
{
return 1;
}
template<typename T> static std::ostream& ToString(std::ostream& out, T value)
template<typename T>
static std::ostream& ToString(std::ostream& out, T value)
{
return out << "Angle(" << value << "turn)";
}

4
include/Nazara/Platform/Keyboard.hpp
View File

@ -22,7 +22,7 @@ namespace Nz
{
Undefined = -1,
// Lettres
// Letters
A,
B,
C,
@ -171,7 +171,7 @@ namespace Nz
{
Undefined = -1,
// Lettres
// Letters
A,
B,
C,

4
src/Nazara/Platform/SDL2/InputImpl.cpp
View File

@ -43,7 +43,7 @@ namespace Nz
if (scancode != SDL_SCANCODE_UNKNOWN)
name = SDL_GetScancodeName(scancode);
else
name = "Unknown";
name = "unknown";
return name;
}
@ -56,7 +56,7 @@ namespace Nz
if (vkey != SDLK_UNKNOWN)
name = SDL_GetKeyName(vkey);
else
name = "Unknown";
name = "unknown";
return name;
}