kidrigger
/
project-aster
1
1
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

Resolve Macro clash.

This commit is contained in:
Anish Bhobe 2024-07-26 00:34:27 +02:00
parent 6f29f580bd
commit a6423bf1a4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/03_model_render/model_loader.cpp
View File

@ -22,6 +22,12 @@
#include <EASTL/hash_map.h> #include <EASTL/hash_map.h>
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include <tiny_gltf.h>
#if defined(LoadImage)
#undef LoadImage
#endif
vec4 vec4
VectorToVec4(const std::vector<double> &vec) VectorToVec4(const std::vector<double> &vec)
{ {

5
samples/03_model_render/model_loader.h
View File

@ -11,7 +11,10 @@
#include "gpu_resource_manager.h" #include "gpu_resource_manager.h"
#include "nodes.h" #include "nodes.h"
#include <tiny_gltf.h> namespace tinygltf
{
struct Image;
}
struct TextureHandle; struct TextureHandle;
struct Texture; struct Texture;