diff --git a/examples/raytrace/gltf-loader.cc b/examples/raytrace/gltf-loader.cc index 94dc9d0..26cdb48 100644 --- a/examples/raytrace/gltf-loader.cc +++ b/examples/raytrace/gltf-loader.cc @@ -3,7 +3,6 @@ #include #define TINYGLTF_IMPLEMENTATION -#define STB_IMAGE_IMPLEMENTATION #include "tiny_gltf.h" namespace example { @@ -17,9 +16,10 @@ static std::string GetFilePathExtension(const std::string &FileName) { /// /// Loads glTF 2.0 mesh /// -bool LoadGLTF(const std::string &filename, float scale, std::vector > *meshes, std::vector *materials, std::vector *textures) -{ - +bool LoadGLTF(const std::string &filename, float scale, + std::vector > *meshes, + std::vector *materials, + std::vector *textures) { // TODO(syoyo): Implement // TODO(syoyo): Texture // TODO(syoyo): Material @@ -50,4 +50,4 @@ bool LoadGLTF(const std::string &filename, float scale, std::vector return false; } -} // namespace example +} // namespace example diff --git a/examples/raytrace/stbi-impl.cc b/examples/raytrace/stbi-impl.cc index 338afe0..0375a5a 100644 --- a/examples/raytrace/stbi-impl.cc +++ b/examples/raytrace/stbi-impl.cc @@ -1,3 +1,3 @@ #define STB_IMAGE_IMPLEMENTATION -#include "tiny_gltf.h" +#include "stb_image.h"