Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fixed width integers for underlying enum types #172

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Use fixed width integers for underlying enum types #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fdf597
Convert enums from unsigned long to uint32_t
walbourn Oct 24, 2024
e2018e3
Update macro
walbourn Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DirectXMesh/DirectXMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ namespace DirectX
//---------------------------------------------------------------------------------
// Normals, Tangents, and Bi-Tangents Computation

enum CNORM_FLAGS : unsigned long
enum CNORM_FLAGS : uint32_t
{
CNORM_DEFAULT = 0x0,
// Default is to compute normals using weight-by-angle
Expand Down Expand Up @@ -316,7 +316,7 @@ namespace DirectX
//---------------------------------------------------------------------------------
// Mesh clean-up and validation

enum VALIDATE_FLAGS : unsigned long
enum VALIDATE_FLAGS : uint32_t
{
VALIDATE_DEFAULT = 0x0,

Expand Down Expand Up @@ -549,7 +549,7 @@ namespace DirectX
constexpr size_t MESHLET_MINIMUM_SIZE = 32u;
constexpr size_t MESHLET_MAXIMUM_SIZE = 256u;

enum MESHLET_FLAGS : unsigned long
enum MESHLET_FLAGS : uint32_t
{
MESHLET_DEFAULT = 0x0,

Expand Down
6 changes: 3 additions & 3 deletions DirectXMesh/DirectXMesh.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
//=====================================================================================
// Bitmask flags enumerator operators
//=====================================================================================
DEFINE_ENUM_FLAG_OPERATORS(CNORM_FLAGS);
DEFINE_ENUM_FLAG_OPERATORS(VALIDATE_FLAGS);
DEFINE_ENUM_FLAG_OPERATORS(MESHLET_FLAGS);
DEFINE_ENUM_FLAG_OPERATORS(CNORM_FLAGS)
DEFINE_ENUM_FLAG_OPERATORS(VALIDATE_FLAGS)
DEFINE_ENUM_FLAG_OPERATORS(MESHLET_FLAGS)


//=====================================================================================
Expand Down
2 changes: 1 addition & 1 deletion Meshconvert/Meshconvert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
hr = inMesh->ComputeNormals(flags);
if (FAILED(hr))
{
wprintf(L"\nERROR: Failed computing normals (flags:%lX, %08X%ls)\n",
wprintf(L"\nERROR: Failed computing normals (flags:%X, %08X%ls)\n",
flags, static_cast<unsigned int>(hr), GetErrorDesc(hr));
return 1;
}
Expand Down
Loading