File tree Expand file tree Collapse file tree 6 files changed +11
-11
lines changed
Expand file tree Collapse file tree 6 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -37,6 +37,6 @@ struct Movement {
3737 sourcepp::math::Vec3f movement;
3838 sourcepp::math::Vec3f relativePosition;
3939};
40- SOURCEPP_BITWISE_ENUM (Movement::Flags)
40+ SOURCEPP_BITFLAGS_ENUM (Movement::Flags)
4141
4242} // namespace mdlpp
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ struct Bone {
4444
4545 // int32_t _unused0[8];
4646};
47- SOURCEPP_BITWISE_ENUM (Bone::Flags)
47+ SOURCEPP_BITFLAGS_ENUM (Bone::Flags)
4848
4949struct BoneController {
5050 int32_t bone;
@@ -200,7 +200,7 @@ struct Material {
200200 // int32_t used; // No idea what this is
201201 // int32_t _unused0[13];
202202};
203- SOURCEPP_BITWISE_ENUM (Material::Flags)
203+ SOURCEPP_BITFLAGS_ENUM (Material::Flags)
204204
205205struct Mesh {
206206 int32_t material;
@@ -414,6 +414,6 @@ struct MDL {
414414
415415 // int32_t _unused3;
416416};
417- SOURCEPP_BITWISE_ENUM (MDL::Flags)
417+ SOURCEPP_BITFLAGS_ENUM (MDL::Flags)
418418
419419} // namespace mdlpp::MDL
Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ struct Strip {
4141 // int32_t numTopologyIndices;
4242 // int32_t topologyOffset;
4343};
44- SOURCEPP_BITWISE_ENUM (Strip::Flags)
44+ SOURCEPP_BITFLAGS_ENUM (Strip::Flags)
4545
4646struct StripGroup {
4747 enum Flags : uint8_t {
@@ -70,7 +70,7 @@ struct StripGroup {
7070 // int32_t numTopologyIndices;
7171 // int32_t topologyOffset;
7272};
73- SOURCEPP_BITWISE_ENUM (StripGroup::Flags)
73+ SOURCEPP_BITFLAGS_ENUM (StripGroup::Flags)
7474
7575struct Mesh {
7676 enum Flags : uint8_t {
@@ -85,7 +85,7 @@ struct Mesh {
8585
8686 Flags flags;
8787};
88- SOURCEPP_BITWISE_ENUM (Mesh::Flags)
88+ SOURCEPP_BITFLAGS_ENUM (Mesh::Flags)
8989
9090struct ModelLOD {
9191 // int32_t meshCount;
Original file line number Diff line number Diff line change 1010#define SOURCEPP_UNIQUE_NAME (base ) SOURCEPP_CONCAT(base, __LINE__)
1111
1212// / Defines bitwise operators for an enum or enum class
13- #define SOURCEPP_BITWISE_ENUM (Enum ) \
13+ #define SOURCEPP_BITFLAGS_ENUM (Enum ) \
1414 inline constexpr Enum operator |(Enum lhs, Enum rhs) { \
1515 return static_cast <Enum>( \
1616 static_cast <std::underlying_type_t <Enum>>(lhs) | \
Original file line number Diff line number Diff line change @@ -12,6 +12,6 @@ enum class Attribute {
1212 PCK_MD5 = 1 << 3 ,
1313 VPK_PRELOADED_DATA = 1 << 4 ,
1414};
15- SOURCEPP_BITWISE_ENUM (Attribute)
15+ SOURCEPP_BITFLAGS_ENUM (Attribute)
1616
1717} // namespace vpkpp
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ struct Resource {
7575 return std::get<std::span<uint32_t >>(this ->convertData ())[((mipCount - 1 - mip) * frameCount * faceCount + frame * faceCount + face) + 2 ];
7676 }
7777};
78- SOURCEPP_BITWISE_ENUM (Resource::Flags)
78+ SOURCEPP_BITFLAGS_ENUM (Resource::Flags)
7979
8080class VTF {
8181public:
@@ -222,6 +222,6 @@ class VTF {
222222 // False for v7.5 and lower (not actually a field in the header, just simplifies the check)
223223 bool hasAuxCompression = false ;
224224};
225- SOURCEPP_BITWISE_ENUM (VTF::Flags)
225+ SOURCEPP_BITFLAGS_ENUM (VTF::Flags)
226226
227227} // namespace vtfpp
You can’t perform that action at this time.
0 commit comments