GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-07-07 06:21:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
965 Commits 46 Branches 37 Tags
Commit Graph

965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kroko
6a0d4c57b1 Fix for when json and stb is aready used in project v2 2019-03-03 01:28:45 +02:00
kroko
f4b6d11abc Fix for when json and stb is aready used in project 2019-03-03 01:11:31 +02:00
Arthur Brainville (Ybalrid)
5a4c898912 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)
f2addc0e44 16bit images are 16bit images: added Image::bits and Image::pixel_type 2019-03-02 22:00:48 +01:00
Arthur Brainville (Ybalrid)
70d16a7b92 Upgrade the STB libraries, and fix #132 2019-03-02 16:10:54 +01:00
Syoyo Fujita
326d7ea310
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
eb011068c0 Added function to easily access texture coordinate set index on a texture parameter 2019-02-23 21:15:45 +01:00
Syoyo Fujita
87be0ce34b Define WIN32_LEAN_AND_MEAN to save the number of including files. 2019-02-19 21:36:32 +09:00
Syoyo Fujita
7d9a0bda3a 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
7ece5c8275
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
6bdffedcbe 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
d2fb7dc2af
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
c0d0251e2c Update json.hpp to fix compilation with clang with C++17(-std=c++1z) support. 2019-02-04 16:19:13 +09:00
timmmeh
62a72c4845 fix compile 2019-01-31 11:46:19 -08:00
timmmeh
73584ba7b7 Adding default values for min and mag filter. 2019-01-30 18:38:46 -08:00
Syoyo Fujita
ead876fce9
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
6c4a006496 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
281af41b6c
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)
215e1fae61 handle not having default scene 2019-01-27 20:52:04 +00:00
Arthur Brainville (Ybalrid)
cba75b9927 fix glview in case gltf asset doesn't have a default scene 2019-01-27 20:52:04 +00:00
Syoyo Fujita
4de57db325 Add TINYGLTF_ENABLE_DRACO flag to README. v2.1.0 2019-01-27 00:43:02 +09:00
Syoyo Fujita
a32fa80102 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
5f34dab548
Merge pull request #136 from abwood/draco 
Fixed decoding bugs in draco
 2019-01-26 23:22:55 +09:00
Alexander Wood
0d77a291f7 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
b926195ef8
Merge pull request #134 from abwood/draco 
Initial support for draco mesh compression
 2019-01-25 16:45:33 +09:00
Alex Wood
c8ba17fcab 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
df39e04e7b Merge branch 'draco' of https://github.com/abwood/tinygltf into draco 2019-01-24 15:40:28 -05:00
Alex Wood
7319db7a50 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
7ae7110800 Begin supporting draco. 2019-01-19 03:03:22 +09:00
Syoyo Fujita
b864ea7349 Support macOS + OpenGL 3.3+ GPU 2019-01-14 22:11:11 +09:00
Syoyo Fujita
d6b0b0b990 Convert UTF16 file to UTF8. 
Add premake project to build on Linux.
 2019-01-14 21:30:53 +09:00
Syoyo Fujita
af3ebb2e76 Show more expressive messages when parsing image. 2019-01-06 18:55:57 +09:00
Syoyo Fujita
105694b468
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
5f9cb24245 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
9fcd3f998e
Merge pull request #127 from nyue/master 
Renamed glTFConfig to TinyGLTFConfig
 2018-12-28 14:31:33 +09:00
Tan Meng Yue
d96b45df06 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
dd7c9efbea
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
80a85af661 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
Syoyo Fujita
7cf2c44ad7
Merge pull request #124 from nyue/master 
Fix GLFW3 handling on CentOS
 2018-12-25 11:27:33 +09:00
Nicholas Yue
f1b5bb12fd Add support for static GLFW3 library linking 2018-12-25 09:48:26 +11:00
Nicholas Yue
174334eaf4 Fix GLFW3 handling on CentOS 2018-12-25 09:15:13 +11:00
Syoyo Fujita
1212a6ee51 Update README. 2018-12-24 01:50:17 +09:00
Syoyo Fujita
8674c60781 Add document on TINYGLTF_NO_EXTERNAL_IMAGE. Fixes #123 2018-12-18 21:59:23 +09:00
Syoyo Fujita
9d89f02cf0
Merge pull request #122 from lebek/master 
Fix incorrect index into bufferViews array
 2018-12-09 12:23:39 +09:00
Peter Le Bek
463408c4a0 Fix incorrect index into bufferViews array 2018-12-08 16:04:42 -08:00
Syoyo Fujita
a9d862aeee
Merge pull request #119 from nyue/master 
Add CMake package for developer
 2018-12-07 18:48:14 +09:00
Tan Meng Yue
2123da775b Add CMake package for developer 
Added the glTFConfig.cmake file so that once
installed, it is easy for developers to find
all the path location for include purposes.
 2018-12-07 20:45:13 +11:00
Syoyo Fujita
20806b27d7
Merge pull request #118 from nyue/master 
Added more CMake support
 2018-12-07 16:07:16 +09:00
Tan Meng Yue
94fcfdeb9d Added installation of headers and target binaries 2018-12-07 18:01:08 +11:00
Syoyo Fujita
d44b6e7bcc
Merge pull request #117 from viperscape/master 
Fill in missing bufferView targets
 2018-12-06 11:20:18 +09:00