Scarfski/tinygltf
1
0
Fork 0
mirror of https://github.com/syoyo/tinygltf.git synced 2026-08-09 22:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
454 Commits 5 Branches 41 Tags
550058cdb696b2d792aefc33af33fd82dccd18ef
Commit Graph

454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Syoyo Fujita
65a2419d66 Merge pull request #101 from 1div0/master 
make lint
 2018-10-16 19:11:17 +09:00
Peter Kovář
ae2d060ed7 Fixed make lint 2018-10-16 12:03:45 +02:00
Peter Kovář
3a02a69700 Fixed typos 2018-10-16 12:00:24 +02:00
Syoyo Fujita
ea78c7b01e Merge pull request #100 from Selmar/serialization_fixes 
yet another serialization fix
 2018-10-11 01:25:12 +09:00
Selmar Kok
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) 2018-10-10 18:10:58 +02:00
Syoyo Fujita
6bb66b1264 Merge pull request #99 from Selmar/serialization_fixes 
Pretty print & some (de)serialization fixes
 2018-10-09 02:12:38 +09:00
Selmar Kok
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
 2018-10-08 16:20:43 +02:00
Syoyo Fujita
48b6826198 Serialize extension with empty object. Fixes #97 
Use pretty printing JSON when serializing for the readability.
 2018-10-08 21:18:33 +09:00
Syoyo Fujita
bb4010336b Merge branch 'master' of github.com:syoyo/tinygltf 2018-10-07 20:35:14 +09:00
Syoyo Fujita
5a2da1742a Fix premake script. 2018-10-07 20:34:45 +09:00
Syoyo Fujita
5e70262b38 Merge branch 'master' of github.com:syoyo/tinygltf 2018-10-06 03:20:31 +09:00
Syoyo Fujita
142b0e326b Update README. 2018-10-06 03:20:11 +09:00
Syoyo Fujita
f29ed08e97 Merge pull request #96 from Selmar/serialization_fixes 
Serialization & comparison fixes
 2018-10-06 01:36:27 +09:00
Selmar Kok
7f13e3e912 tabs to spaces 2018-10-05 16:30:50 +02:00
Selmar Kok
b2c232c76c better implementation for bin file name checking 2018-10-05 16:25:54 +02:00
Selmar Kok
17b319e3b5 - support writing multiple bin files 
- use existing buffer.uri as filename if not empty and not a data uri
 2018-10-05 16:02:29 +02:00
Selmar Kok
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 2018-10-05 14:36:05 +02:00
Selmar Kok
11eb5a8da7 Merge branch 'master' of github.com:syoyo/tinygltf into serialization_fixes 2018-10-05 14:30:16 +02:00
Selmar Kok
58d7b1064e - Parse image extras property 
- Optionally serialize texture.source (it is not required in the current spec)
 2018-10-05 14:29:35 +02:00
Syoyo Fujita
45e9cc4058 Remove duplicated files. 2018-10-04 15:48:17 +09:00
Syoyo Fujita
2737d51d6a Update to v2.0.1 2018-10-04 15:45:13 +09:00
Syoyo Fujita
9cae999b69 Suppress clang warnings. 
Apply clang-format.
 2018-10-04 15:43:33 +09:00
Syoyo Fujita
f83a779430 Merge pull request #95 from Selmar/equality_operator_and_some_additions 
Equality operator and some additions
 2018-10-04 13:56:35 +09:00
Syoyo Fujita
c87a0ba84a Merge branch 'master' into devel 2018-10-04 13:55:21 +09:00
Selmar Kok
f0a934d0c8 Merge branch 'master' of github.com:syoyo/tinygltf into equality_operator_and_some_additions 
# Conflicts:
#	tiny_gltf.h
 2018-10-03 15:46:23 +02:00
Selmar Kok
3a94598aef // equality operator for tinygltf::Model and types contained by it 
// double comparison (although perhaps not necessary, as json reads/writes bytes directly? unsure..)
// initialize some variables for operator==() reliabiltiy
// change some floats to doubles
// intellisense define
// serialize accessor.name
// dont serialize some names if they're empty
// return false if writing gltf file fails
 2018-10-03 15:39:05 +02:00
Syoyo Fujita
523562aae9 Update TODOs. 2018-09-25 03:03:49 +09:00
Syoyo Fujita
39dbbe2e88 Add as-is flag to Image. Tentative solution for issue #82 2018-09-02 16:58:43 +09:00