Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-22 01:34:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

material name before file name

Browse Source
This commit is contained in:
iAmAsval 2021-12-09 23:22:00 +01:00
parent 13ebe99862
commit 45f4e9a476
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit cf93fb7ad93af74994f736db6cc134250e165a53
Subproject commit 1fc543a0434c8a2aa020443a377659fd4a908895

10
FModel/ViewModels/ModelViewerViewModel.cs
View File

@ -313,10 +313,11 @@ namespace FModel.ViewModels
Application.Current.Dispatcher.Invoke(() =>
{
var s = FixName(materialInstance.Name);
cam.Group3d.Add(new MeshGeometryModel3D
{
Transform = new RotateTransform3D(new AxisAngleRotation3D(new Vector3D(1,0,0), -90)),
Name = FixName(materialInstance.Name), Geometry = builder.ToMeshGeometry3D(),
Tag = s, Name = s, Geometry = builder.ToMeshGeometry3D(),
Material = m, IsTransparent = isTransparent, IsRendering = isRendering
});
});
@ -385,8 +386,9 @@ namespace FModel.ViewModels
{
cam.Group3d.Add(new MeshGeometryModel3D
{
Name = FixName(unrealMaterial.Name), Geometry = builder.ToMeshGeometry3D(),
Material = m, IsTransparent = isTransparent, IsRendering = isRendering
Name = unrealMaterial.Name, Tag = FixName(section.MaterialName ?? unrealMaterial.Name),
Geometry = builder.ToMeshGeometry3D(), Material = m, IsTransparent = isTransparent,
IsRendering = isRendering
});
});
}
@ -585,7 +587,7 @@ namespace FModel.ViewModels
if (int.TryParse(input[0].ToString(), out _))
input = input[1..];
return input.Replace('-', '_');
return input;
}
private bool CheckIfSaved(string path)

2
FModel/Views/ModelViewer.xaml
View File

@ -23,7 +23,7 @@
</adonisControls:AdonisWindow.Resources>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" MinWidth="350" />
<ColumnDefinition Width="350" MinWidth="250" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="4*" />
</Grid.ColumnDefinitions>

2
FModel/Views/Resources/Resources.xaml
View File

@ -657,7 +657,7 @@
</Grid.ColumnDefinitions>
<Image Grid.Column="0" Source="/FModel;component/Resources/materialicon.png" Width="16" Height="16" Margin="5 0" HorizontalAlignment="Center" />
<TextBlock Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Name}" TextTrimming="CharacterEllipsis" />
<TextBlock Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding Tag}" TextTrimming="CharacterEllipsis" />
<ToggleButton Grid.Column="3" IsChecked="{Binding IsRendering}" Padding="3" Style="{DynamicResource {x:Static adonisUi:Styles.ToolbarToggleButton}}">
<Viewbox Width="16" Height="16" HorizontalAlignment="Center">
<Canvas Width="24" Height="24">