sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Fix NazaraAssert in release mode

This commit is contained in:
SirLynix 2023-11-02 15:49:51 +01:00
parent 4b8a475bbd
commit 4749e6ec80
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/Showcase/main.cpp
View File

@ -121,7 +121,7 @@ int main(int argc, char* argv[])
std::shared_ptr<Nz::Mesh> bobMesh = fs.Load<Nz::Mesh>("assets/character/Gangnam Style.fbx", meshParams); std::shared_ptr<Nz::Mesh> bobMesh = fs.Load<Nz::Mesh>("assets/character/Gangnam Style.fbx", meshParams);
if (!bobMesh) if (!bobMesh)
{ {
NazaraError("Failed to load bob mesh"); NazaraError("failed to load bob mesh");
return __LINE__; return __LINE__;
} }
@ -134,7 +134,7 @@ int main(int argc, char* argv[])
std::shared_ptr<Nz::Animation> bobAnim = fs.Load<Nz::Animation>("assets/character/Gangnam Style.fbx", animParam); std::shared_ptr<Nz::Animation> bobAnim = fs.Load<Nz::Animation>("assets/character/Gangnam Style.fbx", animParam);
if (!bobAnim) if (!bobAnim)
{ {
NazaraError("Failed to load bob anim"); NazaraError("failed to load bob anim");
return __LINE__; return __LINE__;
} }

1
include/Nazara/Core/Error.hpp
View File

@ -17,6 +17,7 @@
#define NazaraAssert(a, err) if NAZARA_UNLIKELY(!(a)) Nz::Error::Trigger(Nz::ErrorType::AssertFailed, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION, err) #define NazaraAssert(a, err) if NAZARA_UNLIKELY(!(a)) Nz::Error::Trigger(Nz::ErrorType::AssertFailed, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION, err)
#define NazaraAssertFmt(a, fmt, ...) if NAZARA_UNLIKELY(!(a)) Nz::Error::Trigger(Nz::ErrorType::AssertFailed, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION, Nz::Format(NAZARA_FORMAT(fmt), __VA_ARGS__)) #define NazaraAssertFmt(a, fmt, ...) if NAZARA_UNLIKELY(!(a)) Nz::Error::Trigger(Nz::ErrorType::AssertFailed, __LINE__, __FILE__, NAZARA_PRETTY_FUNCTION, Nz::Format(NAZARA_FORMAT(fmt), __VA_ARGS__))
#else #else
#define NazaraAssert(a, err) for (;;) break
#define NazaraAssertFmt(a, fmt, ...) for (;;) break #define NazaraAssertFmt(a, fmt, ...) for (;;) break
#endif #endif