Merge pull request #433 from dyollb/modernize

Modernize
Merge pull request #436 from dimitri-tdg/bugfix_extensions_primitive
2026-06-08 19:23:50 +00:00 · 2023-07-11 19:43:53 +09:00 · 2023-07-10 23:30:40 +09:00 · 2023-07-10 15:13:09 +02:00 · 2023-07-05 18:41:22 +09:00 · 2023-07-05 09:11:57 +03:00
5 changed files with 1055 additions and 878 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
@@ -197,6 +197,7 @@ if (!ret) {
 * `TINYGLTF_USE_RAPIDJSON` : Use RapidJSON as a JSON parser/serializer. RapidJSON files are not included in TinyGLTF repo. Please set an include path to RapidJSON if you enable this feature.
 * `TINYGLTF_USE_CPP14` : Use C++14 feature(requires C++14 compiler). This may give better performance than C++11.

+
 ## CMake options

 You can add tinygltf using `add_subdirectory` feature.
--- 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	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
Syoyo Fujita	c201efb998	Merge pull request #422 from agnat/fix/add_missing_extras_and_extensions Add missing extras and extensions fields	2023-06-07 02:47:59 +09:00
Syoyo Fujita	b88e9cc52a	Merge pull request #423 from agnat/finish_KHR_lights_puncutal KHR_lights_punctual: parse light source references from scene nodes	2023-06-06 23:12:50 +09:00
Syoyo Fujita	9417144f48	Merge pull request #424 from agnat/rewrite_ForEachInArray get rid of std::function	2023-06-06 23:11:12 +09:00
David Siegel	07616e8190	refactor extension and extra serialization Add missing serialization: accessor.extensions accessor.sparse.extensions accessor.sparse.extras accessor.sparse.indices.extensions accessor.sparse.indices.extras accessor.sparse.values.extensions accessor.sparse.values.extras animation.channel.target.extras animation.sampler.extensions buffer.extensions bufferView.extensions sampler.extensions camera.orthographic.extensions camera.perspective.extensions skin.extras skin.extensions	2023-06-06 15:40:29 +02:00
David Siegel	bec8a6d54f	rewrite ForEachInArray as a simple C++11 function no need for std::function here. A free function with an unspecified callback will do nicely.	2023-06-06 15:36:07 +02:00
David Siegel	157063fa1b	fix: add missing nullptr check	2023-06-06 15:31:58 +02:00
David Siegel	c164878d0f	parse light source references	2023-06-06 06:18:14 +02:00
David Siegel	d852f50d49	Add missing extras and extensions fields Handle extras and extensions in nested “sub-objects”: animation.channel.target.extras accessor.sparse.extras accessor.sparse.extensions accessor.sparse.indices.extras accessor.sparse.indices.extensions accessor.sparse.values.extras accessor.sparse.values.extensions	2023-06-06 00:07:37 +02:00
David Siegel	22cafa1032	remove duplicate code use a function to parse extras and extensions	2023-06-06 00:07:37 +02:00
David Siegel	47208b234d	fix warnings: unused variable	2023-06-06 00:07:37 +02:00
Syoyo Fujita	5a6df34d99	Simplify version comment in `tiny_gltf.h` Remove wuffs code(which was accidently adde to `release` branch)	2023-06-04 19:07:00 +09:00
Syoyo Fujita	147a00a601	Prevent duplicated key generation when serializing lights + RapidJSON backend. Fixes #420	2023-06-04 05:45:24 +09:00
Syoyo Fujita	350c296802	Merge pull request #418 from agnat/fix_get_file_size_bug [Bugfix] Actually invoke the user-supplied function instead of subtracting from a pointer...	2023-04-26 19:28:58 +09:00
David Siegel	cc93e1fd25	Fix: Actually invoke the user-supplied function	2023-04-26 12:13:41 +02:00