godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fixes how transform is applied to geometry in UV unwrap

Browse Source
This commit is contained in:
Juan Linietsky
2017-12-17 12:04:35 -03:00
parent cacab4ba62
commit fa8a1fc420
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/import/resource_importer_scene.cpp
View File

@@ -849,15 +849,15 @@ void ResourceImporterScene::_find_meshes(Node *p_node, Map<Ref<ArrayMesh>, Trans
if (mesh.is_valid() && !meshes.has(mesh)) { if (mesh.is_valid() && !meshes.has(mesh)) {
Spatial *s = mi; Spatial *s = mi;
while (s->get_parent_spatial()) { Transform transform;
while (s) {
transform = transform * s->get_transform();
s = s->get_parent_spatial(); s = s->get_parent_spatial();
} }
if (s == mi) { meshes[mesh] = transform;
meshes[mesh] = s->get_transform();
} else { print_line("mesh transform: " + meshes[mesh]);
meshes[mesh] = s->get_transform() * mi->get_relative_transform(s);
}
} }
} }
for (int i = 0; i < p_node->get_child_count(); i++) { for (int i = 0; i < p_node->get_child_count(); i++) {

7
scene/resources/mesh.cpp
View File

@@ -1111,13 +1111,14 @@ Error ArrayMesh::lightmap_unwrap(const Transform &p_base_transform, float p_texe
for (int j = 0; j < vc; j++) { for (int j = 0; j < vc; j++) {
Vector3 v = p_base_transform.xform(r[j]); Vector3 v = p_base_transform.xform(r[j]);
Vector3 n = p_base_transform.basis.xform(rn[j]).normalized();
vertices[(j + vertex_ofs) * 3 + 0] = v.x; vertices[(j + vertex_ofs) * 3 + 0] = v.x;
vertices[(j + vertex_ofs) * 3 + 1] = v.y; vertices[(j + vertex_ofs) * 3 + 1] = v.y;
vertices[(j + vertex_ofs) * 3 + 2] = v.z; vertices[(j + vertex_ofs) * 3 + 2] = v.z;
normals[(j + vertex_ofs) * 3 + 0] = rn[j].x; normals[(j + vertex_ofs) * 3 + 0] = n.x;
normals[(j + vertex_ofs) * 3 + 1] = rn[j].y; normals[(j + vertex_ofs) * 3 + 1] = n.y;
normals[(j + vertex_ofs) * 3 + 2] = rn[j].z; normals[(j + vertex_ofs) * 3 + 2] = n.z;
uv_index[j + vertex_ofs] = Pair<int, int>(i, j); uv_index[j + vertex_ofs] = Pair<int, int>(i, j);
} }