Skip to content

Commit f758775

Browse files
ChristopherSchubertChristopherSchubert
committed
Updating to support VFX on builtin renderer
1 parent 095459b commit f758775

18 files changed

Lines changed: 659 additions & 29 deletions

‎package.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@
2121
"registry": "http://35.211.123.13:4873/"
2222
},
2323
"dependencies": {
24-
"com.appalachia.unity3d.core": "0.1.7",
25-
"com.appalachia.unity3d.editing": "0.1.9",
26-
"com.appalachia.unity3d.rendering": "0.1.8",
27-
"com.appalachia.unity3d.utility": "0.1.3",
28-
"com.appalachia.unity3d.ci": "0.1.3"
24+
"com.appalachia.unity3d.core": "0.1.8",
25+
"com.appalachia.unity3d.editing": "0.1.10",
26+
"com.appalachia.unity3d.rendering": "0.1.9",
27+
"com.appalachia.unity3d.utility": "0.1.4",
28+
"com.appalachia.unity3d.ci": "0.1.4",
29+
"com.unity.addressables": "1.19.9",
30+
"com.unity.mathematics": "1.2.4",
31+
"com.unity.collections": "1.0.0-pre.6",
32+
"com.unity.render-pipelines.core": "12.1.0",
33+
"com.unity.timeline": "1.6.2"
2934
},
3035
"scripts": {
3136
"preversion": "bash ~/com.appalachia/appa/appa package unity3d preversion",
@@ -38,6 +43,5 @@
3843
"prepublishOnly": "bash ~/com.appalachia/appa/appa package unity3d prepublishOnly",
3944
"publish": "bash ~/com.appalachia/appa/appa package unity3d publish",
4045
"postpublish": "bash ~/com.appalachia/appa/appa package unity3d postpublish"
41-
},
42-
"exports": null
43-
}
46+
}
47+
}

‎src/Appalachia.Audio.asmdef‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,14 @@
4747
"GUID:aab7d97d30d7abe41b8a38190b985fb5",
4848
"GUID:bab61a001c58d3c468cdd73bdb97a91a",
4949
"GUID:68140b0200bbcad4f9c15f9f4447f256",
50-
"GUID:a03736e1d95a0ed4c8a44e1ee02df53f"
50+
"GUID:1a50594ad9450024c8d77b37e1961be3",
51+
"GUID:a03736e1d95a0ed4c8a44e1ee02df53f",
52+
"GUID:9e24947de15b9834991c9d8411ea37cf",
53+
"GUID:e0cd26848372d4e5c891c569017e11f1",
54+
"GUID:d8b63aba1907145bea998dd612889d6b",
55+
"GUID:df380645f10b7bc4b97d4f5eb6303d95",
56+
"GUID:84651a3751eca9349aac36a66bba901b",
57+
"GUID:f06555f75b070af458a003d92f9efb00"
5158
],
5259
"optionalUnityReferences": [],
5360
"precompiledReferences": [],

‎src/Components/AudioEmitter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Appalachia.Audio.Components
1212
{
13-
[AddComponentMenu(APPA_MENU.ASM_AppalachiaAudio + nameof(AudioEmitter))]
13+
[AddComponentMenu(PKG.Menu.Appalachia.Components.Base + nameof(AudioEmitter))]
1414
public class AudioEmitter : MonoBehaviour
1515
{
1616
[Colorize] public AttachmentParams attachment;

‎src/Components/Synthesizer.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Reflection;
88
using Appalachia.Audio.Effects;
99
using Appalachia.Audio.Utilities;
10-
using UnityEditor;
1110
using UnityEngine;
1211
using UnityEngine.Audio;
1312

@@ -497,17 +496,17 @@ Patch patch
497496
#if UNITY_EDITOR
498497
if (!Application.isPlaying)
499498
{
500-
EditorApplication.CallbackFunction f = null;
499+
UnityEditor.EditorApplication.CallbackFunction f = null;
501500
var n = Time.realtimeSinceStartup;
502501
f = () =>
503502
{
504503
if ((Time.realtimeSinceStartup - n) >= ap.delay)
505504
{
506-
EditorApplication.update -= f;
505+
UnityEditor.EditorApplication.update -= f;
507506
PlayClip(c, p.loop);
508507
}
509508
};
510-
EditorApplication.update += f;
509+
UnityEditor.EditorApplication.update += f;
511510
return false;
512511
}
513512
#endif
@@ -811,7 +810,7 @@ private static void PlayClip(AudioClip c, bool loop)
811810
{
812811
if (_PlayClip == null)
813812
{
814-
var a = typeof(EditorApplication).Assembly;
813+
var a = typeof( UnityEditor.EditorApplication).Assembly;
815814
var t = a.GetType("UnityEditor.AudioUtil");
816815
_PlayClip = t.GetMethod("PlayClip", new[] {typeof(AudioClip), typeof(int), typeof(bool)});
817816
}
@@ -823,7 +822,7 @@ private static void StopAllClips()
823822
{
824823
if (_StopAllClips == null)
825824
{
826-
var a = typeof(EditorApplication).Assembly;
825+
var a = typeof( UnityEditor.EditorApplication).Assembly;
827826
var t = a.GetType("UnityEditor.AudioUtil");
828827
_StopAllClips = t.GetMethod("StopAllClips", new Type[0]);
829828
}

‎src/Contextual/Appalachia.Audio.Contextual.asmdef‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@
4848
"GUID:aab7d97d30d7abe41b8a38190b985fb5",
4949
"GUID:bab61a001c58d3c468cdd73bdb97a91a",
5050
"GUID:68140b0200bbcad4f9c15f9f4447f256",
51-
"GUID:a03736e1d95a0ed4c8a44e1ee02df53f"
51+
"GUID:1a50594ad9450024c8d77b37e1961be3",
52+
"GUID:a03736e1d95a0ed4c8a44e1ee02df53f",
53+
"GUID:9e24947de15b9834991c9d8411ea37cf",
54+
"GUID:e0cd26848372d4e5c891c569017e11f1",
55+
"GUID:d8b63aba1907145bea998dd612889d6b",
56+
"GUID:df380645f10b7bc4b97d4f5eb6303d95",
57+
"GUID:84651a3751eca9349aac36a66bba901b",
58+
"GUID:f06555f75b070af458a003d92f9efb00"
5259
],
5360
"optionalUnityReferences": [],
5461
"precompiledReferences": [],

‎src/Contextual/PKG.cs‎

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
// ReSharper disable All
2+
// DO NOT MODIFY: START
3+
4+
using Appalachia.Utility.Constants;
5+
6+
7+
namespace Appalachia.Audio.Contextual
8+
{
9+
internal static partial class PKG
10+
{
11+
public const string Root = "Appalachia/";
12+
public const string Prefix = Root + "Audio/Contextual/";
13+
public const int Priority = 1000*5;
14+
15+
public static partial class Prefs
16+
{
17+
public const string Group = Prefix;
18+
19+
public static partial class Gizmos
20+
{
21+
public const string Base = Group + "Gizmos/";
22+
}
23+
}
24+
25+
public static partial class Menu
26+
{
27+
public static partial class Assets
28+
{
29+
public const int Priority = PKG.Priority;
30+
public const string Base = "Assets/" + Prefix;
31+
}
32+
33+
public static partial class GameObject
34+
{
35+
public const int Priority = PKG.Priority;
36+
public const string Base = "GameObject/" + Prefix;
37+
}
38+
39+
public static partial class Appalachia
40+
{
41+
public const int Priority = PKG.Priority;
42+
43+
public static partial class Behaviours
44+
{
45+
public const int Priority = Appalachia.Priority;
46+
public const string Base = Prefix + nameof(Behaviours) + "/";
47+
}
48+
49+
public static partial class Components
50+
{
51+
public const int Priority = Behaviours.Priority + 100;
52+
public const string Base = Prefix + nameof(Components) + "/";
53+
}
54+
55+
public static partial class Add
56+
{
57+
public const int Priority = Components.Priority + 100;
58+
public const string Base = Prefix + nameof(Add) + "/";
59+
}
60+
61+
public static partial class Create
62+
{
63+
public const int Priority = Add.Priority + 100;
64+
public const string Base = Prefix + nameof(Create) + "/";
65+
}
66+
67+
public static partial class Update
68+
{
69+
public const int Priority = Create.Priority + 100;
70+
public const string Base = Prefix + nameof(Update) + "/";
71+
}
72+
73+
public static partial class Manage
74+
{
75+
public const int Priority = Update.Priority + 100;
76+
public const string Base = Prefix + nameof(Manage) + "/";
77+
}
78+
79+
public static partial class Data
80+
{
81+
public const int Priority = Manage.Priority + 100;
82+
public const string Base = Prefix + nameof(Data) + "/";
83+
}
84+
85+
public static partial class RootTools
86+
{
87+
public const int Priority = Data.Priority + 100;
88+
public const string Base = Root + "Tools/";
89+
}
90+
91+
public static partial class State
92+
{
93+
public const int Priority = RootTools.Priority + 100;
94+
public const string Base = Prefix + nameof(State) + "/";
95+
}
96+
97+
public static partial class Tools
98+
{
99+
public const int Priority = State.Priority + 100;
100+
public const string Base = Prefix + nameof(Tools) + "/";
101+
102+
public static partial class Enable
103+
{
104+
public const int Priority = Tools.Priority + 0;
105+
public const string Base = Tools.Base + nameof(Enable);
106+
}
107+
108+
public static partial class Disable
109+
{
110+
public const int Priority = Tools.Priority + 1;
111+
public const string Base = Tools.Base + nameof(Disable);
112+
}
113+
}
114+
115+
public static partial class Jobs
116+
{
117+
public const int Priority = Tools.Priority + 100;
118+
public const string Base = Prefix + nameof(Jobs) + "/";
119+
}
120+
121+
public static partial class Timing
122+
{
123+
public const int Priority = Jobs.Priority + 100;
124+
public const string Base = Prefix + nameof(Timing) + "/";
125+
}
126+
127+
public static partial class Utility
128+
{
129+
public const int Priority = Timing.Priority + 100;
130+
public const string Base = Prefix + nameof(Utility) + "/";
131+
}
132+
133+
public static partial class Windows
134+
{
135+
public const int Priority = Utility.Priority + 100;
136+
public const string Base = Prefix + nameof(Windows) + "/";
137+
}
138+
139+
public static partial class Logging
140+
{
141+
public const int Priority = Windows.Priority + 100;
142+
public const string Base = Prefix + nameof(Logging) + "/";
143+
}
144+
145+
public static partial class Settings
146+
{
147+
public const int Priority = Logging.Priority + 100;
148+
public const string Base = Prefix + nameof(Settings) + "/";
149+
}
150+
151+
public static partial class Packages
152+
{
153+
public const int Priority = Settings.Priority + 100;
154+
public const string Base = Prefix + nameof(Packages) + "/";
155+
}
156+
157+
public static partial class External
158+
{
159+
public const int Priority = Packages.Priority + 100;
160+
public const string Base = Prefix + nameof(External) + "/";
161+
}
162+
163+
public static partial class Debug
164+
{
165+
public const int Priority = External.Priority + 100;
166+
public const string Base = Prefix + nameof(Debug) + "/";
167+
}
168+
169+
public static partial class Gizmos
170+
{
171+
public const int Priority = Debug.Priority + 100;
172+
public const string Base = Prefix + nameof(Gizmos) + "/";
173+
}
174+
}
175+
176+
public static partial class CONTEXT
177+
{
178+
public const int Priority = PKG.Priority;
179+
public const string Start = "CONTEXT/";
180+
public const string Mid = "/" + Prefix;
181+
public const string Mid_short = "/" + Root;
182+
}
183+
}
184+
185+
// DO NOT MODIFY: END
186+
// MODIFICATIONS ALLOWED: START
187+
188+
// MODIFICATIONS ALLOWED: END
189+
// DO NOT MODIFY: START
190+
}
191+
}
192+
// DO NOT MODIFY: END

‎src/Contextual/PKG.cs.meta‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Editor/Appalachia.Audio.Editor.asmdef‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,14 @@
5050
"GUID:aab7d97d30d7abe41b8a38190b985fb5",
5151
"GUID:bab61a001c58d3c468cdd73bdb97a91a",
5252
"GUID:68140b0200bbcad4f9c15f9f4447f256",
53-
"GUID:a03736e1d95a0ed4c8a44e1ee02df53f"
53+
"GUID:1a50594ad9450024c8d77b37e1961be3",
54+
"GUID:a03736e1d95a0ed4c8a44e1ee02df53f",
55+
"GUID:9e24947de15b9834991c9d8411ea37cf",
56+
"GUID:e0cd26848372d4e5c891c569017e11f1",
57+
"GUID:d8b63aba1907145bea998dd612889d6b",
58+
"GUID:df380645f10b7bc4b97d4f5eb6303d95",
59+
"GUID:84651a3751eca9349aac36a66bba901b",
60+
"GUID:f06555f75b070af458a003d92f9efb00"
5461
],
5562
"optionalUnityReferences": [],
5663
"precompiledReferences": [

‎src/Editor/AudioEmitterEditor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void OnSceneGUI()
5353
}
5454
}
5555

56-
[MenuItem(APPA_MENU.BASE_AppalachiaComponents + APPA_MENU.ASM_AppalachiaAudio + nameof(AudioEmitter))]
56+
[UnityEditor.MenuItem(PKG.Menu.Appalachia.Components.Base + nameof(AudioEmitter))]
5757
private static void CreateAudioEmitter()
5858
{
5959
var o = new GameObject("Audio Emitter");

‎src/Editor/AudioSlapbackEditor.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ protected override void DrawZoneLabel(Zone z, Vector3 p)
5757
}
5858
}
5959

60-
[MenuItem(
61-
APPA_MENU.BASE_AppalachiaComponents + APPA_MENU.ASM_AppalachiaAudio + nameof(AudioSlapback)
60+
[UnityEditor.MenuItem(PKG.Menu.Appalachia.Components.Base + nameof(AudioSlapback)
6261
)]
6362
private static void CreateAudioSlapback()
6463
{

0 commit comments

Comments
 (0)