GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-06-04 11:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix where stb image is actually implemented

Browse Source 
Signed-off-by: Arthur Brainville (Ybalrid) <ybalrid@ybalrid.info>
This commit is contained in:
Arthur Brainville 2018-02-19 01:27:42 +01:00 committed by Arthur Brainville (Ybalrid)
parent 1340e62848
commit 088aa0210f
No known key found for this signature in database
GPG Key ID: BC05C4812A06BCF3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/raytrace/gltf-loader.cc
View File

@ -3,7 +3,6 @@
#include <iostream> #include <iostream>
#define TINYGLTF_IMPLEMENTATION #define TINYGLTF_IMPLEMENTATION
#define STB_IMAGE_IMPLEMENTATION
#include "tiny_gltf.h" #include "tiny_gltf.h"
namespace example { namespace example {
@ -17,9 +16,10 @@ static std::string GetFilePathExtension(const std::string &FileName) {
/// ///
/// Loads glTF 2.0 mesh /// Loads glTF 2.0 mesh
/// ///
bool LoadGLTF(const std::string &filename, float scale, std::vector<Mesh<float> > *meshes, std::vector<Material> *materials, std::vector<Texture> *textures) bool LoadGLTF(const std::string &filename, float scale,
{ std::vector<Mesh<float> > *meshes,
std::vector<Material> *materials,
std::vector<Texture> *textures) {
// TODO(syoyo): Implement // TODO(syoyo): Implement
// TODO(syoyo): Texture // TODO(syoyo): Texture
// TODO(syoyo): Material // TODO(syoyo): Material
@ -50,4 +50,4 @@ bool LoadGLTF(const std::string &filename, float scale, std::vector<Mesh<float>
return false; return false;
} }
} // namespace example } // namespace example

2
examples/raytrace/stbi-impl.cc
View File

@ -1,3 +1,3 @@
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#include "tiny_gltf.h" #include "stb_image.h"