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

Apply cpplint and format source code.

Browse Source
This commit is contained in:
Syoyo Fujita 2016-03-17 21:31:13 +09:00
parent 41426b6134
commit e1bef8cacb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tiny_gltf_loader.h
View File

@ -244,8 +244,8 @@ class TinyGLTFLoader {
#include <cassert> #include <cassert>
#include <algorithm> #include <algorithm>
#include "picojson.h" #include "./picojson.h"
#include "stb_image.h" #include "./stb_image.h"
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <Windows.h>
@ -253,9 +253,7 @@ class TinyGLTFLoader {
#include <wordexp.h> #include <wordexp.h>
#endif #endif
using namespace tinygltf; namespace tinygltf {
namespace {
bool FileExists(const std::string &abs_filename) { bool FileExists(const std::string &abs_filename) {
bool ret; bool ret;
@ -1060,8 +1058,6 @@ bool ParseMaterial(Material &material, std::string &err,
return true; return true;
} }
} // namespace
bool TinyGLTFLoader::LoadFromString(Scene &scene, std::string &err, bool TinyGLTFLoader::LoadFromString(Scene &scene, std::string &err,
const char *str, unsigned int length, const char *str, unsigned int length,
const std::string &baseDir) { const std::string &baseDir) {
@ -1316,6 +1312,8 @@ bool TinyGLTFLoader::LoadFromFile(Scene &scene, std::string &err,
return ret; return ret;
} }
} // namespace tinygltf
#endif // TINYGLTF_LOADER_IMPLEMENTATION #endif // TINYGLTF_LOADER_IMPLEMENTATION
#endif // TINY_GLTF_LOADER_H_ #endif // TINY_GLTF_LOADER_H_