Initial visualization of MorphTarget

- Morphing vertex positions, but not normals/tangents yet
- Fixed loading of moprh targets: added CMorphTarget container for CMorphLod
- UE4 does conversion in USkeletalMesh4::PostLoad(), otherwise conversion may be performed before morph is serialized

Author: gildor2

MeshInstance/MeshInstance.h

@@ -137,7 +137,8 @@ class CSkelMeshInstance : public CMeshInstance
 	CSkeletalMesh	*pMesh;
 
 	// mesh state
-	int			LodNum;
+	int			LodIndex;
+	int			MorphIndex;
 	int			UVIndex;
 	int			RotationMode;				// EAnimRotationOnly
 
@@ -148,7 +149,6 @@ class CSkelMeshInstance : public CMeshInstance
 	void SetAnim(const CAnimSet *Anim);
 
 	void ClearSkelAnims();
-//??	void StopAnimating(bool ClearAllButBase);
 	virtual void Draw(unsigned flags = 0);
 
 	void DumpBones();
@@ -158,7 +158,6 @@ class CSkelMeshInstance : public CMeshInstance
 
 	// skeleton configuration
 	void SetBoneScale(const char *BoneName, float scale = 1.0f);
-	//!! SetBone[Direction|Location|Rotation]()
 
 	// animation control
 	void PlayAnim(const char *AnimName, float Rate = 1, float TweenTime = 0, int Channel = 0)
@@ -217,10 +216,6 @@ class CSkelMeshInstance : public CMeshInstance
 	{
 		GetStage(Channel).SecondaryBlend = BlendAlpha;
 	}
-	//?? -	AnimBlendToAlpha() - animate BlendAlpha coefficient
-	//?? -	functions to smoothly replace current animation with another in a fixed time
-	//??	(run new anim as secondary, ramp alpha from 0 to 1, and when blend becomes 1.0f
-	//??	- replace 1st anim with 2nd, and clear 2nd
 
 	// animation enumeration
 	int GetAnimCount() const;
@@ -235,13 +230,18 @@ class CSkelMeshInstance : public CMeshInstance
 	CVec3 GetMeshOrigin() const;
 
 protected:
-	const CAnimSet		 *Animation;
+	const CAnimSet*		Animation;
 	// mesh data
-	void				 *DataBlock;// all following data is resided here, aligned to 16 bytes
-	struct CMeshBoneData *BoneData;
-	struct CSkinVert     *Skinned;	// soft-skinned vertices
-	CVec3		*InfColors;			// debug: color-by-influence for vertices
-	int			LastLodNum;			// used to detect requirement to rebuild Wedges[]
+	void*				DataBlock;
+
+	// all of the following data is resides inside "DataBlock", aligned to 16 bytes
+	struct CMeshBoneData* BoneData;
+	struct CSkinVert*	Skinned;			// soft-skinned vertices
+	struct CSkelMeshVertex* MorphedVerts;
+
+	CVec3*				InfColors;			// debug: color-by-influence for vertices
+	int					LastLodIndex;		// used to detect requirement to rebuild InfColors[]
+	int					LastMorphIndex;		// used to detect requirement to rebuild MorphedVerts[]
 	// animation state
 	CAnimChan	Channels[MAX_SKELANIMCHANNELS];
 	int			MaxAnimChannel;
@@ -262,6 +262,7 @@ class CSkelMeshInstance : public CMeshInstance
 	void PlayAnimInternal(const char *AnimName, float Rate, float TweenTime, int Channel, bool Looped);
 	void UpdateSkeleton();
 	void BuildInfColors();
+	bool BuildMorphVerts();
 };
 
 

MeshInstance/SkelMeshInstance.cpp

@@ -87,10 +87,12 @@ const char *CSkelMeshInstance::GetAnimName(int Index) const
 -----------------------------------------------------------------------------*/
 
 CSkelMeshInstance::CSkelMeshInstance()
-:	LodNum(0)
+:	LodIndex(0)
+,	MorphIndex(-1)
 ,	UVIndex(0)
 ,	RotationMode(EARO_AnimSet)
-,	LastLodNum(-2)				// differs from LodNum and from all other values
+,	LastLodIndex(-2)				// differs from LodNum and from all other values
+,	LastMorphIndex(-1)
 ,	MaxAnimChannel(-1)
 ,	Animation(NULL)
 ,	DataBlock(NULL)
@@ -202,12 +204,15 @@ void CSkelMeshInstance::SetMesh(CSkeletalMesh *Mesh)
 		InfColors = NULL;
 	}
 	// allocate data arrays in a single block
-	int DataSize = sizeof(CMeshBoneData) * NumBones + sizeof(CSkinVert) * NumVerts;
+	int NumMorphVerts = Mesh->Morphs.Num() ? NumVerts : 0;
+	int DataSize = sizeof(CMeshBoneData) * NumBones + sizeof(CSkinVert) * NumVerts + sizeof(CSkelMeshVertex) * NumMorphVerts;
 	DataBlock = appMalloc(DataSize, 16);
 	BoneData  = (CMeshBoneData*)DataBlock;
 	Skinned   = (CSkinVert*)(BoneData + NumBones);
+	MorphedVerts = Mesh->Morphs.Num() ? (CSkelMeshVertex*)(Skinned + NumVerts) : NULL;
 
-	LastLodNum = -2;
+	LastLodIndex = -2;
+	LastMorphIndex = -1;
 
 	CMeshBoneData *data;
 	for (i = 0, data = BoneData; i < NumBones; i++, data++)
@@ -1003,14 +1008,16 @@ void CSkelMeshInstance::SkinMeshVerts()
 {
 	guard(CSkelMeshInstance::SkinMeshVerts);
 
-	const CSkelMeshLod& Mesh = pMesh->Lods[LodNum];
+	const CSkelMeshLod& Mesh = pMesh->Lods[LodIndex];
 	int NumVerts = Mesh.NumVerts;
 
 	memset(Skinned, 0, sizeof(CSkinVert) * NumVerts);
 
+	const CSkelMeshVertex* MeshVerts = BuildMorphVerts() ? MorphedVerts : Mesh.Verts;
+
 	for (int i = 0; i < NumVerts; i++)
 	{
-		const CSkelMeshVertex &V = Mesh.Verts[i];
+		const CSkelMeshVertex &V = MeshVerts[i];
 		CSkinVert             &D = Skinned[i];
 
 		CVec4 UnpackedWeights;
@@ -1102,7 +1109,7 @@ void CSkelMeshInstance::DrawMesh(unsigned flags)
 
 	if (!pMesh->Lods.Num()) return;
 
-	/*const*/ CSkelMeshLod& Mesh = pMesh->Lods[LodNum];	//?? not 'const' because of BuildTangents(); change this?
+	/*const*/ CSkelMeshLod& Mesh = pMesh->Lods[LodIndex];	//?? not 'const' because of BuildTangents(); change this?
 	int NumSections = Mesh.Sections.Num();
 	int NumVerts    = Mesh.NumVerts;
 	if (!NumSections || !NumVerts) return;
@@ -1356,7 +1363,7 @@ void CSkelMeshInstance::Draw(unsigned flags)
 	guard(CSkelMeshInstance::Draw);
 
 	// switch LOD model
-	if (LodNum != LastLodNum)
+	if (LodIndex != LastLodIndex)
 	{
 		// LOD has been changed
 
@@ -1365,7 +1372,7 @@ void CSkelMeshInstance::Draw(unsigned flags)
 			delete[] InfColors;
 			InfColors = NULL;
 		}
-		LastLodNum = LodNum;
+		LastLodIndex = LodIndex;
 	}
 	// draw ...
 	DrawMesh(flags);
@@ -1380,7 +1387,7 @@ void CSkelMeshInstance::BuildInfColors()
 
 	int i;
 
-	const CSkelMeshLod &Lod = pMesh->Lods[LodNum];
+	const CSkelMeshLod &Lod = pMesh->Lods[LodIndex];
 
 	if (InfColors) delete[] InfColors;
 	InfColors = new CVec3[Lod.NumVerts];
@@ -1407,4 +1414,46 @@ void CSkelMeshInstance::BuildInfColors()
 	unguard;
 }
 
+
+bool CSkelMeshInstance::BuildMorphVerts()
+{
+	guard(CSkelMeshInstance::BuildMorphVerts);
+
+	if (MorphIndex < 0)
+	{
+		// Morph is inactive
+		return false;
+	}
+
+	if (LodIndex >= pMesh->Morphs[MorphIndex]->Lods.Num())
+	{
+		// No morph information for this LOD
+		return false;
+	}
+
+	if (LastMorphIndex == MorphIndex)
+	{
+		// Already built
+		return true;
+	}
+	LastMorphIndex = MorphIndex;
+
+	const CSkelMeshLod& Lod = pMesh->Lods[LodIndex];
+	const TArray<CMorphVertex>& Deltas = pMesh->Morphs[MorphIndex]->Lods[LodIndex].Vertices;
+
+	// Copy unmodified vertices
+	memcpy(MorphedVerts, Lod.Verts, Lod.NumVerts * sizeof(CSkelMeshVertex));
+
+	// Apply delta
+	for (const CMorphVertex& Delta : Deltas)
+	{
+		CSkelMeshVertex& V = MorphedVerts[Delta.VertexIndex];
+		VectorAdd(V.Position, Delta.PositionDelta, V.Position);
+	}
+
+	return true;
+
+	unguard;
+}
+
 #endif // RENDERING

Unreal/SkeletalMesh.h

@@ -113,10 +113,15 @@ struct CMorphVertex
 
 struct CMorphLod
 {
-	FString					Name;
 	TArray<CMorphVertex>	Vertices;
 };
 
+struct CMorphTarget
+{
+	FString					Name;
+	TArray<CMorphLod>		Lods;
+};
+
 struct CSkelMeshSocket
 {
 	FName					Name;
@@ -143,7 +148,7 @@ class CSkeletalMesh
 	FRotator				RotOrigin;
 	TArray<CSkelMeshBone>	RefSkeleton;
 	TArray<CSkelMeshLod>	Lods;
-	TArray<CMorphLod*>		Morphs;
+	TArray<CMorphTarget*>	Morphs;
 	TArray<CSkelMeshSocket>	Sockets;				//?? common (UE4 has StaticMesh sockets)
 	const class CAnimSet*	Anim;
 
@@ -154,7 +159,7 @@ class CSkeletalMesh
 
 	~CSkeletalMesh()
 	{
-		for (CMorphLod* morph : Morphs)
+		for (CMorphTarget* morph : Morphs)
 		{
 			delete morph;
 		}

Unreal/UnMesh.h

@@ -20,7 +20,7 @@ void UnpackNormals(const FPackedNormal SrcNormal[3], CMeshVertex &V);
 //?? move these declarations outside
 class CSkeletalMesh;
 struct CSkelMeshLod;
-struct CMorphLod;
+struct CMorphTarget;
 class CAnimSet;
 class CAnimSequence;
 class CStaticMesh;

Unreal/UnMesh3.cpp

@@ -96,20 +96,22 @@ void FMorphTargetLODModel::Serialize3(FArchive& Ar, FMorphTargetLODModel& Lod)
 	unguard;
 }
 
-CMorphLod* UMorphTarget::ConvertMorph()
+CMorphTarget* UMorphTarget::ConvertMorph()
 {
-	CMorphLod* morph = new CMorphLod;
+	CMorphTarget* morph = new CMorphTarget;
 	morph->Name = Name;
 
 	for (int lodIndex = 0; lodIndex < MorphLODModels.Num(); lodIndex++)
 	{
 		const FMorphTargetLODModel& SrcLod = MorphLODModels[lodIndex];
+		CMorphLod* Lod = new (morph->Lods) CMorphLod;
+
 		int NumVerts = SrcLod.Vertices.Num();
-		morph->Vertices.AddDefaulted(NumVerts);
+		Lod->Vertices.AddDefaulted(NumVerts);
 		for (int i = 0; i < NumVerts; i++)
 		{
 			const FMorphTargetDelta& SV = SrcLod.Vertices[i];
-			CMorphVertex& V = morph->Vertices[i];
+			CMorphVertex& V = Lod->Vertices[i];
 			V.PositionDelta = CVT(SV.PositionDelta);
 			V.NormalDelta = CVT(SV.TangentZDelta);
 			V.VertexIndex = SV.SourceIdx;

Unreal/UnMesh3.h

@@ -75,7 +75,7 @@ class UMorphTarget : public UObject
 		Serialize3(Ar);
 	}
 
-	CMorphLod* ConvertMorph();
+	CMorphTarget* ConvertMorph();
 
 #if UNREAL4
 	BEGIN_PROP_TABLE

Unreal/UnMesh4.cpp

@@ -1546,6 +1546,21 @@ void USkeletalMesh4::Serialize(FArchive &Ar)
 	unguard;
 }
 
+void USkeletalMesh4::PostLoad()
+{
+	guard(USkeletalMesh4::PostLoad);
+
+	assert(ConvertedMesh);
+	for (int i = 0; i < MorphTargets.Num(); i++)
+	{
+		guard(ConvertMorph)
+		if (MorphTargets[i])
+			ConvertedMesh->Morphs.Add(MorphTargets[i]->ConvertMorph());
+		unguardf("%d/%d", i, MorphTargets.Num());
+	}
+
+	unguard;
+}
 
 void USkeletalMesh4::ConvertMesh()
 {
@@ -1753,14 +1768,6 @@ void USkeletalMesh4::ConvertMesh()
 	}
 	unguard; // ProcessSkeleton
 
-	for (int i = 0; i < MorphTargets.Num(); i++)
-	{
-		guard(ConvertMorph)
-		if (MorphTargets[i])
-			Mesh->Morphs.Add(MorphTargets[i]->ConvertMorph());
-		unguardf("%d/%d", i, MorphTargets.Num());
-	}
-
 	Mesh->FinalizeMesh();
 
 	unguard;

Unreal/UnMesh4.h

@@ -222,6 +222,7 @@ class USkeletalMesh4 : public UObject
 	virtual ~USkeletalMesh4();
 
 	virtual void Serialize(FArchive &Ar);
+	virtual void PostLoad();
 
 protected:
 	void ConvertMesh();

Viewers/ObjectViewer.h

@@ -153,7 +153,6 @@ class CSkelMeshViewer : public CMeshViewer
 {
 public:
 	int				AnimIndex;
-	int				MorphIndex;
 	bool			IsFollowingMesh;
 	int				ShowSkel;					// 0 - mesh, 1 - mesh+skel, 2 - skel only
 	bool			ShowLabels;