Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-04-20 00:27:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FModel v.4.4.3.4

Browse Source
This commit is contained in:
Asval 2023-10-28 19:40:36 +02:00
parent 73e027c867
commit db07574a61
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FModel/FModel.csproj
View File

@ -5,9 +5,9 @@
<TargetFramework>net6.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon>FModel.ico</ApplicationIcon>
<Version>4.4.3.3</Version>
<AssemblyVersion>4.4.3.3</AssemblyVersion>
<FileVersion>4.4.3.3</FileVersion>
<Version>4.4.3.4</Version>
<AssemblyVersion>4.4.3.4</AssemblyVersion>
<FileVersion>4.4.3.4</FileVersion>
<IsPackable>false</IsPackable>
<IsPublishable>true</IsPublishable>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

8
FModel/Settings/UserSettings.cs
View File

@ -424,11 +424,11 @@ namespace FModel.Settings
set => SetProperty(ref _saveMorphTargets, value);
}
private bool _saveMeshMaterials = true;
public bool SaveMeshMaterials
private bool _saveEmbeddedMaterials = true;
public bool SaveEmbeddedMaterials
{
get => _saveMeshMaterials;
set => SetProperty(ref _saveMeshMaterials, value);
get => _saveEmbeddedMaterials;
set => SetProperty(ref _saveEmbeddedMaterials, value);
}
private bool _saveSkeletonAsMesh;

2
FModel/ViewModels/CUE4ParseViewModel.cs
View File

@ -986,7 +986,7 @@ public class CUE4ParseViewModel : ViewModel
SocketFormat = UserSettings.Default.SocketExportFormat,
Platform = UserSettings.Default.CurrentDir.TexturePlatform,
ExportMorphTargets = UserSettings.Default.SaveMorphTargets,
ExportMaterials = UserSettings.Default.SaveMeshMaterials
ExportMaterials = UserSettings.Default.SaveEmbeddedMaterials
};
var toSave = new Exporter(export, exportOptions);

4
FModel/Views/SettingsView.xaml
View File

@ -387,9 +387,9 @@
IsChecked="{Binding PreviewWorlds, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" Margin="0 5 0 5"/>
<TextBlock Grid.Row="10" Grid.Column="0" Text="Save Materials in Meshes" VerticalAlignment="Center" Margin="0 0 0 5" />
<TextBlock Grid.Row="10" Grid.Column="0" Text="Save Materials Embedded within Meshes" VerticalAlignment="Center" Margin="0 0 0 5" />
<CheckBox Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="3" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
IsChecked="{Binding SaveMeshMaterials, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
IsChecked="{Binding SaveEmbeddedMaterials, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" Margin="0 5 0 5"/>
<TextBlock Grid.Row="11" Grid.Column="0" Text="Save Morph Targets in Meshes" VerticalAlignment="Center" Margin="0 0 0 5" />

2
FModel/Views/Snooper/Models/UModel.cs
View File

@ -366,7 +366,7 @@ public abstract class UModel : IRenderableModel
SocketFormat = UserSettings.Default.SocketExportFormat,
Platform = UserSettings.Default.CurrentDir.TexturePlatform,
ExportMorphTargets = UserSettings.Default.SaveMorphTargets,
ExportMaterials = UserSettings.Default.SaveMeshMaterials
ExportMaterials = UserSettings.Default.SaveEmbeddedMaterials
};
var toSave = new Exporter(_export, exportOptions);
return toSave.TryWriteToDir(new DirectoryInfo(UserSettings.Default.ModelDirectory), out label, out savedFilePath);