Skip to content

Commit

Permalink
Remap headers correctly
Browse files Browse the repository at this point in the history
This should compile correctly now
  • Loading branch information
redorav committed May 20, 2024
1 parent 31356e4 commit aa99a4a
Show file tree
Hide file tree
Showing 17 changed files with 42 additions and 42 deletions.
20 changes: 10 additions & 10 deletions include/hlsl++.h
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

// Add HLSLPP_FEATURE_TRANSFORM definition prior to including hlsl++.h to enable compilation of matrix transformations
#include "transform/common.h"
#include "hlsl++/transform/common.h"

#include "hlsl++_vector_float.h"
#include "hlsl++/vector_float.h"

#include "hlsl++_vector_float8.h"
#include "hlsl++/vector_float8.h"

#include "hlsl++_matrix_float.h"
#include "hlsl++/matrix_float.h"

#include "hlsl++_vector_int.h"
#include "hlsl++/vector_int.h"

#include "hlsl++_vector_uint.h"
#include "hlsl++/vector_uint.h"

#include "hlsl++_vector_double.h"
#include "hlsl++/vector_double.h"

#include "hlsl++_quaternion.h"
#include "hlsl++/quaternion.h"

// Some functions depend on having the knowledge of types that have been defined before.
// In order to break the header dependencies they are all defined here.
#include "hlsl++_dependent.h"
#include "hlsl++/dependent.h"
2 changes: 1 addition & 1 deletion include/hlsl++/common.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_config.h"
#include "hlsl++/config.h"

namespace hlslpp
{
Expand Down
4 changes: 2 additions & 2 deletions include/hlsl++/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@

#include <stdint.h>

#include "hlsl++_type_traits.h"
#include "hlsl++/type_traits.h"

#include "hlsl++_bitmask.h"
#include "hlsl++/bitmask.h"

// Despite the process above, we can still force the library to behave as scalar by defining the
// implementation we want.
Expand Down
10 changes: 5 additions & 5 deletions include/hlsl++/dependent.h
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include "hlsl++_vector_float.h"
#include "hlsl++_vector_int.h"
#include "hlsl++_vector_uint.h"
#include "hlsl++_quaternion.h"
#include "hlsl++_matrix_float.h"
#include "hlsl++/vector_float.h"
#include "hlsl++/vector_int.h"
#include "hlsl++/vector_uint.h"
#include "hlsl++/quaternion.h"
#include "hlsl++/matrix_float.h"

namespace hlslpp
{
Expand Down
4 changes: 2 additions & 2 deletions include/hlsl++/matrix_float.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

#include "hlsl++_matrix_float_type.h"
#include "hlsl++/matrix_float_type.h"

//--------------//
// Float Matrix //
Expand Down
10 changes: 5 additions & 5 deletions include/hlsl++/matrix_float_type.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

#include "hlsl++_vector_float.h"
#include "hlsl++/vector_float.h"

#include "transform/common.h"

Expand Down Expand Up @@ -222,7 +222,7 @@ namespace hlslpp
hlslpp_inline float2x2(float2x2&& m) hlslpp_noexcept : vec(m.vec) {}
hlslpp_inline float2x2& operator = (float2x2&& m) hlslpp_noexcept { vec = m.vec; return *this; }

#include "transform/float2x2.h"
#include "hlsl++/transform/float2x2.h"

union
{
Expand Down Expand Up @@ -403,7 +403,7 @@ namespace hlslpp

static const float3x3& identity() { static const float3x3 iden = float3x3(1, 0, 0, 0, 1, 0, 0, 0, 1); return iden; }

#include "transform/float3x3.h"
#include "hlsl++/transform/float3x3.h"

float3& operator[](int N)
{
Expand Down Expand Up @@ -768,6 +768,6 @@ namespace hlslpp

static const float4x4& identity() { static const float4x4 iden = float4x4(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1); return iden; };

#include "transform/float4x4.h"
#include "hlsl++/transform/float4x4.h"
};
};
6 changes: 3 additions & 3 deletions include/hlsl++/quaternion.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

#include "math.h"

#include "hlsl++_common.h"
#include "hlsl++_vector_float.h"
#include "hlsl++/common.h"
#include "hlsl++/vector_float.h"

//-----------
// Quaternion
//-----------

#include "hlsl++_quaternion_type.h"
#include "hlsl++/quaternion_type.h"

namespace hlslpp
{
Expand Down
2 changes: 1 addition & 1 deletion include/hlsl++/quaternion_type.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

namespace hlslpp
{
Expand Down
4 changes: 2 additions & 2 deletions include/hlsl++/vector_double.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

//---------------//
// Double Vector //
Expand Down Expand Up @@ -245,7 +245,7 @@ namespace hlslpp
#endif
}

#include "hlsl++_vector_double_type.h"
#include "hlsl++/vector_double_type.h"

namespace hlslpp
{
Expand Down
2 changes: 1 addition & 1 deletion include/hlsl++/vector_double_type.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

#if defined(HLSLPP_DOUBLE)

Expand Down
4 changes: 2 additions & 2 deletions include/hlsl++/vector_float.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

//--------------//
// Float Vector //
Expand Down Expand Up @@ -546,7 +546,7 @@ namespace hlslpp
}
}

#include "hlsl++_vector_float_type.h"
#include "hlsl++/vector_float_type.h"

namespace hlslpp
{
Expand Down
2 changes: 1 addition & 1 deletion include/hlsl++/vector_float8.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

//---------------//
// Float8 Vector //
Expand Down
2 changes: 1 addition & 1 deletion include/hlsl++/vector_float_type.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

HLSLPP_WARNINGS_IMPLICIT_CONSTRUCTOR_BEGIN

Expand Down
4 changes: 2 additions & 2 deletions include/hlsl++/vector_int.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

//----------------//
// Integer Vector //
Expand Down Expand Up @@ -86,7 +86,7 @@ namespace hlslpp
}
}

#include "hlsl++_vector_int_type.h"
#include "hlsl++/vector_int_type.h"

namespace hlslpp
{
Expand Down
2 changes: 1 addition & 1 deletion include/hlsl++/vector_int_type.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

HLSLPP_WARNINGS_IMPLICIT_CONSTRUCTOR_BEGIN

Expand Down
4 changes: 2 additions & 2 deletions include/hlsl++/vector_uint.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

//----------------//
// Integer Vector //
Expand Down Expand Up @@ -93,7 +93,7 @@ namespace hlslpp
}
}

#include "hlsl++_vector_uint_type.h"
#include "hlsl++/vector_uint_type.h"

namespace hlslpp
{
Expand Down
2 changes: 1 addition & 1 deletion include/hlsl++/vector_uint_type.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "hlsl++_common.h"
#include "hlsl++/common.h"

HLSLPP_WARNINGS_IMPLICIT_CONSTRUCTOR_BEGIN

Expand Down

0 comments on commit aa99a4a

Please sign in to comment.