From 73584ba7b7e2ec8bcf0d1c48f8e35494738337ad Mon Sep 17 00:00:00 2001 From: timmmeh Date: Wed, 30 Jan 2019 18:38:46 -0800 Subject: [PATCH 1/2] Adding default values for min and mag filter. --- tiny_gltf.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index 4ce71dd..92bb583 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -468,7 +468,9 @@ struct Sampler { Value extras; Sampler() - : wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT), + : minFilter(TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR) + magFilter(TINYGLTF_TEXTURE_FILTER_LINEAR) + wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT), wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT), wrapR(TINYGLTF_TEXTURE_WRAP_REPEAT){} bool operator==(const Sampler &) const; From 62a72c484537b5a97d5270a7152a4244915aff34 Mon Sep 17 00:00:00 2001 From: timmmeh Date: Thu, 31 Jan 2019 11:46:19 -0800 Subject: [PATCH 2/2] fix compile --- tiny_gltf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tiny_gltf.h b/tiny_gltf.h index 92bb583..7e7edb4 100644 --- a/tiny_gltf.h +++ b/tiny_gltf.h @@ -468,8 +468,8 @@ struct Sampler { Value extras; Sampler() - : minFilter(TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR) - magFilter(TINYGLTF_TEXTURE_FILTER_LINEAR) + : minFilter(TINYGLTF_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR), + magFilter(TINYGLTF_TEXTURE_FILTER_LINEAR), wrapS(TINYGLTF_TEXTURE_WRAP_REPEAT), wrapT(TINYGLTF_TEXTURE_WRAP_REPEAT), wrapR(TINYGLTF_TEXTURE_WRAP_REPEAT){}