Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-09-03 17:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
601 Commits 5 Branches 41 Tags
a67e3142b67dac2c7323e54284d6f99cbb2b3bca
Commit Graph

601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selmar Kok
a67e3142b6 [emissiveFactor] fix inconsistency with baseColorFactor where default values were set only for baseColorFactor and not emissiveFactor 2019-08-19 11:05:28 +02:00
Syoyo Fujita
d4911dba7a Merge pull request #191 from Selmar/animation_extension_properties 
Animation extension properties
 2019-08-17 01:09:34 +09:00
Selmar Kok
360fcceffd Merge branch 'master' of github.com:syoyo/tinygltf into animation_extension_properties 2019-08-16 17:54:14 +02:00
Syoyo Fujita
8413d4dcb2 Merge pull request #190 from ux3d/feature/parse-node-weights 
parse/serialize node weights
 2019-08-16 22:21:48 +09:00
Benjamin Schmithüsen
fca385532d serialize node weights 2019-08-16 14:24:26 +02:00
Benjamin Schmithüsen
7cfd83cad0 parse node weights 2019-08-16 14:19:27 +02:00
Selmar Kok
acdac036b6 Merge branch 'master' of github.com:syoyo/tinygltf 2019-08-16 14:08:31 +02:00
Selmar Kok
4e73f75e58 add extension property for Animation and AnimationChannel 2019-08-16 14:08:08 +02:00
Syoyo Fujita
8bbec46809 Set default value of minFilter and magFilter in Sampler to -1(unset), since glTF 2.0 spec does not declare default values for it. 
Fixes #186
 2019-08-16 13:11:30 +09:00
Syoyo Fujita
165e0f6efe Fix inequality of texture index check when serializing texture of material. 
Texture info was written even if it have invalid index(-1). Fixes #189
 2019-08-15 12:25:50 +09:00
Syoyo Fujita
11a0e6c2f0 Merge pull request #188 from ux3d/fix/alphaMode 
Fixed saving of alphaMode if not OPAQUE
 2019-08-14 21:40:07 +09:00
Patrick Härtl
d7cc2d88ad Fixed saving of alphaMode if not OPAQUE 
Removed duplicated code for alphaCutoff
 2019-08-14 14:14:07 +02:00
Syoyo Fujita
1fb50ed9ec Merge pull request #185 from DerouineauNicolas/endif 
remove extra #endif in examples/basic app
 2019-08-14 03:09:53 +09:00
nicolasDEROUINEAU
8ed23ea55f remove extra #endif in examples/basic app 2019-08-13 15:08:01 +02:00
Syoyo Fujita
b909fd7093 Merge pull request #182 from ux3d/textureinfo 
[TextureInfo] fix default value checks for serialization
 2019-07-26 01:29:23 +09:00
Benjamin Schmithüsen
c529f89dfc fix default value checks for serialization 2019-07-25 16:07:27 +02:00
Syoyo Fujita
271eea8b55 Change the behavior of NUMBER value in Value class. NUMBER now reprents the value is either int or real(floating point). 2019-07-25 19:22:44 +09:00
Syoyo Fujita
dee354ca13 Update README. Add note on tinygltf::Value for extensions. 2019-07-24 19:55:04 +09:00
Syoyo Fujita
b0fd588748 Now material is parsed as a struct with explicit parameter definitions. 
Implement Material struct serialization.
 2019-07-24 19:26:48 +09:00
Syoyo Fujita
2553ec9719 Introduce TextureInfo class(W.I.P.) 2019-07-23 22:37:06 +09:00
Syoyo Fujita
d24b40d6f0 Merge pull request #180 from ux3d/master 
Explicitly use the correct constructor for empty object
 2019-07-23 18:55:34 +09:00
Syoyo Fujita
fd606a4bf5 Merge pull request #178 from rapidimages/feature/write-to-streams 
Serialize to stream
 2019-07-17 18:53:35 +09:00
Johan Bowald
f841314b72 clang format 2019-07-17 09:06:45 +02:00
Benjamin Schmithüsen
6c0a0c12be call json constructor explicitly 2019-07-16 17:07:45 +02:00
Johan Bowald
bcc77d9517 can write to streams 2019-07-16 15:56:18 +02:00
Benjamin Schmithüsen
a7880a56a5 Merge pull request #2 from syoyo/master 
update from original repository
 2019-07-15 15:13:50 +02:00
Syoyo Fujita
af77f1d253 Merge pull request #176 from ux3d/feature/update-lights 
Feature: update lights
 2019-07-10 21:20:12 +09:00
Benjamin Schmithüsen
afda04abb0 serialize lights 2019-07-09 17:59:20 +02:00
Benjamin Schmithüsen
aafed18dfa fix spot light parsingg 2019-07-09 16:55:55 +02:00
Benjamin Schmithüsen
e855ffe54c parse additional light properties and fix defaults 2019-07-09 16:32:42 +02:00
Benjamin Schmithüsen
4fc1492167 update lights to follow the KHR_lights_punctual extension 2019-07-08 18:04:24 +02:00
Benjamin Schmithüsen
b5cf37f55f Merge pull request #1 from syoyo/master 
update fork
 2019-07-08 17:40:20 +02:00
Syoyo Fujita
97fc03fb12 Merge pull request #174 from Ybalrid/pr_material_param_tex_info 
Add Parameter::TextureStrength(). Precise default values.
 2019-07-05 14:11:15 +09:00
Arthur Brianville (Ybalrid)
df4bd305f9 Applied clang-format 2019-07-05 00:30:47 +02:00
Arthur Brainville
ec2dc59665 Add Paramter::TextureStrength(). Precise default values. 
The default values on these methods as been set to what is described [here](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0?ts=4#normaltextureinfo) and [here](https://github.com/KhronosGroup/glTF/tree/master/specification/2.0?ts=4#occlusiontextureinfo).

This is to keep consistent with the API behavior from #144
 2019-07-05 00:30:20 +02:00
Syoyo Fujita
04e2719e85 Merge pull request #173 from christophe-f8/master 
Adding texture scale reading + asset copyright and texture names to the export
 2019-07-04 15:39:22 +09:00
Christophe
7ea9e44323 Adding texture scale reading (for normal maps) + asset copyright and texture names to the export 2019-07-04 15:21:21 +09:00
Syoyo Fujita
cf51a5de62 Explicitly define copy constructor and copy assignment operator for Model an Node. 2019-06-29 17:31:13 +09:00
Syoyo Fujita
e1d8ed726d Merge pull request #171 from Ybalrid/fix_double_parse_material_name 
Material names are stored once in material.name, then duplicated in "additionalValues"
 2019-06-24 14:06:55 +09:00
Arthur Brainville (Ybalrid)
3d3abb4d2c Material names are stored once in material.name, then duplicated in "additionalValues" 
This patch prevent this duplication
 2019-06-23 21:50:10 +02:00
Syoyo Fujita
53c0ce3568 Merge pull request #170 from Ybalrid/msvc_warn_fix 
Fix C4267 warning (size_t -> int) convertion
 2019-06-15 15:58:03 +09:00
Arthur Brainville (Ybalrid)
62235695d0 Fix C4267 warning (size_t -> int) convertion 2019-06-15 07:32:38 +02:00
Syoyo Fujita
ec5f0a3653 Merge pull request #169 from Ybalrid/remove_mesh_targets 
Remove Mesh::targets, as targets only exists inside `Primitive`
 2019-05-26 16:23:46 +09:00
Arthur Brianville (Ybalrid)
d53dba0ae1 Remove Mesh::targets, as targets only exists inside Primitive 2019-05-25 22:30:55 +02:00
Syoyo Fujita
1cc4353ed8 Merge branch 'master' of github.com:syoyo/tinygltf 2019-05-16 16:55:09 +09:00
Syoyo Fujita
33629293f9 Remove CATMULLROMSPLINE, which was removed in the final glTF 2.0 spec. 2019-05-16 16:54:28 +09:00
Syoyo Fujita
d7566f59ae Merge pull request #164 from DiligentGraphics/master 
Updated readme: added link to Diligent Engine
 2019-05-09 12:47:24 +09:00
DiligentGraphics
4f19fb156e Updated readme: added link to Diligent Engine 2019-05-08 18:33:26 -07:00
Syoyo Fujita
4e832b7872 Merge pull request #162 from ux3d/master 
add REQUIRE_VERSION to gltf validation and use it as default instead of REQUIRE_ALL
 2019-05-03 15:08:36 +09:00
Syoyo Fujita
8edf30416d Merge pull request #163 from jwmcglynn/fix-test-gltfs-standalone 
Add "asset" section to BoundsChecking test models
 2019-05-03 15:06:38 +09:00