diff --git a/include/zeus/CAABox.hpp b/include/zeus/CAABox.hpp index 79c083d..7e799d1 100644 --- a/include/zeus/CAABox.hpp +++ b/include/zeus/CAABox.hpp @@ -1,5 +1,4 @@ -#ifndef CAABOX_HPP -#define CAABOX_HPP +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/CTransform.hpp" @@ -416,4 +415,3 @@ inline bool operator!=(const CAABox& left, const CAABox& right) } } -#endif // CAABOX_HPP diff --git a/include/zeus/CAxisAngle.hpp b/include/zeus/CAxisAngle.hpp index cda208d..ef07ac0 100644 --- a/include/zeus/CAxisAngle.hpp +++ b/include/zeus/CAxisAngle.hpp @@ -1,5 +1,4 @@ -#ifndef CAXISANGLE_H -#define CAXISANGLE_H +#pragma once #include "Global.hpp" #include "zeus/CVector3f.hpp" @@ -24,4 +23,3 @@ struct alignas(16) CAxisAngle : CVector3f }; } -#endif // CAXISANGLE_H diff --git a/include/zeus/CColor.hpp b/include/zeus/CColor.hpp index c2a6103..a37c579 100644 --- a/include/zeus/CColor.hpp +++ b/include/zeus/CColor.hpp @@ -1,5 +1,4 @@ -#ifndef CCOLOR_HPP -#define CCOLOR_HPP +#pragma once #include "Global.hpp" #include "zeus/Math.hpp" @@ -428,4 +427,3 @@ static inline CColor operator/(float lhs, const CColor& rhs) #endif } } -#endif // CCOLOR_HPP diff --git a/include/zeus/CEulerAngles.hpp b/include/zeus/CEulerAngles.hpp index 6156791..8398402 100644 --- a/include/zeus/CEulerAngles.hpp +++ b/include/zeus/CEulerAngles.hpp @@ -1,5 +1,4 @@ -#ifndef CEULERANGES_HPP -#define CEULERANGES_HPP +#pragma once #include "zeus/CVector3f.hpp" @@ -17,4 +16,3 @@ public: } -#endif // CEULERANGES_HPP diff --git a/include/zeus/CFrustum.hpp b/include/zeus/CFrustum.hpp index 6d4391c..b3f4fd7 100644 --- a/include/zeus/CFrustum.hpp +++ b/include/zeus/CFrustum.hpp @@ -1,5 +1,4 @@ -#ifndef CFRUSTUM_HPP -#define CFRUSTUM_HPP +#pragma once #include "zeus/CPlane.hpp" #include "zeus/CAABox.hpp" @@ -21,4 +20,3 @@ public: bool pointFrustumTest(const CVector3f& point) const; }; } -#endif // CFRUSTUM_HPP diff --git a/include/zeus/CLine.hpp b/include/zeus/CLine.hpp index 35b863c..5cf2f93 100644 --- a/include/zeus/CLine.hpp +++ b/include/zeus/CLine.hpp @@ -1,5 +1,4 @@ -#ifndef CLINE_HPP -#define CLINE_HPP +#pragma once #include "Global.hpp" #include "zeus/CVector3f.hpp" @@ -15,4 +14,3 @@ public: }; } -#endif diff --git a/include/zeus/CLineSeg.hpp b/include/zeus/CLineSeg.hpp index 74a4723..028aa67 100644 --- a/include/zeus/CLineSeg.hpp +++ b/include/zeus/CLineSeg.hpp @@ -1,5 +1,4 @@ -#ifndef CLINESEG_HPP -#define CLINESEG_HPP +#pragma once #include "Global.hpp" #include "zeus/CVector3f.hpp" @@ -24,4 +23,3 @@ public: }; } -#endif diff --git a/include/zeus/CMRay.hpp b/include/zeus/CMRay.hpp index 9f7434a..195e1b3 100644 --- a/include/zeus/CMRay.hpp +++ b/include/zeus/CMRay.hpp @@ -1,5 +1,4 @@ -#ifndef CMRAY_HPP -#define CMRAY_HPP +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/CTransform.hpp" #include "zeus/Math.hpp" @@ -37,4 +36,3 @@ struct CMRay }; } -#endif diff --git a/include/zeus/CMatrix3f.hpp b/include/zeus/CMatrix3f.hpp index ac5096e..6913d2a 100644 --- a/include/zeus/CMatrix3f.hpp +++ b/include/zeus/CMatrix3f.hpp @@ -1,5 +1,4 @@ -#ifndef CMATRIX3F_HPP -#define CMATRIX3F_HPP +#pragma once #include "Global.hpp" #include "zeus/CVector3f.hpp" @@ -258,4 +257,3 @@ static inline CMatrix3f operator*(const CMatrix3f& lhs, const CMatrix3f& rhs) } } -#endif // CMATRIX3F_HPP diff --git a/include/zeus/CMatrix4f.hpp b/include/zeus/CMatrix4f.hpp index fe98579..83ef8bc 100644 --- a/include/zeus/CMatrix4f.hpp +++ b/include/zeus/CMatrix4f.hpp @@ -1,5 +1,4 @@ -#ifndef CMATRIX4F -#define CMATRIX4F +#pragma once #include "zeus/CMatrix3f.hpp" #include "zeus/CVector4f.hpp" #include "zeus/CVector3f.hpp" @@ -175,4 +174,3 @@ static inline CMatrix4f operator*(const CMatrix4f& lhs, const CMatrix4f& rhs) } } -#endif // CMATRIX4F diff --git a/include/zeus/COBBox.hpp b/include/zeus/COBBox.hpp index c492d99..e8de5fa 100644 --- a/include/zeus/COBBox.hpp +++ b/include/zeus/COBBox.hpp @@ -1,5 +1,4 @@ -#ifndef COBBOX_HPP -#define COBBOX_HPP +#pragma once #include "zeus/CTransform.hpp" #include "zeus/CVector3f.hpp" @@ -183,4 +182,3 @@ public: }; } -#endif diff --git a/include/zeus/CPlane.hpp b/include/zeus/CPlane.hpp index 43b55bd..2230d88 100644 --- a/include/zeus/CPlane.hpp +++ b/include/zeus/CPlane.hpp @@ -1,5 +1,4 @@ -#ifndef CPLANE_HPP -#define CPLANE_HPP +#pragma once #include "Global.hpp" #include "zeus/CVector3f.hpp" @@ -74,4 +73,3 @@ public: }; } -#endif // CPLANE_HPP diff --git a/include/zeus/CProjection.hpp b/include/zeus/CProjection.hpp index 3f2e209..e017a32 100644 --- a/include/zeus/CProjection.hpp +++ b/include/zeus/CProjection.hpp @@ -1,5 +1,4 @@ -#ifndef CPROJECTION_HPP -#define CPROJECTION_HPP +#pragma once #include "Global.hpp" #include "zeus/CMatrix4f.hpp" @@ -125,4 +124,3 @@ protected: }; } -#endif // CMATRIX3F_HPP diff --git a/include/zeus/CQuaternion.hpp b/include/zeus/CQuaternion.hpp index 4817827..dc45989 100644 --- a/include/zeus/CQuaternion.hpp +++ b/include/zeus/CQuaternion.hpp @@ -1,5 +1,4 @@ -#ifndef CQUATERNION_HPP -#define CQUATERNION_HPP +#pragma once #include "Global.hpp" #include "CAxisAngle.hpp" @@ -268,4 +267,3 @@ CQuaternion operator-(float lhs, const CQuaternion& rhs); CQuaternion operator*(float lhs, const CQuaternion& rhs); CNUQuaternion operator*(float lhs, const CNUQuaternion& rhs); } -#endif // CQUATERNION_HPP diff --git a/include/zeus/CRectangle.hpp b/include/zeus/CRectangle.hpp index d07f285..8afe170 100644 --- a/include/zeus/CRectangle.hpp +++ b/include/zeus/CRectangle.hpp @@ -1,5 +1,4 @@ -#ifndef CRECTANGLE_HPP -#define CRECTANGLE_HPP +#pragma once #include "zeus/CVector2f.hpp" namespace zeus @@ -31,4 +30,3 @@ public: }; } -#endif // CRECTANGLE_HPP diff --git a/include/zeus/CRelAngle.hpp b/include/zeus/CRelAngle.hpp index bbdb086..f6c9889 100644 --- a/include/zeus/CRelAngle.hpp +++ b/include/zeus/CRelAngle.hpp @@ -1,5 +1,4 @@ -#ifndef CRELANGLE_HPP -#define CRELANGLE_HPP +#pragma once #include "zeus/CVector3f.hpp" #include "zeus/Math.hpp" @@ -53,4 +52,3 @@ struct CRelAngle }; } -#endif // CRELANGLE_HPP diff --git a/include/zeus/CSphere.hpp b/include/zeus/CSphere.hpp index 43d9593..5229c51 100644 --- a/include/zeus/CSphere.hpp +++ b/include/zeus/CSphere.hpp @@ -1,5 +1,4 @@ -#ifndef CSPHERE_HPP -#define CSPHERE_HPP +#pragma once #include "zeus/CVector3f.hpp" @@ -25,4 +24,3 @@ public: }; } -#endif diff --git a/include/zeus/CTransform.hpp b/include/zeus/CTransform.hpp index 9b41dbb..d009f50 100644 --- a/include/zeus/CTransform.hpp +++ b/include/zeus/CTransform.hpp @@ -1,5 +1,4 @@ -#ifndef CTRANSFORM_HPP -#define CTRANSFORM_HPP +#pragma once #include "Global.hpp" #include "zeus/CMatrix3f.hpp" @@ -279,4 +278,3 @@ CTransform CTransformFromAxisAngle(const CVector3f& axis, float angle); CTransform lookAt(const CVector3f& pos, const CVector3f& lookPos, const CVector3f& up = CVector3f::skUp); } -#endif // CTRANSFORM_HPP diff --git a/include/zeus/CUnitVector.hpp b/include/zeus/CUnitVector.hpp index 35d94b7..9f07325 100644 --- a/include/zeus/CUnitVector.hpp +++ b/include/zeus/CUnitVector.hpp @@ -1,5 +1,4 @@ -#ifndef CUNITVECTOR_HPP -#define CUNITVECTOR_HPP +#pragma once #include "zeus/CVector3f.hpp" @@ -23,4 +22,3 @@ public: } }; } -#endif diff --git a/include/zeus/CVector2f.hpp b/include/zeus/CVector2f.hpp index 090b675..df32159 100644 --- a/include/zeus/CVector2f.hpp +++ b/include/zeus/CVector2f.hpp @@ -1,5 +1,4 @@ -#ifndef CVECTOR2f_HPP -#define CVECTOR2f_HPP +#pragma once #include "Global.hpp" #include "zeus/Math.hpp" @@ -429,4 +428,3 @@ static inline CVector2f operator/(float lhs, const CVector2f& rhs) } } -#endif // CVECTOR2F_HPP diff --git a/include/zeus/CVector2i.hpp b/include/zeus/CVector2i.hpp index 4280a5a..9ac1e07 100644 --- a/include/zeus/CVector2i.hpp +++ b/include/zeus/CVector2i.hpp @@ -1,5 +1,4 @@ -#ifndef CVECTOR2i_HPP -#define CVECTOR2i_HPP +#pragma once #include "Global.hpp" #include "zeus/Math.hpp" @@ -51,4 +50,3 @@ public: }; } -#endif // CVECTOR2i_HPP diff --git a/include/zeus/CVector3d.hpp b/include/zeus/CVector3d.hpp index 5f0b8d6..f1f42bb 100644 --- a/include/zeus/CVector3d.hpp +++ b/include/zeus/CVector3d.hpp @@ -1,5 +1,4 @@ -#ifndef CVECTOR3D_HPP -#define CVECTOR3D_HPP +#pragma once #include #include "Global.hpp" @@ -287,4 +286,3 @@ static inline CVector3d operator/(double lhs, const CVector3d& rhs) } } -#endif diff --git a/include/zeus/CVector3f.hpp b/include/zeus/CVector3f.hpp index 4743c54..ac4abe1 100644 --- a/include/zeus/CVector3f.hpp +++ b/include/zeus/CVector3f.hpp @@ -1,5 +1,4 @@ -#ifndef CVECTOR3F_HPP -#define CVECTOR3F_HPP +#pragma once #include "Global.hpp" #include "zeus/Math.hpp" @@ -441,4 +440,3 @@ static inline CVector3f operator/(float lhs, const CVector3f& rhs) } -#endif // CVECTOR3F_HPP diff --git a/include/zeus/CVector4f.hpp b/include/zeus/CVector4f.hpp index 91e8bc4..07ac103 100644 --- a/include/zeus/CVector4f.hpp +++ b/include/zeus/CVector4f.hpp @@ -1,5 +1,4 @@ -#ifndef CVECTOR4F_HPP -#define CVECTOR4F_HPP +#pragma once #include "Global.hpp" #include "TVectorUnion.hpp" @@ -418,4 +417,3 @@ static inline CVector4f operator/(float lhs, const CVector4f& rhs) } } -#endif // CVECTOR4F_HPP diff --git a/include/zeus/Global.hpp b/include/zeus/Global.hpp index a2c6849..98096c3 100644 --- a/include/zeus/Global.hpp +++ b/include/zeus/Global.hpp @@ -1,5 +1,4 @@ -#ifndef ZEUS_GLOBAL_HPP -#define ZEUS_GLOBAL_HPP +#pragma once #if _M_IX86_FP >= 1 || _M_X64 #define __SSE__ 1 @@ -61,4 +60,3 @@ inline int rotr(int x, int n) { return ((x >> n) | (x << (32 - n))); } inline int rotl(int x, int n) { return ((x << n) | (x >> (32 - n))); } -#endif // ZEUS_GLOBAL_HPP diff --git a/include/zeus/Math.hpp b/include/zeus/Math.hpp index 431b645..825fa6e 100644 --- a/include/zeus/Math.hpp +++ b/include/zeus/Math.hpp @@ -1,5 +1,4 @@ -#ifndef MATH_HPP -#define MATH_HPP +#pragma once #include #undef min @@ -156,4 +155,3 @@ inline bool close_enough(double a, double b, double epsilon = 0.0000099999997473 } } -#endif // MATH_HPP diff --git a/include/zeus/TVectorUnion.hpp b/include/zeus/TVectorUnion.hpp index 8f7d6f9..2db7fe8 100644 --- a/include/zeus/TVectorUnion.hpp +++ b/include/zeus/TVectorUnion.hpp @@ -1,5 +1,4 @@ -#ifndef TVECTORUNION -#define TVECTORUNION +#pragma once namespace zeus { @@ -21,4 +20,3 @@ typedef union { } TDblVectorUnion; } -#endif // TVECTORUNION diff --git a/include/zeus/zeus.hpp b/include/zeus/zeus.hpp index bb6f290..ef6841e 100644 --- a/include/zeus/zeus.hpp +++ b/include/zeus/zeus.hpp @@ -1,5 +1,4 @@ -#ifndef __MATHLIB_HPP -#define __MATHLIB_HPP +#pragma once #include "zeus/CAxisAngle.hpp" #include "zeus/CRelAngle.hpp" @@ -25,4 +24,3 @@ #include "zeus/Global.hpp" #include "zeus/Math.hpp" -#endif // __MATHLIB_HPP