godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX GLTF Document mesh primitive conversions

This commit is contained in:
nikitalita 2021-12-27 17:36:58 -08:00
parent 28174d531b
commit f34ea3873e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/gltf/gltf_document.cpp
View File

@ -2539,14 +2539,16 @@ Error GLTFDocument::_parse_meshes(Ref<GLTFState> state) {
if (p.has("mode")) { if (p.has("mode")) {
const int mode = p["mode"]; const int mode = p["mode"];
ERR_FAIL_INDEX_V(mode, 7, ERR_FILE_CORRUPT); ERR_FAIL_INDEX_V(mode, 7, ERR_FILE_CORRUPT);
// Convert mesh.primitive.mode to Godot Mesh enum. See:
// https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode
static const Mesh::PrimitiveType primitives2[7] = { static const Mesh::PrimitiveType primitives2[7] = {
Mesh::PRIMITIVE_POINTS, Mesh::PRIMITIVE_POINTS, // 0 POINTS
Mesh::PRIMITIVE_LINES, Mesh::PRIMITIVE_LINES, // 1 LINES
Mesh::PRIMITIVE_LINES, //loop not supported, should ce converted Mesh::PRIMITIVE_LINES, // 2 LINE_LOOP; loop not supported, should be converted
Mesh::PRIMITIVE_LINES, Mesh::PRIMITIVE_LINE_STRIP, // 3 LINE_STRIP
Mesh::PRIMITIVE_TRIANGLES, Mesh::PRIMITIVE_TRIANGLES, // 4 TRIANGLES
Mesh::PRIMITIVE_TRIANGLE_STRIP, Mesh::PRIMITIVE_TRIANGLE_STRIP, // 5 TRIANGLE_STRIP
Mesh::PRIMITIVE_TRIANGLES, //fan not supported, should be converted Mesh::PRIMITIVE_TRIANGLES, // 6 TRIANGLE_FAN fan not supported, should be converted
#ifndef _MSC_VER #ifndef _MSC_VER
#warning line loop and triangle fan are not supported and need to be converted to lines and triangles #warning line loop and triangle fan are not supported and need to be converted to lines and triangles
#endif #endif