Merge pull request #456 from haroonq/patch-1

Allow BufferView indices to be unspecified.
2026-06-08 19:23:50 +00:00 · 2023-10-10 21:24:51 +09:00 · 2023-10-09 10:30:25 +00:00 · 2023-09-12 20:28:35 +09:00 · 2023-09-12 08:46:14 +10:00 · 2023-09-07 22:03:46 +09:00
6 changed files with 1085 additions and 383 deletions
--- a/.github/workflows/mingw-w64-msys2.yml
+++ b/.github/workflows/mingw-w64-msys2.yml
@@ -0,0 +1,45 @@
+name: MSYS2 MinGW-w64 Windows 64bit Build
+
+on:
+  push:
+    branches:
+      - release
+      - devel
+    paths:
+    - 'tiny_gltf.*'
+    - 'CMakeLists.txt'
+    - '.github/workflows/mingw-w64-msys2.yml'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  mingw-w64-msys2-build:
+    name: MSYS2 MinGW-w64 Windows Build
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install core & build dependencies
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: UCRT64
+          install: base-devel
+          pacboy: >-
+            cc:p cmake:p ninja:p
+          update: true
+          release: false
+
+      - name: Configure
+        run: |
+          cmake \
+            -G"Ninja" \
+            -S . \
+            -B build
+
+      - name: Build
+        run: |
+          cmake --build build
+
--- 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	5e8a7fd602	Merge pull request #456 from haroonq/patch-1 Allow BufferView indices to be unspecified.	2023-10-10 21:24:51 +09:00
haroonq	8098a9e8ed	Allow BufferView indices to be unspecified. Allow BufferView indices for element array buffers to be unspecified to support some extensions. Note that this is similar to how invalid array buffers are handled in order to support, for example, sparse morph targets.	2023-10-09 10:30:25 +00:00
Syoyo Fujita	e0b393c695	Merge pull request #455 from nyalldawson/fix_message Fix incorrect component type shown in warning message	2023-09-12 20:28:35 +09:00
Nyall Dawson	c35819f0b7	Fix incorrect component type shown in warning message	2023-09-12 08:46:14 +10:00
Syoyo Fujita	4b9cfc8c1e	Remove unused code. Fixes #454	2023-09-07 22:03:46 +09:00
Syoyo Fujita	c40c9c223e	Merge pull request #453 from nyalldawson/fix_draco Fix build with draco	2023-09-07 21:35:55 +09:00
Nyall Dawson	0067b4d941	Fix build with draco	2023-09-07 08:20:28 +10:00
Syoyo Fujita	35735bb686	Merge pull request #452 from nyalldawson/permissive_align Relax bin chunk end alignment check in permissive mode	2023-09-07 06:46:11 +09:00
Nyall Dawson	4d119d7268	Relax bin chunk end alignment check in permissive mode	2023-09-07 07:08:26 +10:00
Syoyo Fujita	fe6a18269f	Merge pull request #450 from nyalldawson/fix_win Fix msvc build -- STRICT is a msvc macro name	2023-09-07 05:59:12 +09:00
Nyall Dawson	bbc1eaeecf	Fix msvc build -- STRICT is a msvc macro name	2023-09-07 06:28:37 +10:00
Syoyo Fujita	62cc92566e	Merge pull request #451 from nyalldawson/mingw Add mingw msys2 workflow	2023-09-06 20:55:14 +09:00
Nyall Dawson	b2aca1ecef	Add mingw msys2 workflow	2023-09-06 08:26:34 +10:00
Nyall Dawson	5a7b8278cd	Fix warning when building without draco support	2023-09-03 09:04:56 +10:00
Syoyo Fujita	3d445cc65d	Merge pull request #449 from emimvi/consistent_byteOffset Always use size_t for byte offsets	2023-09-03 02:20:35 +09:00
Syoyo Fujita	51530ee500	Merge pull request #447 from nyalldawson/draco_fix Handle the situation where the recorded component type does not match the required type for the actual number of stored points	2023-09-03 02:17:12 +09:00
emimvi	759976e087	Consistently use size_t for all byteOffset's	2023-09-02 09:39:53 +02:00
Nyall Dawson	6e3d666cf3	When in permissive mode, handle the situation where the recorded component type does not match the required type for the actual number of stored points This situation arises when decoding certain malformed files, most notably it's seen in glb tiles from Google Earth's 3d tileset. It's a port of the workaround used by Cesium native here: `d9172461e2/CesiumGltfReader/src/decodeDraco.cpp (L101)`	2023-09-02 10:16:04 +10:00
emimvi	bf7120f8a0	Serialize byteOffset as size_t, avoiding cast Fixes silently writing an overflowed int in the output file.	2023-09-02 00:11:41 +02:00
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