Gittes-archive/AssetRipper_AssetRipper
2
0
Fork 0
mirror of https://github.com/AssetRipper/AssetRipper.git synced 2025-12-11 20:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reassign BundleAssetsExportMode.DirectExport to be the default

Browse Source
This commit is contained in:
ds5678 2024-07-05 03:53:35 -04:00
parent 2dd84a059e
commit b140a5397b
11 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/AssetRipper.Export.UnityProjects/Configuration/LibraryConfiguration.cs
View File

@ -1,5 +1,6 @@
using AssetRipper.Import.Configuration;
using AssetRipper.Mining.PredefinedAssets;
using AssetRipper.Processing.Configuration;
namespace AssetRipper.Export.UnityProjects.Configuration;

1
Source/AssetRipper.Export.UnityProjects/Configuration/SerializedSettings.cs
View File

@ -1,5 +1,6 @@
using AssetRipper.Import.Configuration;
using AssetRipper.Import.Utils;
using AssetRipper.Processing.Configuration;
using System.Text.Json;
namespace AssetRipper.Export.UnityProjects.Configuration;

2
Source/AssetRipper.Export.UnityProjects/ExportHandler.cs
View File

@ -65,7 +65,7 @@ public class ExportHandler
yield return new MainAssetProcessor();
yield return new AnimatorControllerProcessor();
yield return new AudioMixerProcessor();
yield return new EditorFormatProcessor(Settings.ImportSettings.BundledAssetsExportMode);
yield return new EditorFormatProcessor(Settings.ProcessingSettings.BundledAssetsExportMode);
//Static mesh separation goes here
if (Settings.ProcessingSettings.EnablePrefabOutlining)
{

2
Source/AssetRipper.GUI.SourceGenerator/SettingsPageGenerator.cs
View File

@ -1,5 +1,6 @@
using AssetRipper.Export.UnityProjects.Configuration;
using AssetRipper.Import.Configuration;
using AssetRipper.Processing.Configuration;
using AssetRipper.Text.SourceGeneration;
using System.CodeDom.Compiler;
using System.Diagnostics;
@ -22,6 +23,7 @@ internal static class SettingsPageGenerator
writer.WriteUsing("AssetRipper.Export.UnityProjects.Configuration");
writer.WriteUsing("AssetRipper.GUI.Web.Pages.Settings.DropDown");
writer.WriteUsing("AssetRipper.Import.Configuration");
writer.WriteUsing("AssetRipper.Processing.Configuration");
writer.WriteLineNoTabs();
writer.WriteFileScopedNamespace("AssetRipper.GUI.Web.Pages.Settings");
writer.WriteLineNoTabs();

2
Source/AssetRipper.GUI.Web/Pages/Settings/DropDown/BundledAssetsExportModeDropDownSetting.cs
View File

@ -1,4 +1,4 @@
using AssetRipper.Import.Configuration;
using AssetRipper.Processing.Configuration;
namespace AssetRipper.GUI.Web.Pages.Settings.DropDown;

15
Source/AssetRipper.GUI.Web/Pages/Settings/SettingsPage.g.cs
View File

@ -3,6 +3,7 @@
using AssetRipper.Export.UnityProjects.Configuration;
using AssetRipper.GUI.Web.Pages.Settings.DropDown;
using AssetRipper.Import.Configuration;
using AssetRipper.Processing.Configuration;
namespace AssetRipper.GUI.Web.Pages.Settings;
@ -26,8 +27,8 @@ partial class SettingsPage
case nameof(ImportSettings.TargetVersion):
Configuration.ImportSettings.TargetVersion = TryParseUnityVersion(value);
break;
case nameof(ImportSettings.BundledAssetsExportMode):
Configuration.ImportSettings.BundledAssetsExportMode = TryParseEnum<BundledAssetsExportMode>(value);
case nameof(ProcessingSettings.BundledAssetsExportMode):
Configuration.ProcessingSettings.BundledAssetsExportMode = TryParseEnum<BundledAssetsExportMode>(value);
break;
case nameof(ExportSettings.AudioExportFormat):
Configuration.ExportSettings.AudioExportFormat = TryParseEnum<AudioExportFormat>(value);
@ -86,11 +87,6 @@ partial class SettingsPage
WriteDropDown(writer, StreamingAssetsModeDropDownSetting.Instance, Configuration.ImportSettings.StreamingAssetsMode, nameof(ImportSettings.StreamingAssetsMode));
}
private static void WriteDropDownForBundledAssetsExportMode(TextWriter writer)
{
WriteDropDown(writer, BundledAssetsExportModeDropDownSetting.Instance, Configuration.ImportSettings.BundledAssetsExportMode, nameof(ImportSettings.BundledAssetsExportMode));
}
private static void WriteCheckBoxForEnablePrefabOutlining(TextWriter writer, string label)
{
WriteCheckBox(writer, label, Configuration.ProcessingSettings.EnablePrefabOutlining, nameof(ProcessingSettings.EnablePrefabOutlining));
@ -106,6 +102,11 @@ partial class SettingsPage
WriteCheckBox(writer, label, Configuration.ProcessingSettings.EnableAssetDeduplication, nameof(ProcessingSettings.EnableAssetDeduplication));
}
private static void WriteDropDownForBundledAssetsExportMode(TextWriter writer)
{
WriteDropDown(writer, BundledAssetsExportModeDropDownSetting.Instance, Configuration.ProcessingSettings.BundledAssetsExportMode, nameof(ProcessingSettings.BundledAssetsExportMode));
}
private static void WriteDropDownForAudioExportFormat(TextWriter writer)
{
WriteDropDown(writer, AudioExportFormatDropDownSetting.Instance, Configuration.ExportSettings.AudioExportFormat, nameof(ExportSettings.AudioExportFormat));

3
Source/AssetRipper.Import/Configuration/ImportSettings.cs
View File

@ -38,14 +38,11 @@ public sealed record class ImportSettings
/// </summary>
public UnityVersion TargetVersion { get; set; }
public BundledAssetsExportMode BundledAssetsExportMode { get; set; }
public void Log()
{
Logger.Info(LogCategory.General, $"{nameof(ScriptContentLevel)}: {ScriptContentLevel}");
Logger.Info(LogCategory.General, $"{nameof(StreamingAssetsMode)}: {StreamingAssetsMode}");
Logger.Info(LogCategory.General, $"{nameof(DefaultVersion)}: {DefaultVersion}");
Logger.Info(LogCategory.General, $"{nameof(TargetVersion)}: {TargetVersion}");
Logger.Info(LogCategory.General, $"{nameof(BundledAssetsExportMode)}: {BundledAssetsExportMode}");
}
}

2
Source/AssetRipper.Import/Configuration/BundledAssetsExportMode.cs → Source/AssetRipper.Processing/Configuration/BundledAssetsExportMode.cs
View File

@ -1,4 +1,4 @@
namespace AssetRipper.Import.Configuration
namespace AssetRipper.Processing.Configuration
{
public enum BundledAssetsExportMode
{

8
Source/AssetRipper.Export.UnityProjects/Configuration/ProcessingSettings.cs → Source/AssetRipper.Processing/Configuration/ProcessingSettings.cs
View File

@ -1,17 +1,19 @@
using AssetRipper.Import.Logging;
namespace AssetRipper.Export.UnityProjects.Configuration;
namespace AssetRipper.Processing.Configuration;
public sealed record class ProcessingSettings
{
public bool EnablePrefabOutlining { get; set; }
public bool EnablePrefabOutlining { get; set; } = false;
public bool EnableStaticMeshSeparation { get; set; } = true;
public bool EnableAssetDeduplication { get; set; }
public bool EnableAssetDeduplication { get; set; } = false;
public BundledAssetsExportMode BundledAssetsExportMode { get; set; } = BundledAssetsExportMode.DirectExport;
public void Log()
{
Logger.Info(LogCategory.General, $"{nameof(EnablePrefabOutlining)}: {EnablePrefabOutlining}");
Logger.Info(LogCategory.General, $"{nameof(EnableStaticMeshSeparation)}: {EnableStaticMeshSeparation}");
Logger.Info(LogCategory.General, $"{nameof(EnableAssetDeduplication)}: {EnableAssetDeduplication}");
Logger.Info(LogCategory.General, $"{nameof(BundledAssetsExportMode)}: {BundledAssetsExportMode}");
}
}

2
Source/AssetRipper.Processing/Editor/EditorFormatProcessor.cs
View File

@ -2,12 +2,12 @@ using AssetRipper.Assets;
using AssetRipper.Assets.Bundles;
using AssetRipper.Assets.Collections;
using AssetRipper.Import.AssetCreation;
using AssetRipper.Import.Configuration;
using AssetRipper.Import.Logging;
using AssetRipper.Import.Structure.Assembly.Managers;
using AssetRipper.Import.Structure.Assembly.Serializable;
using AssetRipper.IO.Files.SerializedFiles;
using AssetRipper.Processing.AnimationClips;
using AssetRipper.Processing.Configuration;
using AssetRipper.SourceGenerated.Classes.ClassID_1;
using AssetRipper.SourceGenerated.Classes.ClassID_142;
using AssetRipper.SourceGenerated.Classes.ClassID_147;

2
Source/AssetRipper.Processing/Editor/OriginalPathHelper.cs
View File

@ -1,6 +1,6 @@
using AssetRipper.Assets;
using AssetRipper.Assets.Generics;
using AssetRipper.Import.Configuration;
using AssetRipper.Processing.Configuration;
using AssetRipper.SourceGenerated.Classes.ClassID_142;
using AssetRipper.SourceGenerated.Classes.ClassID_147;
using AssetRipper.SourceGenerated.Extensions;