asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #57969 from fazil47/csg-export-fbx-fix

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-11 22:53:00 +01:00 committed by GitHub
commit 3e3b858814
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/gltf/gltf_document.cpp
View file

@ -5322,14 +5322,31 @@ void GLTFDocument::_convert_csg_shape_to_gltf(CSGShape3D *p_current, GLTFNodeInd
if (meshes.size() != 2) { if (meshes.size() != 2) {
return; return;
} }
Ref<Material> mat;
if (csg->get_material_override().is_valid()) { Ref<ImporterMesh> mesh;
mat = csg->get_material_override(); mesh.instantiate();
{
Ref<Mesh> csg_mesh = csg->get_meshes()[1];
for (int32_t surface_i = 0; surface_i < csg_mesh->get_surface_count(); surface_i++) {
Array array = csg_mesh->surface_get_arrays(surface_i);
Ref<Material> mat = csg_mesh->surface_get_material(surface_i);
String mat_name;
if (mat.is_valid()) {
mat_name = mat->get_name();
} else {
// Assign default material when no material is assigned.
mat = Ref<StandardMaterial3D>(memnew(StandardMaterial3D));
}
mesh->add_surface(csg_mesh->surface_get_primitive_type(surface_i),
array, csg_mesh->surface_get_blend_shape_arrays(surface_i), csg_mesh->surface_get_lods(surface_i), mat,
mat_name, csg_mesh->surface_get_format(surface_i));
}
} }
Ref<GLTFMesh> gltf_mesh; Ref<GLTFMesh> gltf_mesh;
gltf_mesh.instantiate(); gltf_mesh.instantiate();
Ref<ImporterMesh> array_mesh = csg->get_meshes()[1]; gltf_mesh->set_mesh(mesh);
gltf_mesh->set_mesh(array_mesh);
GLTFMeshIndex mesh_i = state->meshes.size(); GLTFMeshIndex mesh_i = state->meshes.size();
state->meshes.push_back(gltf_mesh); state->meshes.push_back(gltf_mesh);
gltf_node->mesh = mesh_i; gltf_node->mesh = mesh_i;