fix missing namespace in vectors

v1
Brett 2023-02-28 23:31:39 -05:00
parent 1d7775a742
commit 1cd889ff05
1 changed files with 215 additions and 208 deletions

View File

@ -10,8 +10,10 @@
#include <initializer_list>
#include <cmath>
template<typename T, unsigned long size>
struct vec {
namespace blt {
template<typename T, unsigned long size>
struct vec {
private:
T elements[size]{};
public:
@ -35,10 +37,13 @@ struct vec {
vec(const vec<T, size>& copy): vec(copy.elements) {}
[[nodiscard]] inline T x() const {return elements[0];}
[[nodiscard]] inline T y() const {return elements[1];}
[[nodiscard]] inline T z() const {return elements[2];}
[[nodiscard]] inline T w() const {return elements[3];}
[[nodiscard]] inline T x() const { return elements[0]; }
[[nodiscard]] inline T y() const { return elements[1]; }
[[nodiscard]] inline T z() const { return elements[2]; }
[[nodiscard]] inline T w() const { return elements[3]; }
inline T& operator[](int index) {
return elements[index];
@ -112,114 +117,116 @@ struct vec {
dot += left[i] * right[i];
return dot;
}
};
};
template<typename T, unsigned long size>
inline vec<T, size> operator+(const vec<T, size>& left, const vec<T, size>& right) {
template<typename T, unsigned long size>
inline vec<T, size> operator+(const vec<T, size>& left, const vec<T, size>& right) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = left[i] + right[i];
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator-(const vec<T, size>& left, const vec<T, size>& right) {
template<typename T, unsigned long size>
inline vec<T, size> operator-(const vec<T, size>& left, const vec<T, size>& right) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = left[i] - right[i];
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator+(const vec<T, size>& left, float f) {
template<typename T, unsigned long size>
inline vec<T, size> operator+(const vec<T, size>& left, float f) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = left[i] + f;
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator-(const vec<T, size>& left, float f) {
template<typename T, unsigned long size>
inline vec<T, size> operator-(const vec<T, size>& left, float f) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = left[i] + f;
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator+(float f, const vec<T, size>& right) {
template<typename T, unsigned long size>
inline vec<T, size> operator+(float f, const vec<T, size>& right) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = f + right[i];
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator-(float f, const vec<T, size>& right) {
template<typename T, unsigned long size>
inline vec<T, size> operator-(float f, const vec<T, size>& right) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = f - right[i];
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator*(const vec<T, size>& left, const vec<T, size>& right) {
template<typename T, unsigned long size>
inline vec<T, size> operator*(const vec<T, size>& left, const vec<T, size>& right) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = left[i] * right[i];
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator*(const vec<T, size>& left, float f) {
template<typename T, unsigned long size>
inline vec<T, size> operator*(const vec<T, size>& left, float f) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = left[i] * f;
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator*(float f, const vec<T, size>& right) {
template<typename T, unsigned long size>
inline vec<T, size> operator*(float f, const vec<T, size>& right) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = f * right[i];
return vec<T, size>{initializer};
}
}
template<typename T, unsigned long size>
inline vec<T, size> operator/(const vec<T, size>& left, float f) {
template<typename T, unsigned long size>
inline vec<T, size> operator/(const vec<T, size>& left, float f) {
float initializer[size];
for (int i = 0; i < size; i++)
initializer[i] = left[i] / f;
return vec<T, size>{initializer};
}
typedef vec<float, 2> vec2f;
typedef vec<float, 3> vec3f;
typedef vec<float, 4> vec4f;
typedef vec<double, 2> vec2d;
typedef vec<double, 3> vec3d;
typedef vec<double, 4> vec4d;
typedef vec<int, 2> vec2i;
typedef vec<int, 3> vec3i;
typedef vec<int, 4> vec4i;
typedef vec<long long, 2> vec2l;
typedef vec<long long, 3> vec3l;
typedef vec<long long, 4> vec4l;
typedef vec<unsigned int, 2> vec2ui;
typedef vec<unsigned int, 3> vec3ui;
typedef vec<unsigned int, 4> vec4ui;
typedef vec<unsigned long long, 2> vec2ul;
typedef vec<unsigned long long, 3> vec3ul;
typedef vec<unsigned long long, 4> vec4ul;
typedef vec2f vec2;
typedef vec3f vec3;
typedef vec4f vec4;
}
typedef vec<float, 2> vec2f;
typedef vec<float, 3> vec3f;
typedef vec<float, 4> vec4f;
typedef vec<double, 2> vec2d;
typedef vec<double, 3> vec3d;
typedef vec<double, 4> vec4d;
typedef vec<int, 2> vec2i;
typedef vec<int, 3> vec3i;
typedef vec<int, 4> vec4i;
typedef vec<long long, 2> vec2l;
typedef vec<long long, 3> vec3l;
typedef vec<long long, 4> vec4l;
typedef vec<unsigned int, 2> vec2ui;
typedef vec<unsigned int, 3> vec3ui;
typedef vec<unsigned int, 4> vec4ui;
typedef vec<unsigned long long, 2> vec2ul;
typedef vec<unsigned long long, 3> vec3ul;
typedef vec<unsigned long long, 4> vec4ul;
typedef vec2f vec2;
typedef vec3f vec3;
typedef vec4f vec4;
#endif //BLT_TESTS_VECTORS_H