diff --git a/Prowl.Editor/Assets/AssetDatabase.Core.cs b/Prowl.Editor/Assets/AssetDatabase.Core.cs index 8811bbe5e..bbf460fb9 100644 --- a/Prowl.Editor/Assets/AssetDatabase.Core.cs +++ b/Prowl.Editor/Assets/AssetDatabase.Core.cs @@ -7,7 +7,7 @@ namespace Prowl.Editor.Assets { - [FilePath("Library/LastWriteTimes.cache", FilePathAttribute.Location.ProjectFolder)] + [EditorFilePath("Library/LastWriteTimes.cache", EditorFilePathAttribute.Location.ProjectFolder)] public class LastWriteTimesCache : ScriptableSingleton { public readonly Dictionary fileLastWriteTimes = []; diff --git a/Prowl.Editor/Editor/Preferences/AssetPipelinePreferences.cs b/Prowl.Editor/Editor/Preferences/AssetPipelinePreferences.cs index 8bb68e43e..2da2ea3bb 100644 --- a/Prowl.Editor/Editor/Preferences/AssetPipelinePreferences.cs +++ b/Prowl.Editor/Editor/Preferences/AssetPipelinePreferences.cs @@ -3,7 +3,7 @@ namespace Prowl.Editor.Editor.Preferences { - [FilePath("AssetPipeline.pref", FilePathAttribute.Location.PreferencesFolder)] + [EditorFilePath("AssetPipeline.pref", EditorFilePathAttribute.Location.PreferencesFolder)] public class AssetPipelinePreferences : ScriptableSingleton { [Text("Asset Browser:")] diff --git a/Prowl.Editor/Editor/Preferences/GeneralPreferences.cs b/Prowl.Editor/Editor/Preferences/GeneralPreferences.cs index b3fe476cd..37404de63 100644 --- a/Prowl.Editor/Editor/Preferences/GeneralPreferences.cs +++ b/Prowl.Editor/Editor/Preferences/GeneralPreferences.cs @@ -3,7 +3,7 @@ namespace Prowl.Editor.Editor.Preferences { - [FilePath("General.pref", FilePathAttribute.Location.PreferencesFolder)] + [EditorFilePath("General.pref", EditorFilePathAttribute.Location.PreferencesFolder)] public class GeneralPreferences : ScriptableSingleton { [Text("General:")] diff --git a/Prowl.Editor/Editor/Preferences/SceneViewPreferences.cs b/Prowl.Editor/Editor/Preferences/SceneViewPreferences.cs index 595fe4bff..f59454012 100644 --- a/Prowl.Editor/Editor/Preferences/SceneViewPreferences.cs +++ b/Prowl.Editor/Editor/Preferences/SceneViewPreferences.cs @@ -3,7 +3,7 @@ namespace Prowl.Editor.Editor.Preferences { - [FilePath("SceneView.pref", FilePathAttribute.Location.PreferencesFolder)] + [EditorFilePath("SceneView.pref", EditorFilePathAttribute.Location.PreferencesFolder)] public class SceneViewPreferences : ScriptableSingleton { [Text("Controls:")] diff --git a/Prowl.Editor/Editor/ProjectSettings/BuildProjectSetting.cs b/Prowl.Editor/Editor/ProjectSettings/BuildProjectSetting.cs index c0943a712..44ed1d7d7 100644 --- a/Prowl.Editor/Editor/ProjectSettings/BuildProjectSetting.cs +++ b/Prowl.Editor/Editor/ProjectSettings/BuildProjectSetting.cs @@ -3,7 +3,7 @@ namespace Prowl.Editor.Editor.ProjectSettings { - [FilePath("BuildSettings.projsetting", FilePathAttribute.Location.ProjectSettingsFolder)] + [EditorFilePath("BuildSettings.projsetting", EditorFilePathAttribute.Location.ProjectSettingsFolder)] public class BuildProjectSetting : ScriptableSingleton { public AssetRef InitialScene; diff --git a/Prowl.Editor/Utilities/ScriptableSingleton.cs b/Prowl.Editor/Utilities/ScriptableSingleton.cs index dbb287e9a..58a5a5dac 100644 --- a/Prowl.Editor/Utilities/ScriptableSingleton.cs +++ b/Prowl.Editor/Utilities/ScriptableSingleton.cs @@ -3,7 +3,7 @@ namespace Prowl.Editor.Utilities { [AttributeUsage(AttributeTargets.Class)] - public class FilePathAttribute : Attribute + public class EditorFilePathAttribute : Attribute { public enum Location { @@ -15,7 +15,7 @@ public enum Location public string FilePath { get; } public Location FileLocation { get; } - public FilePathAttribute(string filePath, Location fileLocation) + public EditorFilePathAttribute(string filePath, Location fileLocation) { FilePath = filePath; FileLocation = fileLocation; @@ -43,19 +43,19 @@ public void Save() protected string GetFilePath() { - var attribute = Attribute.GetCustomAttribute(GetType(), typeof(FilePathAttribute)) as FilePathAttribute; + var attribute = Attribute.GetCustomAttribute(GetType(), typeof(EditorFilePathAttribute)) as EditorFilePathAttribute; if (attribute != null) { string directory = string.Empty; switch (attribute.FileLocation) { - case FilePathAttribute.Location.ProjectFolder: + case EditorFilePathAttribute.Location.ProjectFolder: directory = Project.ProjectDirectory; break; - case FilePathAttribute.Location.ProjectSettingsFolder: + case EditorFilePathAttribute.Location.ProjectSettingsFolder: directory = Path.Combine(Project.ProjectDirectory, "ProjectSettings"); break; - case FilePathAttribute.Location.PreferencesFolder: + case EditorFilePathAttribute.Location.PreferencesFolder: // Persistent across all projects directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Prowl", "Editor"); break;