izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix mesh reduction bugs due to replacing TSimpVert with FLerpVert.

Browse Source 
#rb rune.stubbe

[CL 26720922 by brian karis in ue5-main branch]
This commit is contained in:
brian karis
2023-07-31 17:02:36 -04:00
parent 9cb24adb4b
commit e634ee40dc
2 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Engine/Source/Developer/MeshSimplifier/Private/QuadricMeshReduction.cpp
View File

@@ -40,20 +40,43 @@ IMPLEMENT_MODULE(FQuadricSimplifierMeshReductionModule, QuadricMeshReduction);
void CorrectAttributes( float* Attributes )
{
FVector3f& Normal = *reinterpret_cast< FVector3f* >( Attributes );
FVector3f& TangentX = *reinterpret_cast< FVector3f* >( Attributes + 3 );
FVector3f& TangentY = *reinterpret_cast< FVector3f* >( Attributes + 3 + 3 );
FVector3f& TangentX = *reinterpret_cast< FVector3f* >( Attributes );
FVector3f& TangentY = *reinterpret_cast< FVector3f* >( Attributes + 3 );
FVector3f& TangentZ = *reinterpret_cast< FVector3f* >( Attributes + 3 + 3 );
FLinearColor& Color = *reinterpret_cast< FLinearColor* >( Attributes + 3 + 3 + 3 );
Normal.Normalize();
TangentX -= ( TangentX | Normal ) * Normal;
TangentZ.Normalize();
TangentX -= ( TangentX | TangentZ ) * TangentZ;
TangentX.Normalize();
TangentY -= ( TangentY | Normal ) * Normal;
TangentY -= ( TangentY | TangentZ ) * TangentZ;
TangentY -= ( TangentY | TangentX ) * TangentX;
TangentY.Normalize();
Color = Color.GetClamped();
}
bool VertsEqual( const FLerpVert& A, const FLerpVert& B )
{
if( !PointsEqual( A.Position, B.Position ) ||
!NormalsEqual( A.TangentX, B.TangentX ) ||
!NormalsEqual( A.TangentY, B.TangentY ) ||
!NormalsEqual( A.TangentZ, B.TangentZ ) ||
!A.Color.Equals( B.Color ) )
{
return false;
}
// UVs
for( int32 UVIndex = 0; UVIndex < MAX_STATIC_TEXCOORDS; UVIndex++ )
{
if( !UVsEqual( A.UVs[ UVIndex ], B.UVs[ UVIndex ] ) )
{
return false;
}
}
return true;
}
class FQuadricSimplifierMeshReduction : public IMeshReduction
{
public:
@@ -192,27 +215,11 @@ public:
if (Location)
{
FLerpVert& FoundVert = Verts[*Location];
if( !PointsEqual( NewVert.Position, FoundVert.Position ) ||
!NormalsEqual( NewVert.TangentX, FoundVert.TangentX ) ||
!NormalsEqual( NewVert.TangentY, FoundVert.TangentY ) ||
!NormalsEqual( NewVert.TangentZ, FoundVert.TangentZ ) ||
!NewVert.Color.Equals( FoundVert.Color ) )
if( VertsEqual( NewVert, FoundVert ) )
{
continue;
Index = *Location;
break;
}
// UVs
for( int32 UVIndex = 0; UVIndex < NumTexCoords; UVIndex++ )
{
if( !UVsEqual( NewVert.UVs[ UVIndex ], FoundVert.UVs[ UVIndex ] ) )
{
continue;
}
}
Index = *Location;
break;
}
}
if (Index == INDEX_NONE)
@@ -278,9 +285,9 @@ public:
const uint32 NumAttributes = ( sizeof( FLerpVert ) - sizeof( FVector3f ) ) / sizeof(float);
float AttributeWeights[ NumAttributes ] =
{
16.0f, 16.0f, 16.0f,// Normal
0.1f, 0.1f, 0.1f, // Tangent[0]
0.1f, 0.1f, 0.1f // Tangent[1]
0.1f, 0.1f, 0.1f, // Tangent[1]
16.0f, 16.0f, 16.0f // Normal
};
float* ColorWeights = AttributeWeights + 9;
float* UVWeights = ColorWeights + 4;

1
Engine/Source/Runtime/Core/Private/UObject/UE5ReleaseStreamObjectVersion.cpp
View File

@@ -14,6 +14,7 @@ TMap<FGuid, FGuid> FUE5ReleaseStreamObjectVersion::GetSystemGuids()
SystemGuids.Add(DevGuids.NIAGARASHADERMAP_DERIVEDDATA_VER, FGuid("6BE35B6FACB34568970120F9BC8DAB80"));
SystemGuids.Add(DevGuids.Niagara_LatestScriptCompileVersion, FGuid("43A777C54EB24E9894525B8D04529F23"));
SystemGuids.Add(DevGuids.SkeletalMeshDerivedDataVersion, FGuid("25C49E579B3142DDA2A8C14037267679"));
SystemGuids.Add(DevGuids.STATICMESH_DERIVEDDATA_VER, FGuid("7A556175518D458AA8786ED69AB8DDE7"));
return SystemGuids;
}