Resolve Macro clash.

2024-07-26 00:34:27 +02:00 · 2024-07-26 00:34:27 +02:00 · a6423bf1a4
parent 6f29f580bd
commit a6423bf1a4
2 changed files with 10 additions and 1 deletions
--- a/samples/03_model_render/model_loader.cpp
+++ b/samples/03_model_render/model_loader.cpp
@ -22,6 +22,12 @@
 #include <EASTL/hash_map.h>
 #include <glm/gtc/type_ptr.hpp>

+#include <tiny_gltf.h>
+
+#if defined(LoadImage)
+#undef LoadImage
+#endif
+
 vec4
 VectorToVec4(const std::vector<double> &vec)
 {
--- a/samples/03_model_render/model_loader.h
+++ b/samples/03_model_render/model_loader.h
@ -11,7 +11,10 @@
 #include "gpu_resource_manager.h"
 #include "nodes.h"

-#include <tiny_gltf.h>
+namespace tinygltf
+{
+struct Image;
+}

 struct TextureHandle;
 struct Texture;