luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 00:25:19 +02:00
Code Activity

Add binary glTF (.glb) support

Browse Source
This commit is contained in:
Lars Mueller
2024-09-05 17:16:55 +02:00
committed by Lars Müller
parent 7e4919c6ed
commit 521e678d39
8 changed files with 184 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/client.cpp
View File

@@ -827,7 +827,7 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
}
const char *model_ext[] = {
".x", ".b3d", ".obj", ".gltf",
".x", ".b3d", ".obj", ".gltf", ".glb",
NULL
};
name = removeStringEnd(filename, model_ext);

2
src/server.cpp
View File

@@ -2519,7 +2519,7 @@ bool Server::addMediaFile(const std::string &filename,
const char *supported_ext[] = {
".png", ".jpg", ".bmp", ".tga",
".ogg",
".x", ".b3d", ".obj", ".gltf",
".x", ".b3d", ".obj", ".gltf", ".glb",
// Custom translation file format
".tr",
NULL

5
src/unittest/test_irr_gltf_mesh_loader.cpp
View File

@@ -87,7 +87,10 @@ SECTION("minimal triangle") {
}
SECTION("blender cube") {
const auto mesh = loadMesh(model_stem + "blender_cube.gltf");
const auto path = GENERATE(
model_stem + "blender_cube.gltf",
model_stem + "blender_cube.glb");
const auto mesh = loadMesh(path);
REQUIRE(mesh);
REQUIRE(mesh->getMeshBufferCount() == 1);
SECTION("vertex coordinates are correct") {