Commit Graph

  • e6ca627160 Merge pull request #144 from SaschaWillems/master Syoyo Fujita 2019-02-24 14:42:51 +09:00
  • bd2028c74c Added function to easily access texture coordinate set index on a texture parameter Sascha Willems 2019-02-23 21:15:45 +01:00
  • 42819e746a Define WIN32_LEAN_AND_MEAN to save the number of including files. Syoyo Fujita 2019-02-19 21:36:32 +09:00
  • 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 Syoyo Fujita 2019-02-19 16:03:23 +09:00
  • 1c78db194d Merge pull request #142 from ebirenbaum/animation-sampler-interpolation Syoyo Fujita 2019-02-15 14:04:06 +09:00
  • e027b5c2f7 Change AnimationSampler::interpolation to a non-required field. The spec states to default to LINEAR when not present. Evan Birenbaum 2019-02-14 13:30:57 -08:00
  • 6b07cbe1d5 Merge pull request #140 from timmmeh/master Syoyo Fujita 2019-02-10 00:01:11 +09:00
  • 871d8576b1 Update json.hpp to fix compilation with clang with C++17(-std=c++1z) support. Syoyo Fujita 2019-02-04 16:19:13 +09:00
  • 5f0a6aab29 fix compile timmmeh 2019-01-31 11:46:19 -08:00
  • 5a0168069c Adding default values for min and mag filter. timmmeh 2019-01-30 18:38:46 -08:00
  • 43ad313ad6 Merge pull request #138 from dolphineye/dolphineye/add_mode_line_strip Syoyo Fujita 2019-01-30 23:19:30 +09:00
  • 6efee92d47 Add line strip primitive mode define Thomas Tissot 2019-01-30 13:10:51 +01:00
  • 175ca1ae6d Merge pull request #137 from Ybalrid/pr_fix_glview_no_scene_no_nodes Syoyo Fujita 2019-01-28 13:00:26 +09:00
  • c35996cf7e handle not having default scene Arthur Brainville (Ybalrid) 2019-01-27 20:28:23 +00:00
  • 24840cdbed fix glview in case gltf asset doesn't have a default scene Arthur Brainville (Ybalrid) 2019-01-27 20:20:58 +00:00
  • 5f99409f74 Add TINYGLTF_ENABLE_DRACO flag to README. v2.1.0 Syoyo Fujita 2019-01-27 00:43:02 +09:00
  • 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. Syoyo Fujita 2019-01-27 00:38:34 +09:00
  • 60ddc77512 Merge pull request #136 from abwood/draco Syoyo Fujita 2019-01-26 23:22:55 +09:00
  • 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. Alexander Wood 2019-01-26 08:58:45 -05:00
  • 6d75dcd067 Merge pull request #134 from abwood/draco Syoyo Fujita 2019-01-25 16:45:33 +09:00
  • eb07083296 Looks like I'm colliding with work by syoyo. Only difference so far appears to be our macro name. Alex Wood 2019-01-24 15:45:16 -05:00
  • 5fd4d4d662 Merge branch 'draco' of https://github.com/abwood/tinygltf into draco Alex Wood 2019-01-24 15:40:28 -05:00
  • 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. Alex Wood 2019-01-24 15:38:16 -05:00
  • 446b3147e0 Begin supporting draco. Syoyo Fujita 2019-01-19 03:03:22 +09:00
  • e8ed267553 Support macOS + OpenGL 3.3+ GPU Syoyo Fujita 2019-01-14 22:10:32 +09:00
  • 1ed7c4a2bf Convert UTF16 file to UTF8. Add premake project to build on Linux. Syoyo Fujita 2019-01-14 21:30:53 +09:00
  • 207b7b3ebd Show more expressive messages when parsing image. Syoyo Fujita 2019-01-06 18:55:57 +09:00
  • 4aff57eff8 Merge pull request #129 from SaschaWillems/master Syoyo Fujita 2018-12-29 12:33:34 +09:00
  • 5278dfff58 Added new feature for loading all gltf related files (including textures, binaries, etc.) from assets packaged with an Android app Sascha Willems 2018-12-28 20:53:41 +01:00
  • 635190d907 Merge pull request #127 from nyue/master Syoyo Fujita 2018-12-28 14:31:33 +09:00
  • d6676a8ead Renamed glTFConfig to TinyGLTFConfig Tan Meng Yue 2018-12-27 10:24:13 +11:00
  • 545e36a8c2 Merge pull request #125 from nyue/master Syoyo Fujita 2018-12-25 15:06:37 +09:00
  • 0278628a59 Fix bug in handling OS X build via CMake Tan Meng Yue 2018-12-25 17:03:58 +11:00
  • c1b66d0a86 Merge pull request #124 from nyue/master Syoyo Fujita 2018-12-25 11:27:33 +09:00
  • 70af9bf0fb Add support for static GLFW3 library linking Nicholas Yue 2018-12-25 09:48:26 +11:00
  • 7ace162e97 Fix GLFW3 handling on CentOS Nicholas Yue 2018-12-25 09:15:13 +11:00
  • d1e5d8e6d4 Update README. Syoyo Fujita 2018-12-24 01:50:17 +09:00
  • 1fb864acde Add document on TINYGLTF_NO_EXTERNAL_IMAGE. Fixes #123 Syoyo Fujita 2018-12-18 21:59:23 +09:00
  • 5f15a541b9 Merge pull request #122 from lebek/master Syoyo Fujita 2018-12-09 12:23:39 +09:00
  • 8d23e8c6aa Fix incorrect index into bufferViews array Peter Le Bek 2018-12-08 16:04:42 -08:00
  • 765952f510 Merge pull request #119 from nyue/master Syoyo Fujita 2018-12-07 18:48:14 +09:00
  • 5e026cdc0b Add CMake package for developer Tan Meng Yue 2018-12-07 20:45:13 +11:00
  • d5349ad197 Merge pull request #118 from nyue/master Syoyo Fujita 2018-12-07 16:07:16 +09:00
  • 85d01b26cb Added installation of headers and target binaries Tan Meng Yue 2018-12-07 18:01:08 +11:00
  • 1869f12e2c Merge pull request #117 from viperscape/master Syoyo Fujita 2018-12-06 11:20:18 +09:00
  • 4deeaa1a03 find missing bufferView target types and fill them in viperscape 2018-12-05 14:11:01 -05:00
  • 6314ca6519 Merge pull request #1 from syoyo/master Chris Gill 2018-12-05 13:03:44 -05:00
  • 499f2617a1 Merge pull request #115 from Selmar/serialization_fixes Syoyo Fujita 2018-12-06 02:05:26 +09:00
  • f6c1b4bddf Add CMake configuration for glview Tan Meng Yue 2018-12-05 23:56:23 +11:00
  • 67e00000ca Added top level CMake configuration file Tan Meng Yue 2018-12-05 23:55:53 +11:00
  • 126fee11b5 Set a default for sampler.wrapR, because it was serializing an uninitialized value Selmar Kok 2018-12-04 19:55:56 +01:00
  • bbaa65ce93 Fix prettyprint to really not print pretty Selmar Kok 2018-11-30 18:01:31 +01:00
  • 50d6788c5f Merge pull request #111 from viperscape/master Syoyo Fujita 2018-11-16 14:01:13 +09:00
  • 550058cdb6 Merge pull request #110 from AlvaroBarua/warnings_cleanup Syoyo Fujita 2018-11-16 14:00:33 +09:00
  • 16fa4eed42 add screenshot viperscape 2018-11-15 17:03:38 -05:00
  • 049dab3bbc add basic example viperscape 2018-11-15 17:02:20 -05:00
  • 1983cfc536 Removed unreachable code and fixed ambiguity warning. Unknown 2018-11-15 18:36:59 +00:00
  • 2cf5150387 Merge pull request #109 from viperscape/master Syoyo Fujita 2018-11-15 00:28:06 +09:00
  • 5e5525d01b add win32 includes viperscape 2018-11-14 10:19:39 -05:00
  • e82c54196d rework to include VS 2017 project, fully configured and tested viperscape 2018-11-14 10:15:58 -05:00
  • c04e762b64 Merge branch 'master' of github.com:syoyo/tinygltf Syoyo Fujita 2018-11-10 20:08:02 +09:00
  • e52b5b4503 Merge branch 'loomai-master' Syoyo Fujita 2018-11-10 20:07:47 +09:00
  • 8f25f8400c Merge branch 'master' of https://github.com/loomai/tinygltf into loomai-master Syoyo Fujita 2018-11-10 20:07:15 +09:00
  • 487327fabd Merge pull request #107 from Selmar/serialization_fixes Syoyo Fujita 2018-11-10 02:32:56 +09:00
  • adc900a97a Merge remote-tracking branch 'origin/master' into serialization_fixes Selmar Kok 2018-11-09 10:34:55 +01:00
  • f273efe4e9 Fix missing serialization: sampler.wrapR Selmar Kok 2018-11-09 10:34:39 +01:00
  • d409103096 Merge pull request #105 from rapidimages/bugfix/write_image_to_disk Syoyo Fujita 2018-11-07 00:56:34 +09:00
  • eb14d8ea25 fixed a reference error which cause an error when writing images to disk Johan Bowald 2018-11-06 14:28:20 +01:00
  • a0617fd244 Merge branch 'master' of github.com:syoyo/tinygltf Syoyo Fujita 2018-11-05 13:33:27 +09:00
  • 67faff5842 Fix logic error. Fixes #104 Syoyo Fujita 2018-11-05 13:32:43 +09:00
  • 28b7cad490 Merge pull request #102 from 1div0/master Syoyo Fujita 2018-10-28 15:30:21 +09:00
  • 55e06061ca Merge pull request #103 from Selmar/serialization_fixes Syoyo Fujita 2018-10-26 02:12:24 +09:00
  • 0cc2f6f109 Merge remote-tracking branch 'origin/master' into serialization_fixes Selmar Kok 2018-10-25 16:48:14 +02:00
  • eae3ba05df fail serialization if a buffer file fails to be written (e.g. due to access rights) Selmar Kok 2018-10-25 16:45:49 +02:00
  • f050b16a79 Merge branch 'master' of https://github.com/1div0/tinygltf Peter Kovář 2018-10-17 15:30:33 +02:00
  • 6b9c7aa600 Added include directory ../common/ for trackball.h Peter Kovář 2018-10-17 15:24:59 +02:00
  • 538adae600 Added include direectory ../common/ for trackball.h Peter Kovář 2018-10-17 15:24:59 +02:00
  • 65a2419d66 Merge pull request #101 from 1div0/master Syoyo Fujita 2018-10-16 19:11:17 +09:00
  • ae2d060ed7 Fixed make lint Peter Kovář 2018-10-16 12:03:45 +02:00
  • 3a02a69700 Fixed typos Peter Kovář 2018-10-16 12:00:24 +02:00
  • ea78c7b01e Merge pull request #100 from Selmar/serialization_fixes Syoyo Fujita 2018-10-11 01:25:12 +09:00
  • 863fd440e3 fix an issue when serializing an empty extension object would serialize as type null (and thus deserialize as type null, causing it to be ignored) Selmar Kok 2018-10-10 18:10:58 +02:00
  • 6bb66b1264 Merge pull request #99 from Selmar/serialization_fixes Syoyo Fujita 2018-10-09 02:12:38 +09:00
  • 2c0c4fc62d // pretty print as optional parameter, default true // serialize name instead of type for camera.name // create empy Value::Object if extension value parsing failed Selmar Kok 2018-10-08 16:20:43 +02:00
  • 48b6826198 Serialize extension with empty object. Fixes #97 Use pretty printing JSON when serializing for the readability. Syoyo Fujita 2018-10-08 21:15:12 +09:00
  • bb4010336b Merge branch 'master' of github.com:syoyo/tinygltf Syoyo Fujita 2018-10-07 20:35:14 +09:00
  • 5a2da1742a Fix premake script. Syoyo Fujita 2018-10-07 20:34:45 +09:00
  • 5e70262b38 Merge branch 'master' of github.com:syoyo/tinygltf Syoyo Fujita 2018-10-06 03:20:31 +09:00
  • 142b0e326b Update README. Syoyo Fujita 2018-10-06 03:20:11 +09:00
  • f29ed08e97 Merge pull request #96 from Selmar/serialization_fixes Syoyo Fujita 2018-10-06 01:36:27 +09:00
  • 7f13e3e912 tabs to spaces Selmar Kok 2018-10-05 16:30:50 +02:00
  • b2c232c76c better implementation for bin file name checking Selmar Kok 2018-10-05 16:25:54 +02:00
  • 17b319e3b5 - support writing multiple bin files - use existing buffer.uri as filename if not empty and not a data uri Selmar Kok 2018-10-05 16:02:29 +02:00
  • e398a5855b - always check Parameter::number_value to catch user errors, e.g. setting number_value without setting has_number_value, which will cause it to serialize as a bool but read back in as a float anyway Selmar Kok 2018-10-05 14:36:05 +02:00
  • 11eb5a8da7 Merge branch 'master' of github.com:syoyo/tinygltf into serialization_fixes Selmar Kok 2018-10-05 14:30:16 +02:00
  • 58d7b1064e - Parse image extras property - Optionally serialize texture.source (it is not required in the current spec) Selmar Kok 2018-10-05 14:29:35 +02:00
  • 45e9cc4058 Remove duplicated files. Syoyo Fujita 2018-10-04 15:48:17 +09:00
  • 2737d51d6a Update to v2.0.1 Syoyo Fujita 2018-10-04 15:45:13 +09:00
  • 9cae999b69 Suppress clang warnings. Apply clang-format. Syoyo Fujita 2018-10-04 15:43:33 +09:00
  • f83a779430 Merge pull request #95 from Selmar/equality_operator_and_some_additions Syoyo Fujita 2018-10-04 13:56:35 +09:00