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

ModelingComponents: make FMeshDescription returned by IMeshDescriptionProvider const, this pointer should not be modified

Browse Source 
#rb none
#rnx
#jira none
#preflight 60c5024af7cffb0001d3fdfa
[FYI] semion.piskarev, lonnie.li

#ROBOMERGE-SOURCE: CL 16652350 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16652352 by ryan schmidt in ue5-release-engine-test branch]
This commit is contained in:
ryan schmidt
2021-06-12 15:46:24 -04:00
parent 98140ab634
commit f8093923a4
15 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Plugins/Experimental/MeshModelingToolset/Source/MeshModelingToolsEditorOnly/Private/AttributeEditorTool.cpp
+29 -9
View File
@@ -153,7 +153,7 @@ void UAttributeEditorTool::Setup()
template<typename AttribSetType>
void ExtractAttribList(FMeshDescription* Mesh, AttribSetType& AttribSet, EAttributeEditorElementType ElemType, TArray<FAttributeEditorAttribInfo>& AttribList, TArray<FString>& StringList)
void ExtractAttribList(const FMeshDescription* Mesh, AttribSetType& AttribSet, EAttributeEditorElementType ElemType, TArray<FAttributeEditorAttribInfo>& AttribList, TArray<FString>& StringList)
{
AttribList.Reset();
StringList.Reset();
@@ -209,6 +209,26 @@ void ExtractAttribList(FMeshDescription* Mesh, AttribSetType& AttribSet, EAttrib
static const FAttributesSetBase* GetAttributeSetByType(const FMeshDescription* Mesh, EAttributeEditorElementType ElemType)
{
switch (ElemType)
{
case EAttributeEditorElementType::Vertex:
return &Mesh->VertexAttributes();
case EAttributeEditorElementType::VertexInstance:
return &Mesh->VertexInstanceAttributes();
case EAttributeEditorElementType::Triangle:
return &Mesh->TriangleAttributes();
case EAttributeEditorElementType::Polygon:
return &Mesh->PolygonAttributes();
case EAttributeEditorElementType::Edge:
return &Mesh->EdgeAttributes();
case EAttributeEditorElementType::PolygonGroup:
return &Mesh->PolygonGroupAttributes();
}
check(false);
return nullptr;
}
static FAttributesSetBase* GetAttributeSetByType(FMeshDescription* Mesh, EAttributeEditorElementType ElemType)
{
switch (ElemType)
@@ -230,9 +250,10 @@ static FAttributesSetBase* GetAttributeSetByType(FMeshDescription* Mesh, EAttrib
return nullptr;
}
static bool HasAttribute(FMeshDescription* Mesh, EAttributeEditorElementType ElemType, FName AttributeName)
static bool HasAttribute(const FMeshDescription* Mesh, EAttributeEditorElementType ElemType, FName AttributeName)
{
FAttributesSetBase* AttribSetBase = GetAttributeSetByType(Mesh, ElemType);
const FAttributesSetBase* AttribSetBase = GetAttributeSetByType(Mesh, ElemType);
return (AttribSetBase) ? AttribSetBase->HasAttribute(AttributeName) : false;
}
@@ -283,10 +304,9 @@ static bool RemoveAttribute(FMeshDescription* Mesh, EAttributeEditorElementType
void UAttributeEditorTool::InitializeAttributeLists()
{
FMeshDescription* Mesh = TargetMeshProviderInterface(0)->GetMeshDescription();
const FMeshDescription* Mesh = TargetMeshProviderInterface(0)->GetMeshDescription();
TVertexInstanceAttributesRef<FVector2D> InstanceUVs =
TVertexInstanceAttributesConstRef<FVector2D> InstanceUVs =
Mesh->VertexInstanceAttributes().GetAttributesRef<FVector2D>(MeshAttribute::VertexInstance::TextureCoordinate);
UVActions->UVLayerNamesList.Reset();
@@ -662,7 +682,7 @@ void UAttributeEditorTool::AddNewAttribute(EAttributeEditorElementType ElemType,
return;
}
FMeshDescription* CurMesh = TargetMeshProviderInterface(0)->GetMeshDescription();
const FMeshDescription* CurMesh = TargetMeshProviderInterface(0)->GetMeshDescription();
if (HasAttribute(CurMesh, ElemType, AttributeName))
{
GetToolManager()->DisplayMessage(LOCTEXT("ErrorAddingDuplicateNameMessage", "Attribute with this name already exists"), EToolMessageLevel::UserWarning);
@@ -715,7 +735,7 @@ void UAttributeEditorTool::ClearAttribute()
void UAttributeEditorTool::DeleteAttribute()
{
FMeshDescription* CurMesh = TargetMeshProviderInterface(0)->GetMeshDescription();
const FMeshDescription* CurMesh = TargetMeshProviderInterface(0)->GetMeshDescription();
FName SelectedName(ModifyAttributeProps->Attribute);
// We check on the skeletal mesh attributes because it is a superset of the static mesh
@@ -791,7 +811,7 @@ void UAttributeEditorTool::ResetLightmapUVsChannels()
GetToolManager()->BeginUndoTransaction(LOCTEXT("ResetLightmapUVs", "Reset Lightmap UVs"));
for (int32 ComponentIdx = 0; ComponentIdx < Targets.Num(); ComponentIdx++)
{
TVertexInstanceAttributesRef<FVector2D> InstanceUVs =
TVertexInstanceAttributesConstRef<FVector2D> InstanceUVs =
TargetMeshProviderInterface(ComponentIdx)->GetMeshDescription()->VertexInstanceAttributes().GetAttributesRef<FVector2D>(MeshAttribute::VertexInstance::TextureCoordinate);
int32 SetChannel = FMath::Max(InstanceUVs.GetNumChannels(), 1);