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

Merge branch 'patch-1' of https://github.com/cemdervis/tinygltf into cemdervis-patch-1

Browse Source
This commit is contained in:
Syoyo Fujita 2017-12-10 00:39:52 +09:00
commit 87a76e1679
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loader_example.cc
View File

@ -135,7 +135,7 @@ static std::string PrintParameterType(int ty) {
#endif #endif
static std::string PrintWrapMode(int mode) { static std::string PrintWrapMode(int mode) {
if (mode == TINYGLTF_TEXTURE_WRAP_RPEAT) { if (mode == TINYGLTF_TEXTURE_WRAP_REPEAT) {
return "REPEAT"; return "REPEAT";
} else if (mode == TINYGLTF_TEXTURE_WRAP_CLAMP_TO_EDGE) { } else if (mode == TINYGLTF_TEXTURE_WRAP_CLAMP_TO_EDGE) {
return "CLAMP_TO_EDGE"; return "CLAMP_TO_EDGE";

10
tiny_gltf.h
View File

@ -68,7 +68,7 @@ namespace tinygltf {
#define TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR (9986) #define TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR (9986)
#define TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR (9987) #define TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR (9987)
#define TINYGLTF_TEXTURE_WRAP_RPEAT (10497) #define TINYGLTF_TEXTURE_WRAP_REPEAT (10497)
#define TINYGLTF_TEXTURE_WRAP_CLAMP_TO_EDGE (33071) #define TINYGLTF_TEXTURE_WRAP_CLAMP_TO_EDGE (33071)
#define TINYGLTF_TEXTURE_WRAP_MIRRORED_REPEAT (33648) #define TINYGLTF_TEXTURE_WRAP_MIRRORED_REPEAT (33648)
@ -341,8 +341,8 @@ struct Sampler {
Value extras; Value extras;
Sampler() Sampler()
: wrapS(TINYGLTF_TEXTURE_WRAP_RPEAT), : wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT),
wrapT(TINYGLTF_TEXTURE_WRAP_RPEAT) {} wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT) {}
}; };
struct Image { struct Image {
@ -2135,8 +2135,8 @@ static bool ParseSampler(Sampler *sampler, std::string *err,
double minFilter = double minFilter =
static_cast<double>(TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR); static_cast<double>(TINYGLTF_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR);
double magFilter = static_cast<double>(TINYGLTF_TEXTURE_FILTER_LINEAR); double magFilter = static_cast<double>(TINYGLTF_TEXTURE_FILTER_LINEAR);
double wrapS = static_cast<double>(TINYGLTF_TEXTURE_WRAP_RPEAT); double wrapS = static_cast<double>(TINYGLTF_TEXTURE_WRAP_REPEAT);
double wrapT = static_cast<double>(TINYGLTF_TEXTURE_WRAP_RPEAT); double wrapT = static_cast<double>(TINYGLTF_TEXTURE_WRAP_REPEAT);
ParseNumberProperty(&minFilter, err, o, "minFilter", false); ParseNumberProperty(&minFilter, err, o, "minFilter", false);
ParseNumberProperty(&magFilter, err, o, "magFilter", false); ParseNumberProperty(&magFilter, err, o, "magFilter", false);
ParseNumberProperty(&wrapS, err, o, "wrapS", false); ParseNumberProperty(&wrapS, err, o, "wrapS", false);