generate load methods

András Kurai · András Kurai · commit 59d4c4aa1862 · 2021-10-13T14:37:30.000+02:00
diff --git a/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator.Sample/ResourcePaths.cs b/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator.Sample/ResourcePaths.cs
@@ -1,3 +1,5 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
 namespace AutSoft.UnityResourceGenerator.Sample
 {
     // ReSharper disable PartialTypeWithSinglePart
@@ -6,22 +8,33 @@ public static partial class ResourcePaths
         public static partial class Scenes
         {
             public const string CreatePrefab = "AutSoft.UnityResourceGenerator.Sample/Scenes/CreatePrefab";
+            public static void LoadCreatePrefab(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadScene(CreatePrefab, mode);
+            public static AsyncOperation LoadAsyncCreatePrefab(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadSceneAsync(CreatePrefab, mode);
             public const string LoadSceneInitial = "AutSoft.UnityResourceGenerator.Sample/Scenes/LoadSceneInitial";
+            public static void LoadLoadSceneInitial(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadScene(LoadSceneInitial, mode);
+            public static AsyncOperation LoadAsyncLoadSceneInitial(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadSceneAsync(LoadSceneInitial, mode);
             public const string LoadSceneNext = "AutSoft.UnityResourceGenerator.Sample/Scenes/LoadSceneNext";
+            public static void LoadLoadSceneNext(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadScene(LoadSceneNext, mode);
+            public static AsyncOperation LoadAsyncLoadSceneNext(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadSceneAsync(LoadSceneNext, mode);
         }
         public static partial class Prefabs
         {
             public const string Cube = "Cube";
+            public static GameObject LoadCube() => Resources.Load<GameObject>(Cube);
         }
         public static partial class Materials
         {
             public const string Cube = "Cube";
+            public static Material LoadCube() => Resources.Load<Material>(Cube);
             public const string CubeAlt = "CubeAlt";
+            public static Material LoadCubeAlt() => Resources.Load<Material>(CubeAlt);
         }
         public static partial class AudioClips
         {
             public const string CoinSpin = "CoinSpin";
+            public static AudioClip LoadCoinSpin() => Resources.Load<AudioClip>(CoinSpin);
             public const string Coin = "Coin";
+            public static AudioClip LoadCoin() => Resources.Load<AudioClip>(Coin);
         }
         public static partial class Sprites
         {
diff --git a/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator.Tests/ResourcePathTests.cs b/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator.Tests/ResourcePathTests.cs
@@ -1,7 +1,5 @@
 ﻿using AutSoft.UnityResourceGenerator.Sample;
 using NUnit.Framework;
-using UnityEngine;
-using UnityEngine.SceneManagement;
 
 namespace AutSoft.UnityResourceGenerator.Tests
 {
@@ -10,34 +8,34 @@ public class ResourcePathTests
         [Test]
         public void ScenesWork()
         {
-            Assert.DoesNotThrow(() => SceneManager.LoadScene(ResourcePaths.Scenes.LoadSceneInitial));
-            Assert.DoesNotThrow(() => SceneManager.LoadScene(ResourcePaths.Scenes.LoadSceneNext));
+            Assert.DoesNotThrow(() => ResourcePaths.Scenes.LoadLoadSceneInitial());
+            Assert.DoesNotThrow(() => ResourcePaths.Scenes.LoadLoadSceneNext());
         }
 
         [Test]
         public void PrefabsWork()
         {
-            var prefab = Resources.Load<GameObject>(ResourcePaths.Prefabs.Cube);
+            var prefab = ResourcePaths.Prefabs.LoadCube();
             Assert.NotNull(prefab);
         }
 
         [Test]
         public void MaterialsWork()
         {
-            var cubeMaterial = Resources.Load<Material>(ResourcePaths.Materials.Cube);
+            var cubeMaterial = ResourcePaths.Materials.LoadCube();
             Assert.NotNull(cubeMaterial);
 
-            var cubeAltMaterial = Resources.Load<Material>(ResourcePaths.Materials.CubeAlt);
+            var cubeAltMaterial = ResourcePaths.Materials.LoadCubeAlt();
             Assert.NotNull(cubeAltMaterial);
         }
 
         [Test]
         public void AudioClipsWork()
         {
-            var coin = Resources.Load<AudioClip>(ResourcePaths.AudioClips.Coin);
+            var coin = ResourcePaths.AudioClips.LoadCoin();
             Assert.NotNull(coin);
 
-            var coinSpin = Resources.Load<AudioClip>(ResourcePaths.AudioClips.CoinSpin);
+            var coinSpin = ResourcePaths.AudioClips.LoadCoinSpin();
             Assert.NotNull(coinSpin);
         }
     }
diff --git a/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/Generation/IResourceData.cs b/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/Generation/IResourceData.cs
@@ -7,5 +7,6 @@ public interface IResourceData
         string ClassName { get; }
         IReadOnlyList<string> FileExtensions { get; }
         bool IsResource { get; }
+        string DataType { get; }
     }
 }
diff --git a/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/Generation/Modules/AllResources.cs b/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/Generation/Modules/AllResources.cs
@@ -66,12 +66,22 @@ public static partial class {data.ClassName}
             var output = values
                 .Aggregate(
                     new StringBuilder().Append(classBegin),
-                    (sb, s) => sb
-                        .Append("            public const string ")
-                        .Append(s.name)
-                        .Append(" = \"")
-                        .Append(s.path)
-                        .AppendLine("\";"))
+                    (sb, s) =>
+                    {
+                        sb.Append("            public const string ").Append(s.name).Append(" = \"").Append(s.path).AppendLine("\";");
+
+                        if (data.DataType == "Scene")
+                        {
+                            sb.Append("            public static ").Append("void").Append(" Load").Append(s.name).Append("(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadScene(").Append(s.name).AppendLine(", mode);");
+                            sb.Append("            public static ").Append("AsyncOperation").Append(" LoadAsync").Append(s.name).Append("(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadSceneAsync(").Append(s.name).AppendLine(", mode);");
+                        }
+                        else
+                        {
+                            sb.Append("            public static ").Append(data.DataType).Append(" Load").Append(s.name).Append("() => Resources.Load<").Append(data.DataType).Append(">(").Append(s.name).AppendLine(");");
+                        }
+
+                        return sb;
+                    })
                 .AppendLine(classEnd)
                 .ToString();
 
diff --git a/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/Generation/ResourceFileGenerator.cs b/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/Generation/ResourceFileGenerator.cs
@@ -11,7 +11,11 @@ public static string CreateResourceFile(ResourceContext context)
         {
             // ReSharper disable once MissingIndent
             const string fileBegin =
-@"namespace {0}
+@"
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace {0}
 {
     // ReSharper disable PartialTypeWithSinglePart
     public static partial class {1}
diff --git a/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/ResourceGeneratorSettings.cs b/UnityResourceGenerator/Assets/AutSoft.UnityResourceGenerator/Editor/ResourceGeneratorSettings.cs
@@ -15,21 +15,24 @@ public sealed class ResourceData : IResourceData
             [SerializeField] private string _className = default;
             [SerializeField] private string[] _fileExtensions = default;
             [SerializeField] private bool _isResource = default;
+            [SerializeField] private string _dataType = default;
 
             public ResourceData()
             {
             }
 
-            public ResourceData(string className, string[] fileExtensions, bool isResource)
+            public ResourceData(string className, string[] fileExtensions, bool isResource, string dataType)
             {
                 _className = className;
                 _fileExtensions = fileExtensions;
                 _isResource = isResource;
+                _dataType = dataType;
             }
 
             public string ClassName => _className;
             public IReadOnlyList<string> FileExtensions => _fileExtensions;
             public bool IsResource => _isResource;
+            public string DataType => _dataType;
         }
 
         private const string SettingsPath = "Assets/ResourceGenerator.asset";
@@ -77,13 +80,13 @@ private static List<ResourceData> CreateDefaultFileMappings() =>
             // https://docs.unity3d.com/Manual/BuiltInImporters.html
             new List<ResourceData>
             {
-                new ResourceData("Scenes", new[]{"*.unity"}, false),
-                new ResourceData("Prefabs", new[]{"*.prefab"}, true),
-                new ResourceData("Materials", new[]{"*.mat"}, true),
-                new ResourceData("AudioClips", new[]{"*.ogg", "*.aif", "*.aiff", "*.flac", "*.mp3", "*.mod", "*.it", "*.s3m", "*.xm", "*.wav"}, true),
-                new ResourceData("Sprites", new[]{"*.jpg", "*.jpeg", "*.tif", "*.tiff", "*.tga", "*.gif", "*.png", "*.psd", "*.bmp", "*.iff", "*.pict", "*.pic", "*.pct", "*.exr", "*.hdr"}, true),
-                new ResourceData("TextAssets", new[]{"*.txt", "*.html", "*.htm", "*.xml", "*.bytes", "*.json", "*.csv", "*.yaml", "*.fnt"}, true),
-                new ResourceData("Fonts", new[]{"*.ttf", "*.dfont", "*.otf", "*.ttc"}, true)
+                new ResourceData("Scenes", new[]{"*.unity"}, false, "Scene"),
+                new ResourceData("Prefabs", new[]{"*.prefab"}, true, "GameObject"),
+                new ResourceData("Materials", new[]{"*.mat"}, true, "Material"),
+                new ResourceData("AudioClips", new[]{"*.ogg", "*.aif", "*.aiff", "*.flac", "*.mp3", "*.mod", "*.it", "*.s3m", "*.xm", "*.wav"}, true, "AudioClip"),
+                new ResourceData("Sprites", new[]{"*.jpg", "*.jpeg", "*.tif", "*.tiff", "*.tga", "*.gif", "*.png", "*.psd", "*.bmp", "*.iff", "*.pict", "*.pic", "*.pct", "*.exr", "*.hdr"}, true, "Sprite"),
+                new ResourceData("TextAssets", new[]{"*.txt", "*.html", "*.htm", "*.xml", "*.bytes", "*.json", "*.csv", "*.yaml", "*.fnt"}, true, "TextAsset"),
+                new ResourceData("Fonts", new[]{"*.ttf", "*.dfont", "*.otf", "*.ttc"}, true, "Font")
             };
 
         [SettingsProvider]
diff --git a/UnityResourceGenerator/Assets/ResourceGenerator.asset b/UnityResourceGenerator/Assets/ResourceGenerator.asset
@@ -22,14 +22,17 @@ MonoBehaviour:
     _fileExtensions:
     - '*.unity'
     _isResource: 0
+    _dataType: Scene
   - _className: Prefabs
     _fileExtensions:
     - '*.prefab'
     _isResource: 1
+    _dataType: GameObject
   - _className: Materials
     _fileExtensions:
     - '*.mat'
     _isResource: 1
+    _dataType: Material
   - _className: AudioClips
     _fileExtensions:
     - '*.ogg'
@@ -43,6 +46,7 @@ MonoBehaviour:
     - '*.xm'
     - '*.wav'
     _isResource: 1
+    _dataType: AudioClip
   - _className: Sprites
     _fileExtensions:
     - '*.jpg'
@@ -61,6 +65,7 @@ MonoBehaviour:
     - '*.exr'
     - '*.hdr'
     _isResource: 1
+    _dataType: Sprite
   - _className: TextAssets
     _fileExtensions:
     - '*.txt'
@@ -73,10 +78,12 @@ MonoBehaviour:
     - '*.yaml'
     - '*.fnt'
     _isResource: 1
+    _dataType: TextAsset
   - _className: Fonts
     _fileExtensions:
     - '*.ttf'
     - '*.dfont'
     - '*.otf'
     - '*.ttc'
     _isResource: 1
+    _dataType: Font

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using UnityEngine;`
	`2`	`+using UnityEngine.SceneManagement;`
`1`	`3`	`namespace AutSoft.UnityResourceGenerator.Sample`
`2`	`4`	`{`
`3`	`5`	`// ReSharper disable PartialTypeWithSinglePart`
`@@ -6,22 +8,33 @@ public static partial class ResourcePaths`
`6`	`8`	`public static partial class Scenes`
`7`	`9`	`{`
`8`	`10`	`public const string CreatePrefab = "AutSoft.UnityResourceGenerator.Sample/Scenes/CreatePrefab";`
	`11`	`+ public static void LoadCreatePrefab(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadScene(CreatePrefab, mode);`
	`12`	`+ public static AsyncOperation LoadAsyncCreatePrefab(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadSceneAsync(CreatePrefab, mode);`
`9`	`13`	`public const string LoadSceneInitial = "AutSoft.UnityResourceGenerator.Sample/Scenes/LoadSceneInitial";`
	`14`	`+ public static void LoadLoadSceneInitial(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadScene(LoadSceneInitial, mode);`
	`15`	`+ public static AsyncOperation LoadAsyncLoadSceneInitial(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadSceneAsync(LoadSceneInitial, mode);`
`10`	`16`	`public const string LoadSceneNext = "AutSoft.UnityResourceGenerator.Sample/Scenes/LoadSceneNext";`
	`17`	`+ public static void LoadLoadSceneNext(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadScene(LoadSceneNext, mode);`
	`18`	`+ public static AsyncOperation LoadAsyncLoadSceneNext(LoadSceneMode mode = LoadSceneMode.Single) => SceneManager.LoadSceneAsync(LoadSceneNext, mode);`
`11`	`19`	`}`
`12`	`20`	`public static partial class Prefabs`
`13`	`21`	`{`
`14`	`22`	`public const string Cube = "Cube";`
	`23`	`+ public static GameObject LoadCube() => Resources.Load<GameObject>(Cube);`
`15`	`24`	`}`
`16`	`25`	`public static partial class Materials`
`17`	`26`	`{`
`18`	`27`	`public const string Cube = "Cube";`
	`28`	`+ public static Material LoadCube() => Resources.Load<Material>(Cube);`
`19`	`29`	`public const string CubeAlt = "CubeAlt";`
	`30`	`+ public static Material LoadCubeAlt() => Resources.Load<Material>(CubeAlt);`
`20`	`31`	`}`
`21`	`32`	`public static partial class AudioClips`
`22`	`33`	`{`
`23`	`34`	`public const string CoinSpin = "CoinSpin";`
	`35`	`+ public static AudioClip LoadCoinSpin() => Resources.Load<AudioClip>(CoinSpin);`
`24`	`36`	`public const string Coin = "Coin";`
	`37`	`+ public static AudioClip LoadCoin() => Resources.Load<AudioClip>(Coin);`
`25`	`38`	`}`
`26`	`39`	`public static partial class Sprites`
`27`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`using AutSoft.UnityResourceGenerator.Sample;`
`2`	`2`	`using NUnit.Framework;`
`3`		`-using UnityEngine;`
`4`		`-using UnityEngine.SceneManagement;`
`5`	`3`
`6`	`4`	`namespace AutSoft.UnityResourceGenerator.Tests`
`7`	`5`	`{`
`@@ -10,34 +8,34 @@ public class ResourcePathTests`
`10`	`8`	`[Test]`
`11`	`9`	`public void ScenesWork()`
`12`	`10`	`{`
`13`		`- Assert.DoesNotThrow(() => SceneManager.LoadScene(ResourcePaths.Scenes.LoadSceneInitial));`
`14`		`- Assert.DoesNotThrow(() => SceneManager.LoadScene(ResourcePaths.Scenes.LoadSceneNext));`
	`11`	`+ Assert.DoesNotThrow(() => ResourcePaths.Scenes.LoadLoadSceneInitial());`
	`12`	`+ Assert.DoesNotThrow(() => ResourcePaths.Scenes.LoadLoadSceneNext());`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`[Test]`
`18`	`16`	`public void PrefabsWork()`
`19`	`17`	`{`
`20`		`- var prefab = Resources.Load<GameObject>(ResourcePaths.Prefabs.Cube);`
	`18`	`+ var prefab = ResourcePaths.Prefabs.LoadCube();`
`21`	`19`	`Assert.NotNull(prefab);`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`[Test]`
`25`	`23`	`public void MaterialsWork()`
`26`	`24`	`{`
`27`		`- var cubeMaterial = Resources.Load<Material>(ResourcePaths.Materials.Cube);`
	`25`	`+ var cubeMaterial = ResourcePaths.Materials.LoadCube();`
`28`	`26`	`Assert.NotNull(cubeMaterial);`
`29`	`27`
`30`		`- var cubeAltMaterial = Resources.Load<Material>(ResourcePaths.Materials.CubeAlt);`
	`28`	`+ var cubeAltMaterial = ResourcePaths.Materials.LoadCubeAlt();`
`31`	`29`	`Assert.NotNull(cubeAltMaterial);`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`[Test]`
`35`	`33`	`public void AudioClipsWork()`
`36`	`34`	`{`
`37`		`- var coin = Resources.Load<AudioClip>(ResourcePaths.AudioClips.Coin);`
	`35`	`+ var coin = ResourcePaths.AudioClips.LoadCoin();`
`38`	`36`	`Assert.NotNull(coin);`
`39`	`37`
`40`		`- var coinSpin = Resources.Load<AudioClip>(ResourcePaths.AudioClips.CoinSpin);`
	`38`	`+ var coinSpin = ResourcePaths.AudioClips.LoadCoinSpin();`
`41`	`39`	`Assert.NotNull(coinSpin);`
`42`	`40`	`}`
`43`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ public interface IResourceData`
`7`	`7`	`string ClassName { get; }`
`8`	`8`	`IReadOnlyList<string> FileExtensions { get; }`
`9`	`9`	`bool IsResource { get; }`
	`10`	`+ string DataType { get; }`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,11 @@ public static string CreateResourceFile(ResourceContext context)`
`11`	`11`	`{`
`12`	`12`	`// ReSharper disable once MissingIndent`
`13`	`13`	`const string fileBegin =`
`14`		`-@"namespace {0}`
	`14`	`+@"`
	`15`	`+using UnityEngine;`
	`16`	`+using UnityEngine.SceneManagement;`
	`17`	`+`
	`18`	`+namespace {0}`
`15`	`19`	`{`
`16`	`20`	`// ReSharper disable PartialTypeWithSinglePart`
`17`	`21`	`public static partial class {1}`