Merge pull request #445 from nyalldawson/permissive

Be tolerant when encountering emissiveFactor with array length 4
Add method to set parsing strictness
2026-06-09 03:33:49 +00:00 · 2023-09-01 23:10:29 +09:00 · 2023-08-28 12:56:09 +10:00 · 2023-08-28 12:46:44 +10:00 · 2023-08-24 22:11:50 +09:00 · 2023-08-24 11:48:09 +10:00
5 changed files with 958 additions and 335 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ premake5.tar.gz
 #binary directories
 bin/
 obj/
+out/

 #runtime gui config
 imgui.ini
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,14 @@
 cmake_minimum_required(VERSION 3.6)

-PROJECT (tinygltf)
+project(tinygltf)

 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)

-SET(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED On)
+set(CMAKE_CXX_EXTENSIONS Off)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

 option(TINYGLTF_BUILD_LOADER_EXAMPLE "Build loader_example(load glTF and dump infos)" ON)
 option(TINYGLTF_BUILD_GL_EXAMPLES "Build GL exampels(requires glfw, OpenGL, etc)" OFF)
@@ -15,22 +18,22 @@ option(TINYGLTF_HEADER_ONLY "On: header-only mode. Off: create tinygltf library(
 option(TINYGLTF_INSTALL "Install tinygltf files during install step. Usually set to OFF if you include tinygltf through add_subdirectory()" ON)

 if (TINYGLTF_BUILD_LOADER_EXAMPLE)
-  ADD_EXECUTABLE ( loader_example
+  add_executable(loader_example
    loader_example.cc
    )
 endif (TINYGLTF_BUILD_LOADER_EXAMPLE)

 if (TINYGLTF_BUILD_GL_EXAMPLES)
-  ADD_SUBDIRECTORY ( examples/gltfutil )
-  ADD_SUBDIRECTORY ( examples/glview )
+  add_subdirectory( examples/gltfutil )
+  add_subdirectory( examples/glview )
 endif (TINYGLTF_BUILD_GL_EXAMPLES)

 if (TINYGLTF_BUILD_VALIDATOR_EXAMPLE)
-  ADD_SUBDIRECTORY ( examples/validator )
+  add_subdirectory( examples/validator )
 endif (TINYGLTF_BUILD_VALIDATOR_EXAMPLE)

 if (TINYGLTF_BUILD_BUILDER_EXAMPLE)
-  ADD_SUBDIRECTORY ( examples/build-gltf )
+  add_subdirectory ( examples/build-gltf )
 endif (TINYGLTF_BUILD_BUILDER_EXAMPLE)

 #
--- a/README.md
+++ b/README.md
@@ -109,6 +109,7 @@ WASI build example is located in [wasm](wasm) .
 * [SanityEngine](https://github.com/DethRaid/SanityEngine) - A C++/D3D12 renderer focused on the personal and professional development of its developer
 * [Open3D](http://www.open3d.org/) - A Modern Library for 3D Data Processing
 * [Supernova Engine](https://github.com/supernovaengine/supernova) - Game engine for 2D and 3D projects with Lua or C++ in data oriented design.
+* [Wicked Engine<img src="https://github.com/turanszkij/WickedEngine/blob/master/Content/logo_small.png" width="28px" align="center"/>](https://github.com/turanszkij/WickedEngine) - 3D engine with modern graphics 
 * Your projects here! (Please send PR)

 ## TODOs
--- a/examples/build-gltf/CMakeLists.txt
+++ b/examples/build-gltf/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+include_directories(${CMAKE_SOURCE_DIR})
+add_executable(create_triangle_gltf create_triangle_gltf.cpp)
+target_compile_options(create_triangle_gltf PUBLIC -Wall)
+target_link_libraries(create_triangle_gltf )
--- a/tiny_gltf.h
+++ b/tiny_gltf.h
Author	SHA1	Message	Date
Syoyo Fujita	acf1e8a2b1	Merge pull request #445 from nyalldawson/permissive Be tolerant when encountering emissiveFactor with array length 4	2023-09-01 23:10:29 +09:00
Nyall Dawson	8c85d5e387	Add method to set parsing strictness	2023-08-28 12:56:09 +10:00
Nyall Dawson	02e8b8da1e	Raise a warning when encountering emissiveFactor with array length of 4 instead of aborting the model loading	2023-08-28 12:46:44 +10:00
Syoyo Fujita	ddc76f7724	Merge pull request #446 from nyalldawson/fix_error Fix misleading error message	2023-08-24 22:11:50 +09:00
Nyall Dawson	8e9aadf569	Fix misleading error message Avoids a confusing "Must have 4 bytes or more bytes, but got 4." error.	2023-08-24 11:48:09 +10:00
Syoyo Fujita	0eaa23fbfc	Merge pull request #442 from turanszkij/release-1 added project link to readme	2023-08-07 18:32:30 +09:00
Turánszki János	2a5dc852cc	added project link to readme	2023-08-07 06:59:35 +02:00
Syoyo Fujita	f51243da48	Merge pull request #433 from dyollb/modernize Modernize	2023-07-11 19:43:53 +09:00
Syoyo Fujita	a080377e6f	Merge pull request #436 from dimitri-tdg/bugfix_extensions_primitive Fix issue when serializing extensions of a primitive	2023-07-10 23:30:40 +09:00
KUDELSKI Dimitri	69d75573f5	Fix issue when serializing extensions of a primitive	2023-07-10 15:13:09 +02:00
Syoyo Fujita	aaf631c984	Merge pull request #435 from RE-Kovalev/release MinGW _wfopen_s fix	2023-07-05 18:41:22 +09:00
R.E. Kovalev	112e3537ff	MinGW _wfopen_s fix	2023-07-05 09:11:57 +03:00
Bryn Lloyd	cb6a707014	cppcoreguidelines-prefer-member-initializer	2023-06-21 22:30:14 +02:00
Bryn Lloyd	3e98ac4564	modernize-use-equals-default	2023-06-21 22:15:49 +02:00
Bryn Lloyd	c704d73bd0	readability-redundant-string-init	2023-06-21 18:42:24 +02:00
Bryn Lloyd	a64f4b4442	modernize-use-default-member-init	2023-06-21 18:40:18 +02:00
Bryn Lloyd	85b4322ade	minor cleanup of cmakelists	2023-06-21 18:26:43 +02:00
Syoyo Fujita	7a570c88d9	Initialize `light` and `emitter` members. Fixes #431 Include `light` and `emitter` comparison in Node::operator==()	2023-06-19 21:52:13 +09:00
Syoyo Fujita	e12e0a9392	Merge pull request #429 from AdamFull/release KHR_audio parsing support (ASCII only)	2023-06-13 21:40:45 +09:00
Baranob_Ilya	879cb473a3	Added parsing and serializing of audio emitters for scene (global sources)	2023-06-12 13:35:05 +04:00
Baranob_Ilya	c9657be1de	Forgot to add KHR_audio to used extensions	2023-06-12 12:34:34 +04:00
Baranob_Ilya	95bbf15ce2	Update .gitignore	2023-06-12 12:30:04 +04:00
Baranob_Ilya	78864c8d3a	Added KHR_audio extension. Parsing and serialization. Added KHR_audio extension parsing and serializing. Only for ascii	2023-06-12 10:43:52 +04:00
Syoyo Fujita	14c86324d7	Merge pull request #426 from agnat/serialize_light_refs KHR_lights_punctual: Serialize node light refs	2023-06-09 05:03:01 +09:00
David Siegel	8d5d0b34be	clean up	2023-06-07 15:35:35 +02:00
David Siegel	a1a34cb54d	fix syntax error	2023-06-07 15:30:02 +02:00
David Siegel	cfe64fb6c8	KHR_lights_punctual: Serialize node light refs This is surprisingly involved: 1. Add non-const json iterators, FindMember(…) and GetValue(…) 2. Add json utilities IsEmpty(…) and Erase(…) 3. Serialize the property and clean up	2023-06-07 15:18:38 +02:00