feat: apply bitflags enum macro to all bitflags enums

Author: craftablescience

include/mdlpp/structs/Generic.h

@@ -3,6 +3,7 @@
 #include <string>
 
 #include <sourcepp/math/Vector.h>
+#include <sourcepp/Macros.h>
 
 namespace mdlpp {
 
@@ -36,5 +37,6 @@ struct Movement {
 	sourcepp::math::Vec3f movement;
 	sourcepp::math::Vec3f relativePosition;
 };
+SOURCEPP_BITWISE_ENUM(Movement::Flags)
 
 } // namespace mdlpp

include/mdlpp/structs/MDL.h

@@ -44,6 +44,7 @@ struct Bone {
 
 	//int32_t _unused0[8];
 };
+SOURCEPP_BITWISE_ENUM(Bone::Flags)
 
 struct BoneController {
 	int32_t bone;
@@ -111,6 +112,7 @@ struct AnimDesc {
 	//int32_t zeroFrameIndex;
 	//float zeroFrameStallTime;
 };
+SOURCEPP_BITWISE_ENUM(AnimDesc::Flags)
 
 struct SequenceDesc {
 	enum Flags : int32_t {
@@ -181,6 +183,7 @@ struct SequenceDesc {
 
 	//int32_t _unused0[7];
 };
+SOURCEPP_BITWISE_ENUM(SequenceDesc::Flags)
 */
 
 struct Material {
@@ -197,6 +200,7 @@ struct Material {
 	//int32_t used; // No idea what this is
 	//int32_t _unused0[13];
 };
+SOURCEPP_BITWISE_ENUM(Material::Flags)
 
 struct Mesh {
 	int32_t material;
@@ -410,5 +414,6 @@ struct MDL {
 
 	//int32_t _unused3;
 };
+SOURCEPP_BITWISE_ENUM(MDL::Flags)
 
 } // namespace mdlpp::MDL

include/mdlpp/structs/VTX.h

@@ -41,6 +41,7 @@ struct Strip {
 	//int32_t numTopologyIndices;
 	//int32_t topologyOffset;
 };
+SOURCEPP_BITWISE_ENUM(Strip::Flags)
 
 struct StripGroup {
 	enum Flags : uint8_t {
@@ -69,6 +70,7 @@ struct StripGroup {
 	//int32_t numTopologyIndices;
 	//int32_t topologyOffset;
 };
+SOURCEPP_BITWISE_ENUM(StripGroup::Flags)
 
 struct Mesh {
 	enum Flags : uint8_t {
@@ -83,6 +85,7 @@ struct Mesh {
 
 	Flags flags;
 };
+SOURCEPP_BITWISE_ENUM(Mesh::Flags)
 
 struct ModelLOD {
 	//int32_t meshCount;

include/sourcepp/BitwiseEnumClass.h

@@ -1,7 +1,47 @@
 #pragma once
 
+#include <type_traits>
+
+// Helpers
 #define SOURCEPP_CONCAT_INNER(a, b) a##b
 #define SOURCEPP_CONCAT(a, b) SOURCEPP_CONCAT_INNER(a, b)
 
 /// Adds the current line number to the given base
 #define SOURCEPP_UNIQUE_NAME(base) SOURCEPP_CONCAT(base, __LINE__)
+
+/// Defines bitwise operators for an enum or enum class
+#define SOURCEPP_BITWISE_ENUM(Enum)                                 \
+    inline constexpr Enum operator|(Enum lhs, Enum rhs) {           \
+        return static_cast<Enum>(                                   \
+            static_cast<std::underlying_type_t<Enum>>(lhs) |        \
+            static_cast<std::underlying_type_t<Enum>>(rhs));        \
+    }                                                               \
+    inline constexpr Enum operator&(Enum lhs, Enum rhs) {           \
+        return static_cast<Enum>(                                   \
+            static_cast<std::underlying_type_t<Enum>>(lhs) &        \
+            static_cast<std::underlying_type_t<Enum>>(rhs));        \
+    }                                                               \
+    inline constexpr Enum operator^(Enum lhs, Enum rhs) {           \
+        return static_cast<Enum>(                                   \
+            static_cast<std::underlying_type_t<Enum>>(lhs) ^        \
+            static_cast<std::underlying_type_t<Enum>>(rhs));        \
+    }                                                               \
+    inline constexpr Enum operator~(Enum e) {                       \
+        return static_cast<Enum>(                                   \
+            ~static_cast<std::underlying_type_t<Enum>>(e));         \
+    }                                                               \
+    inline Enum& operator|=(Enum& lhs, Enum rhs) {                  \
+        return lhs = static_cast<Enum>(                             \
+                   static_cast<std::underlying_type_t<Enum>>(lhs) | \
+                   static_cast<std::underlying_type_t<Enum>>(rhs)); \
+    }                                                               \
+    inline Enum& operator&=(Enum& lhs, Enum rhs) {                  \
+        return lhs = static_cast<Enum>(                             \
+                   static_cast<std::underlying_type_t<Enum>>(lhs) & \
+                   static_cast<std::underlying_type_t<Enum>>(rhs)); \
+    }                                                               \
+    inline Enum& operator^=(Enum& lhs, Enum rhs) {                  \
+        return lhs = static_cast<Enum>(                             \
+                   static_cast<std::underlying_type_t<Enum>>(lhs) ^ \
+                   static_cast<std::underlying_type_t<Enum>>(rhs)); \
+    }

include/sourcepp/Macros.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <sourcepp/BitwiseEnumClass.h>
+#include <sourcepp/Macros.h>
 
 namespace vpkpp {
 
@@ -12,6 +12,6 @@ enum class Attribute {
 	PCK_MD5            = 1 << 3,
 	VPK_PRELOADED_DATA = 1 << 4,
 };
-SOURCEPP_SETUP_BITWISE_ENUM_CLASS(Attribute)
+SOURCEPP_BITWISE_ENUM(Attribute)
 
 } // namespace vpkpp

include/vpkpp/Attribute.h

@@ -12,6 +12,7 @@
 
 #include <sourcepp/math/Vector.h>
 #include <sourcepp/parser/Binary.h>
+#include <sourcepp/Macros.h>
 
 #include "ImageFormats.h"
 
@@ -74,6 +75,7 @@ struct Resource {
 		return std::get<std::span<uint32_t>>(this->convertData())[((mipCount - 1 - mip) * frameCount * faceCount + frame * faceCount + face) + 2];
 	}
 };
+SOURCEPP_BITWISE_ENUM(Resource::Flags)
 
 class VTF {
 public:
@@ -220,5 +222,6 @@ class VTF {
 	// False for v7.5 and lower (not actually a field in the header, just simplifies the check)
 	bool hasAuxCompression = false;
 };
+SOURCEPP_BITWISE_ENUM(VTF::Flags)
 
 } // namespace vtfpp

include/vtfpp/vtfpp.h

@@ -11,7 +11,6 @@ list(APPEND ${PROJECT_NAME}_HEADERS
         "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/math/Vector.h"
         "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/parser/Binary.h"
         "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/parser/Text.h"
-        "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/BitwiseEnumClass.h"
         "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/FS.h"
         "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/Macros.h"
         "${CMAKE_CURRENT_SOURCE_DIR}/include/sourcepp/String.h")