Static glTF mesh loading

.github/workflows/build.yml

@@ -20,6 +20,10 @@ jobs:
         run: |
           cmake . -DUSE_SDL2=OFF
           make VERBOSE=1 -j2
+
+      - name: Test
+        run: |
+          ./bin/Linux/tests
 
       - name: Test
         run: |

.gitignore

@@ -23,3 +23,15 @@ scripts/glext.h
 
 # vscode cmake plugin
 build/*
+
+# vscode clangd plugin
+.cache
+compile_commands.json
+
+# build dependencies
+_deps
+
+# autogenerated test-related files
+**/CTestTestfile.cmake
+Testing
+DartConfiguration.tcl

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.tcc": "cpp",
+        "iomanip": "cpp"
+    }
+}

CMakeLists.txt

@@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 3.12)
 
 set(IRRLICHTMT_REVISION 15)
 
+# workaround: cmake<3.9 requires C language for internal checks
+# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/487
 project(Irrlicht
 	VERSION 1.9.0.${IRRLICHTMT_REVISION}
-	LANGUAGES CXX
+	LANGUAGES C CXX
 )
 
 message(STATUS "*** Building IrrlichtMt ${PROJECT_VERSION} ***")
@@ -33,9 +35,22 @@ if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Debug or Release" FORCE)
 endif()
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+	include(CTest)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 enable_testing()
-add_subdirectory(src)
+
+add_subdirectory(source/lib/catch2)
+include(FetchContent)
+FetchContent_Declare(
+	tiniergltf
+	GIT_REPOSITORY https://github.com/appgurueu/tiniergltf.git
+	GIT_TAG 05572e691ecf8bc3fce2da76251e73779b3577e6
+)
+FetchContent_MakeAvailable(tiniergltf)
+add_subdirectory(source/Irrlicht)
 add_subdirectory(test)
 
 option(BUILD_EXAMPLES "Build example applications" FALSE)

README.md

@@ -20,11 +20,13 @@ The following libraries are required to be installed:
 Aside from standard search options (`ZLIB_INCLUDE_DIR`, `ZLIB_LIBRARY`, ...) the following options are available:
 * `BUILD_SHARED_LIBS` (default: `ON`) - Build IrrlichtMt as a shared library
 * `BUILD_EXAMPLES` (default: `OFF`) - Build example applications
+* `BUILD_TESTING` (default: `ON`) - Build Catch2 tests (only in top-level project)
 * `ENABLE_OPENGL` - Enable OpenGL driver
 * `ENABLE_OPENGL3` (default: `OFF`) - Enable OpenGL 3+ driver
 * `ENABLE_GLES1` - Enable OpenGL ES driver, legacy
 * `ENABLE_GLES2` - Enable OpenGL ES 2+ driver
 * `USE_SDL2` (default: platform-dependent, usually `ON`) - Use SDL2 instead of older native device code
+* `BUILD_TESTING` (default: `ON`) - Build Catch2 tests
 
 e.g. on a Linux system you might want to build for local use like this:
 
@@ -49,6 +51,19 @@ Run the following script in PowerShell:
 	cd irrlicht
 	cmake -B build -G "Visual Studio 17 2022" -A "Win64" -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake -DBUILD_SHARED_LIBS=OFF
 	cmake --build build --config Release
+
+Test
+----
+
+To run the Catch2 tests, the project must first be built with `BUILD_TESTING` enabled.
+
+The tests can be run with ctest:
+
+        cd build
+        ctest
+
+Run the tests directly for more detailed output:
+        build/bin/<sysname>/tests
 
 Platforms
 ---------

include/IMesh.h

@@ -52,6 +52,9 @@ enum E_ANIMATED_MESH_TYPE
 	//! Halflife MDL model file
 	EAMT_MDL_HALFLIFE,
 
+	//! Graphics Language Transmission Format 2.0 (.gltf) mesh
+	EAMT_GLTF2,
+
 	//! generic skinned mesh
 	EAMT_SKINNED,
 

include/SSkinMeshBuffer.h

@@ -301,7 +301,31 @@ struct SSkinMeshBuffer : public IMeshBuffer
 	}
 
 	//! append the vertices and indices to the current buffer
-	void append(const void *const vertices, u32 numVertices, const u16 *const indices, u32 numIndices) override {}
+	void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) override {
+		if (vertices == getVertices())
+			throw std::logic_error("can't append own vertices");
+
+		if (VertexType != video::EVT_STANDARD)
+			throw std::logic_error("invalid vertex type");
+
+		const u32 prevVertexCount = getVertexCount();
+
+		Vertices_Standard.reallocate(prevVertexCount + numVertices);
+		for (u32 i=0; i < numVertices; ++i) {
+			Vertices_Standard.push_back(static_cast<const video::S3DVertex* const>(vertices)[i]);
+			BoundingBox.addInternalPoint(static_cast<const video::S3DVertex* const>(vertices)[i].Pos);
+		}
+
+		Indices.reallocate(getIndexCount() + numIndices);
+		for (u32 i=0; i < numIndices; ++i) {
+			Indices.push_back(indices[i] + prevVertexCount);
+		}
+	}
+
+	//! NOT IMPLEMENTED YET: append the meshbuffer to the current buffer
+	void append(const IMeshBuffer* const other) override {
+		throw std::logic_error("not implemented yet");
+	}
 
 	//! get the current hardware mapping hint for vertex buffers
 	E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const override