GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix prefab scale and rotation.

Browse Source
This commit is contained in:
Menotdan
2024-01-01 19:11:45 -05:00
parent b275ffc146
commit 045943ef27
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/ContentImporters/ImportModel.cpp
View File

@@ -665,7 +665,9 @@ CreateAssetResult ImportModel::CreatePrefab(CreateAssetContext& context, ModelDa
// Setup node in hierarchy // Setup node in hierarchy
nodeToActor.Add(nodeIndex, nodeActor); nodeToActor.Add(nodeIndex, nodeActor);
nodeActor->SetName(node.Name); nodeActor->SetName(node.Name);
nodeActor->SetLocalTransform(node.LocalTransform);
// Only set translation, since scale and rotation is applied earlier.
nodeActor->SetLocalTransform(Transform(node.LocalTransform.Translation));
if (nodeIndex == 0) if (nodeIndex == 0)
{ {
// Special case for root actor to link any unlinked nodes // Special case for root actor to link any unlinked nodes

10
Source/Engine/Tools/ModelTool/ModelTool.cpp
View File

@@ -1292,7 +1292,7 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
! !
#endif #endif
} }
if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Geometry) && options.Type != ModelType::Prefab) if (EnumHasAnyFlags(options.ImportTypes, ImportDataTypes::Geometry))
{ {
// Perform simple nodes mapping to single node (will transform meshes to model local space) // Perform simple nodes mapping to single node (will transform meshes to model local space)
SkeletonMapping<ModelDataNode> skeletonMapping(data.Nodes, nullptr); SkeletonMapping<ModelDataNode> skeletonMapping(data.Nodes, nullptr);
@@ -1312,7 +1312,13 @@ bool ModelTool::ImportModel(const String& path, ModelData& data, Options& option
if (skeletonMapping.SourceToSource[mesh.NodeIndex] != mesh.NodeIndex) if (skeletonMapping.SourceToSource[mesh.NodeIndex] != mesh.NodeIndex)
{ {
// Transform vertices // Transform vertices
const auto transformationMatrix = hierarchyUpdater.CombineMatricesFromNodeIndices(skeletonMapping.SourceToSource[mesh.NodeIndex], mesh.NodeIndex); auto transformationMatrix = hierarchyUpdater.CombineMatricesFromNodeIndices(skeletonMapping.SourceToSource[mesh.NodeIndex], mesh.NodeIndex);
if (options.Type == ModelType::Prefab)
{
// Cancel out translation during mesh transformation, to set translation during prefab generation time.
transformationMatrix = transformationMatrix * transformationMatrix.Translation(transformationMatrix.GetTranslation() * -1.0f);
}
if (!transformationMatrix.IsIdentity()) if (!transformationMatrix.IsIdentity())
mesh.TransformBuffer(transformationMatrix); mesh.TransformBuffer(transformationMatrix);
} }