Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-09-18 08:14:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
526 Commits 5 Branches 41 Tags
52b331b95e17dabc49a7536220594dc4f9940d44
Commit Graph

526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syoyo Fujita
52b331b95e Update README. 2019-03-07 01:05:02 +09:00
Syoyo Fujita
e981c8994b Merge pull request #150 from Ybalrid/sparse_accessor 
Sparse accessor
 2019-03-07 00:49:29 +09:00
Arthur Brainville (Ybalrid)
5cf468ce1c glview can now load static geometry modified by sparse accessor 2019-03-06 14:48:44 +00:00
Arthur Brainville (Ybalrid)
fb43948c7f Ran clang-format on tiny_gltf.h 2019-03-06 14:00:56 +00:00
Arthur Brainville (Ybalrid)
f3898ae012 clang-format + added sparse accessor in loader_example 2019-03-06 12:39:39 +00:00
Arthur Brainville (Ybalrid)
e95d35c7b2 Parse sparse accessors 2019-03-06 12:27:23 +00:00
Arthur Brainville (Ybalrid)
83f0a1e1fe Fix accessor ctor 2019-03-06 11:33:30 +00:00
Arthur Brainville (Ybalrid)
edf81ce458 added sparse structure to accessors 2019-03-06 11:30:00 +01:00
Syoyo Fujita
deff077560 Merge pull request #146 from WARP-LAB/master 
Fix for when json and stb is aready used in project
 2019-03-03 15:31:09 +09:00
kroko
640898750b rename TINYGLTF_BYPASS_INCLUDE_x to TINYGLTF_NO_INCLUDE_x 2019-03-03 08:28:49 +02:00
Syoyo Fujita
49acb85a78 Merge pull request #145 from Ybalrid/upgrade_stb_libs 
Upgrade the STB libraries, and fix #132
 2019-03-03 13:39:10 +09:00
kroko
009f7d4cbb be more precise in readme about include bypassing flags 2019-03-03 01:56:34 +02:00
kroko
12fc2afc9f Fix for when json and stb is aready used in project v2 2019-03-03 01:28:45 +02:00
kroko
3fadc0a664 Fix for when json and stb is aready used in project 2019-03-03 01:11:31 +02:00
Arthur Brainville (Ybalrid)
025305fa5d Fixed wrong metadata in case 16bit image wasn't actually loaded 
The fallback to 8 bit would have been broken.
 2019-03-02 22:03:34 +01:00
Arthur Brainville (Ybalrid)
f39a8f2cbe 16bit images are 16bit images: added Image::bits and Image::pixel_type 2019-03-02 22:00:48 +01:00
Arthur Brainville (Ybalrid)
76bf06acf5 Upgrade the STB libraries, and fix #132 2019-03-02 16:10:54 +01:00
Syoyo Fujita
e6ca627160 Merge pull request #144 from SaschaWillems/master 
Add direct access to texture coordinate set on texture parameter
 2019-02-24 14:42:51 +09:00
Sascha Willems
bd2028c74c Added function to easily access texture coordinate set index on a texture parameter 2019-02-23 21:15:45 +01:00
Syoyo Fujita
42819e746a Define WIN32_LEAN_AND_MEAN to save the number of including files. 2019-02-19 21:36:32 +09:00
Syoyo Fujita
c8d1ecb33a Define NOMINMAX to avoid defining MIN/MAX macros on Windows. Without defining NOMINMAX, MIN/MAX macro would affect other header/c++ files. Fixes #143 2019-02-19 16:03:23 +09:00
Syoyo Fujita
1c78db194d Merge pull request #142 from ebirenbaum/animation-sampler-interpolation 
Change AnimationSampler::interpolation to a non-required field.
 2019-02-15 14:04:06 +09:00
Evan Birenbaum
e027b5c2f7 Change AnimationSampler::interpolation to a non-required field. The spec states to default to LINEAR when not present. 2019-02-14 13:30:57 -08:00
Syoyo Fujita
6b07cbe1d5 Merge pull request #140 from timmmeh/master 
Adding default values for min and mag filter.
 2019-02-10 00:01:11 +09:00
Syoyo Fujita
871d8576b1 Update json.hpp to fix compilation with clang with C++17(-std=c++1z) support. 2019-02-04 16:19:13 +09:00
timmmeh
5f0a6aab29 fix compile 2019-01-31 11:46:19 -08:00
timmmeh
5a0168069c Adding default values for min and mag filter. 2019-01-30 18:38:46 -08:00
Syoyo Fujita
43ad313ad6 Merge pull request #138 from dolphineye/dolphineye/add_mode_line_strip 
Add line strip primitive mode define
 2019-01-30 23:19:30 +09:00
Thomas Tissot
6efee92d47 Add line strip primitive mode define 
This small commit adds the `TINYGLTF_MODE_LINE_STRIP` primitive mode
define whose value is set to `3` as per the GLTF 2.0 specification.
 2019-01-30 13:10:51 +01:00
Syoyo Fujita
175ca1ae6d Merge pull request #137 from Ybalrid/pr_fix_glview_no_scene_no_nodes 
Fix glView in case there is no default scene
 2019-01-28 13:00:26 +09:00
Arthur Brainville (Ybalrid)
c35996cf7e handle not having default scene 2019-01-27 20:52:04 +00:00
Arthur Brainville (Ybalrid)
24840cdbed fix glview in case gltf asset doesn't have a default scene 2019-01-27 20:52:04 +00:00
Syoyo Fujita
5f99409f74 Add TINYGLTF_ENABLE_DRACO flag to README. v2.1.0 2019-01-27 00:43:02 +09:00
Syoyo Fujita
3f4a7798ab Add support for building glview with draco. 
Fix out-of-bounds access when calling DrawMesh().
Fix potential out-of-bounds access when filling window title string.
 2019-01-27 00:38:34 +09:00
Syoyo Fujita
60ddc77512 Merge pull request #136 from abwood/draco 
Fixed decoding bugs in draco
 2019-01-26 23:22:55 +09:00
Alexander Wood
fe11dc418d Updates to draco decoding: 
- When injecting draco decoded meshes into accessor data, update count to match the optimized and decoded draco mesh
 - accessor.componentType is now used for extraction of decoded draco meshes.

Fixes #135
 2019-01-26 08:58:45 -05:00
Syoyo Fujita
6d75dcd067 Merge pull request #134 from abwood/draco 
Initial support for draco mesh compression
 2019-01-25 16:45:33 +09:00
Alex Wood
eb07083296 Looks like I'm colliding with work by syoyo. Only difference so far appears to be our macro name. 2019-01-24 15:45:16 -05:00
Alex Wood
5fd4d4d662 Merge branch 'draco' of https://github.com/abwood/tinygltf into draco 2019-01-24 15:40:28 -05:00
Alex Wood
07a015d6a2 Initial support for draco mesh compression. In this PR, we establish that draco is a dependency built external to tinygltf, which breaks from the current tradition of header only dependencies. For that reason, this feature is hidden behind a #define TINYGLTF_ENABLE_DRACO and requires developers to explicitly opt-in for draco support. 
In this change, tinygltf any primitive using draco compression will:
If indices are specified
1) Decode the index buffer using draco, creating a new buffer and bufferview, adding to Model::bufferViews and Model::buffer collections
2) Update the primitive's accessor id to reference this new decoded bufferview.
For each attribute semantic specified by the draco extension
1) Decode the vertex buffer using draco, creating a new buffer and bufferview, adding to Model::bufferViews and Model::buffer collections
2) Update the primitive's accessor id to reference this new decoded bufferview.
 2019-01-24 15:38:16 -05:00
Syoyo Fujita
446b3147e0 Begin supporting draco. 2019-01-19 03:03:22 +09:00
Syoyo Fujita
e8ed267553 Support macOS + OpenGL 3.3+ GPU 2019-01-14 22:11:11 +09:00
Syoyo Fujita
1ed7c4a2bf Convert UTF16 file to UTF8. 
Add premake project to build on Linux.
 2019-01-14 21:30:53 +09:00
Syoyo Fujita
207b7b3ebd Show more expressive messages when parsing image. 2019-01-06 18:55:57 +09:00
Syoyo Fujita
4aff57eff8 Merge pull request #129 from SaschaWillems/master 
Added new compiler option for loading all gltf related files from android app asset package
 2018-12-29 12:33:34 +09:00
Sascha Willems
5278dfff58 Added new feature for loading all gltf related files (including textures, binaries, etc.) from assets packaged with an Android app 2018-12-28 20:53:41 +01:00
Syoyo Fujita
635190d907 Merge pull request #127 from nyue/master 
Renamed glTFConfig to TinyGLTFConfig
 2018-12-28 14:31:33 +09:00
Tan Meng Yue
d6676a8ead Renamed glTFConfig to TinyGLTFConfig 
This renaming is done so that the config file matches
the project name which is TinyGLTF. This is done to prevent
future name collision should the Khronos glTF project decides
to provide their own CMake configuration file.
 2018-12-27 10:24:13 +11:00
Syoyo Fujita
545e36a8c2 Merge pull request #125 from nyue/master 
Fix bug in handling OS X build via CMake
 2018-12-25 15:06:37 +09:00
Tan Meng Yue
0278628a59 Fix bug in handling OS X build via CMake 
The OS macros needs to be upper case for the
if statement to work as expected
 2018-12-25 17:03:58 +11:00