Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-08-06 13:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
482 Commits 5 Branches 41 Tags
4aff57eff8b015751c8cfec12c0cfd7bb0e514f3
Commit Graph

482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Syoyo Fujita
c1b66d0a86 Merge pull request #124 from nyue/master 
Fix GLFW3 handling on CentOS
 2018-12-25 11:27:33 +09:00
Nicholas Yue
70af9bf0fb Add support for static GLFW3 library linking 2018-12-25 09:48:26 +11:00
Nicholas Yue
7ace162e97 Fix GLFW3 handling on CentOS 2018-12-25 09:15:13 +11:00
Syoyo Fujita
d1e5d8e6d4 Update README. 2018-12-24 01:50:17 +09:00
Syoyo Fujita
1fb864acde Add document on TINYGLTF_NO_EXTERNAL_IMAGE. Fixes #123 2018-12-18 21:59:23 +09:00
Syoyo Fujita
5f15a541b9 Merge pull request #122 from lebek/master 
Fix incorrect index into bufferViews array
 2018-12-09 12:23:39 +09:00
Peter Le Bek
8d23e8c6aa Fix incorrect index into bufferViews array 2018-12-08 16:04:42 -08:00
Syoyo Fujita
765952f510 Merge pull request #119 from nyue/master 
Add CMake package for developer
 2018-12-07 18:48:14 +09:00
Tan Meng Yue
5e026cdc0b 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
d5349ad197 Merge pull request #118 from nyue/master 
Added more CMake support
 2018-12-07 16:07:16 +09:00
Tan Meng Yue
85d01b26cb Added installation of headers and target binaries 2018-12-07 18:01:08 +11:00
Syoyo Fujita
1869f12e2c Merge pull request #117 from viperscape/master 
Fill in missing bufferView targets
 2018-12-06 11:20:18 +09:00
viperscape
4deeaa1a03 find missing bufferView target types and fill them in 2018-12-05 14:11:01 -05:00
Chris Gill
6314ca6519 Merge pull request #1 from syoyo/master 
update to latest
 2018-12-05 13:03:44 -05:00
Syoyo Fujita
499f2617a1 Merge pull request #115 from Selmar/serialization_fixes 
some serialization fixes
 2018-12-06 02:05:26 +09:00
Tan Meng Yue
f6c1b4bddf Add CMake configuration for glview 
So that we can build more of the examples consistently
with CMake
 2018-12-05 23:56:23 +11:00
Tan Meng Yue
67e00000ca Added top level CMake configuration file 2018-12-05 23:55:53 +11:00
Selmar Kok
126fee11b5 Set a default for sampler.wrapR, because it was serializing an uninitialized value 2018-12-04 19:55:56 +01:00
Selmar Kok
bbaa65ce93 Fix prettyprint to really not print pretty 2018-11-30 18:01:31 +01:00
Syoyo Fujita
50d6788c5f Merge pull request #111 from viperscape/master 
This is a basic example I added after figuring out how to use the tinygltf library
 2018-11-16 14:01:13 +09:00
Syoyo Fujita
550058cdb6 Merge pull request #110 from AlvaroBarua/warnings_cleanup 
Removed unreachable code and fixed ambiguity warning.
 2018-11-16 14:00:33 +09:00
viperscape
16fa4eed42 add screenshot 2018-11-15 17:03:38 -05:00
viperscape
049dab3bbc add basic example 2018-11-15 17:02:20 -05:00
Unknown
1983cfc536 Removed unreachable code and fixed ambiguity warning. 2018-11-15 18:36:59 +00:00
Syoyo Fujita
2cf5150387 Merge pull request #109 from viperscape/master 
Windows build with provided VS solution
 2018-11-15 00:28:06 +09:00
viperscape
5e5525d01b add win32 includes 2018-11-14 10:19:39 -05:00
viperscape
e82c54196d rework to include VS 2017 project, fully configured and tested 2018-11-14 10:15:58 -05:00
Syoyo Fujita
c04e762b64 Merge branch 'master' of github.com:syoyo/tinygltf 2018-11-10 20:08:02 +09:00
Syoyo Fujita
e52b5b4503 Merge branch 'loomai-master' 2018-11-10 20:07:47 +09:00
Syoyo Fujita
8f25f8400c Merge branch 'master' of https://github.com/loomai/tinygltf into loomai-master 2018-11-10 20:07:15 +09:00
Syoyo Fujita
487327fabd Merge pull request #107 from Selmar/serialization_fixes 
Add missing serialization of `sampler.wrapR`
 2018-11-10 02:32:56 +09:00
Selmar Kok
adc900a97a Merge remote-tracking branch 'origin/master' into serialization_fixes 2018-11-09 10:34:55 +01:00
Selmar Kok
f273efe4e9 Fix missing serialization: sampler.wrapR 2018-11-09 10:34:39 +01:00
Syoyo Fujita
d409103096 Merge pull request #105 from rapidimages/bugfix/write_image_to_disk 
Fixed a reference error which cause an error when writing images to disk
 2018-11-07 00:56:34 +09:00
Johan Bowald
eb14d8ea25 fixed a reference error which cause an error when writing images to disk 2018-11-06 14:28:20 +01:00
Syoyo Fujita
a0617fd244 Merge branch 'master' of github.com:syoyo/tinygltf 2018-11-05 13:33:27 +09:00
Syoyo Fujita
67faff5842 Fix logic error. Fixes #104 2018-11-05 13:32:43 +09:00
Syoyo Fujita
28b7cad490 Merge pull request #102 from 1div0/master 
Building glview failed
 2018-10-28 15:30:21 +09:00
Syoyo Fujita
55e06061ca Merge pull request #103 from Selmar/serialization_fixes 
[serialization] handle failing buffer file writes
 2018-10-26 02:12:24 +09:00
Selmar Kok
0cc2f6f109 Merge remote-tracking branch 'origin/master' into serialization_fixes 2018-10-25 16:48:14 +02:00
Selmar Kok
eae3ba05df fail serialization if a buffer file fails to be written (e.g. due to access rights) 2018-10-25 16:45:49 +02:00
Peter Kovář
f050b16a79 Merge branch 'master' of https://github.com/1div0/tinygltf 2018-10-17 15:30:33 +02:00
Peter Kovář
6b9c7aa600 Added include directory ../common/ for trackball.h 2018-10-17 15:29:56 +02:00
Peter Kovář
538adae600 Added include direectory ../common/ for trackball.h 2018-10-17 15:24:59 +02:00