diff --git a/Assets/Audio/SpectreVfxBinder.cs b/Assets/Audio/SpectreVfxBinder.cs deleted file mode 100644 index 2b1c7ca..0000000 --- a/Assets/Audio/SpectreVfxBinder.cs +++ /dev/null @@ -1,76 +0,0 @@ -using UnityEngine; -using UnityEngine.VFX; -using UnityEngine.VFX.Utility; -using Assets.WasapiAudio.Scripts.Unity; - -namespace Assets.WasapiAudio.Scripts.Unity -{ - [AddComponentMenu("VFX/Property Binders/Spectre - VFX Binder")] - [VFXBinder("Audio/Audio Spectrum Data to AttributeMap")] - public class SpectreVfxBinder : VfxAudioVisualizationEffect - { - [VFXPropertyBinding("System.UInt32"), SerializeField] - protected ExposedProperty SpectrumSizeParameter = "SpectrumSize"; - - [VFXPropertyBinding("UnityEngine.Texture2D"), SerializeField] - protected ExposedProperty SpectrumDataTextureParameter = "SpectrumDataTexture"; - - public bool symmetric = false; - - private Texture2D _texture; - private Color[] _colorCache; - - private void InitialiseTexture() { - Debug.Log("Reinitialising spectrum texture..."); - if (symmetric) { - _texture = new Texture2D(SpectrumSize * 2, 1, TextureFormat.RFloat, false); - _colorCache = new Color[SpectrumSize * 2]; - } else { - _texture = new Texture2D(SpectrumSize, 1, TextureFormat.RFloat, false); - _colorCache = new Color[SpectrumSize]; - } - - _texture.name = $"AudioSpectrumData{SpectrumSize}"; - } - - private void UpdateTexture() { - // init - if (_texture == null) InitialiseTexture(); - - // has symmetric been toggled and the texture needs updating? - if (symmetric && _texture.width != SpectrumSize * 2) InitialiseTexture(); - if (!symmetric && _texture.width != SpectrumSize) InitialiseTexture(); - - var spectrumData = GetSpectrumData(); - - if (symmetric) { - for (int i = 0; i < SpectrumSize; i++) { - _colorCache[SpectrumSize + i] = new Color(spectrumData[i], 0, 0, 0); - _colorCache[SpectrumSize - (i + 1)] = new Color(spectrumData[i], 0, 0, 0); - } - } else { - for (int i = 0; i < SpectrumSize; i++) { - _colorCache[i] = new Color(spectrumData[i], 0, 0, 0); - } - } - - _texture.SetPixels(_colorCache); - _texture.Apply(); - } - - public override void UpdateBinding(VisualEffect component) { - base.UpdateBinding(component); - UpdateTexture(); - if (symmetric) { - component.SetUInt(SpectrumSizeParameter, (uint) SpectrumSize * 2); - } else { - component.SetUInt(SpectrumSizeParameter, (uint) SpectrumSize); - } - component.SetTexture(SpectrumDataTextureParameter, _texture); - } - - public override string ToString() { - return "Audio Spectrum Data"; - } - } -} \ No newline at end of file diff --git a/Assets/Prefabs/Menu.prefab b/Assets/Prefabs/Menu.prefab index ccb1e02..0000e39 100644 --- a/Assets/Prefabs/Menu.prefab +++ b/Assets/Prefabs/Menu.prefab @@ -469,7 +469,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -256, y: 0} + m_AnchoredPosition: {x: -512, y: 0} m_SizeDelta: {x: 64, y: 64} m_Pivot: {x: 1, y: 1} --- !u!222 &529626900707344084 @@ -1113,6 +1113,164 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &3396357262573175923 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 421876249768687115} + - component: {fileID: 8933658421904991632} + - component: {fileID: 6749243352969479682} + - component: {fileID: 2478420379614445965} + - component: {fileID: 3975575999960435775} + - component: {fileID: 634275950743134112} + m_Layer: 5 + m_Name: AudioSelector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &421876249768687115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396357262573175923} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5305278010342315827} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -128, y: 0} + m_SizeDelta: {x: 64, y: 64} + m_Pivot: {x: 1, y: 1} +--- !u!222 &8933658421904991632 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396357262573175923} + m_CullTransparentMesh: 1 +--- !u!114 &6749243352969479682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396357262573175923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2478420379614445965} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3975575999960435775} + m_TargetAssemblyTypeName: Display, Assembly-CSharp + m_MethodName: SetWindowed + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &2478420379614445965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396357262573175923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 2172509423aef564cbffe0df01411020, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!114 &3975575999960435775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396357262573175923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99247b6907a6da441af07cf95950880f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &634275950743134112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3396357262573175923} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc21ac8b706913b47897e9f83d170bc5, type: 3} + m_Name: + m_EditorClassIdentifier: + sources: + - {fileID: 0} --- !u!1 &3686114034736848159 GameObject: m_ObjectHideFlags: 0 @@ -1535,7 +1693,7 @@ MonoBehaviour: m_EditorClassIdentifier: themeSelector: {fileID: 7285044980238930537} data: - themeIndex: 0 + themeIndex: 8 --- !u!1 &5305278009141335879 GameObject: m_ObjectHideFlags: 0 @@ -1737,6 +1895,7 @@ RectTransform: - {fileID: 3507733486544043422} - {fileID: 3099289455289463194} - {fileID: 7200639167805561534} + - {fileID: 421876249768687115} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat b/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat index 88da7d0..3ac02e2 100644 --- a/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat +++ b/Assets/Scenes/MDNA_DreamLiquid/Luigi.mat @@ -142,7 +142,7 @@ Material: - _AlphaToMaskInspectorValue: 0 - _Anisotropy: 0 - _BlendMode: 0 - - _Brightness: 3.1000001 + - _Brightness: 4.5499997 - _CoatMask: 0 - _CullMode: 2 - _CullModeForward: 2 @@ -235,7 +235,7 @@ Material: - _UVEmissive: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 - - _Wildness: 4.921429 + - _Wildness: 7.4285717 - _Wow: 4 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 @@ -243,7 +243,7 @@ Material: - _ZWrite: 1 - _Zing: 0 - _Zip: 0.5 - - _Zoom: -0.54285717 + - _Zoom: -0.005714178 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Scenes/MNML_Bar.unity b/Assets/Scenes/MNML_Bar.unity index cfc0d43..7e437c2 100644 --- a/Assets/Scenes/MNML_Bar.unity +++ b/Assets/Scenes/MNML_Bar.unity @@ -347,8 +347,8 @@ GameObject: - component: {fileID: 314607166} - component: {fileID: 314607165} - component: {fileID: 314607164} - - component: {fileID: 314607163} - component: {fileID: 314607168} + - component: {fileID: 314607169} m_Layer: 0 m_Name: Mnml_Bar m_TagString: VFX @@ -356,164 +356,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &314607163 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314607162} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2c94a50cf5c1d2449fe8305e8a79075, type: 3} - m_Name: - m_EditorClassIdentifier: - WasapiAudioSource: {fileID: 523739711} - Transformers: - - rid: 0 - Preview: - Values: - - 0.0012431039 - - 0.0027737746 - - 0.0026048257 - - 0.0020198394 - - 0.0021111877 - - 0.0037384091 - - 0.0044759084 - - 0.006491371 - - 0.0052341204 - - 0.0075579565 - - 0.008279628 - - 0.008644981 - - 0.0113847125 - - 0.010043057 - - 0.015380001 - - 0.016316615 - - 0.01186114 - - 0.0073365457 - - 0.004678923 - - 0.005485745 - - 0.019340107 - - 0.016283292 - - 0.018550359 - - 0.01756871 - - 0.013244495 - - 0.025880057 - - 0.028651465 - - 0.01576642 - - 0.011750478 - - 0.011429969 - - 0.018946115 - - 0.014763866 - - 0.019160414 - - 0.029766269 - - 0.019580672 - - 0.015558104 - - 0.013292792 - - 0.009715445 - - 0.011734378 - - 0.011605588 - - 0.009530318 - - 0.008645927 - - 0.010891043 - - 0.01590563 - - 0.024229545 - - 0.027129527 - - 0.037417777 - - 0.04527477 - - 0.037434757 - - 0.05476798 - - 0.038386658 - - 0.03135906 - - 0.023782384 - - 0.031533085 - - 0.053657018 - - 0.040088043 - - 0.04105039 - - 0.034834214 - - 0.031513754 - - 0.054932404 - - 0.045970753 - - 0.05120051 - - 0.035733767 - - 0.03635873 - - 0.036558513 - - 0.025686894 - - 0.021110741 - - 0.03611899 - - 0.029666014 - - 0.029346412 - - 0.022723507 - - 0.015718417 - - 0.019834202 - - 0.020924129 - - 0.017721007 - - 0.015047731 - - 0.012633732 - - 0.0143731525 - - 0.016775873 - - 0.016776884 - - 0.01320242 - - 0.011211315 - - 0.0101019675 - - 0.0076243 - - 0.011208214 - - 0.011563942 - - 0.010673966 - - 0.009605791 - - 0.0075184237 - - 0.007201897 - - 0.010583524 - - 0.011787975 - - 0.010668388 - - 0.008847694 - - 0.008844068 - - 0.010317871 - - 0.009002473 - - 0.007480818 - - 0.008110274 - - 0.007881075 - - 0.012680656 - - 0.010964481 - - 0.009003404 - - 0.00844014 - - 0.010007916 - - 0.0075894156 - - 0.0084041 - - 0.007538668 - - 0.008013703 - - 0.010306304 - - 0.00900571 - - 0.010155129 - - 0.010131333 - - 0.0091438405 - - 0.0077488553 - - 0.009024166 - - 0.0068939477 - - 0.008343678 - - 0.0070511024 - - 0.006969259 - - 0.004991641 - - 0.0051225666 - - 0.0043976046 - - 0.0038030413 - - 0.0034981142 - - 0.0022711947 - - 0.0017644819 - - 0.0009231927 - SpectrumSizeParameter: - m_Name: SpectrumSize - SpectrumDataTextureParameter: - m_Name: SpectrumDataTexture - symmetric: 1 - references: - version: 2 - RefIds: - - rid: 0 - type: {class: SmoothSpectrumTransformer, ns: Assets.WasapiAudio.Scripts.Unity.Transformers, asm: Assembly-CSharp} - data: - Enabled: 1 - Iterations: 2 --- !u!114 &314607164 MonoBehaviour: m_ObjectHideFlags: 0 @@ -528,8 +370,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_ExecuteInEditor: 1 m_Bindings: - - {fileID: 314607163} - {fileID: 314607168} + - {fileID: 314607169} m_VisualEffect: {fileID: 314607166} --- !u!73398921 &314607165 VFXRenderer: @@ -627,38 +469,38 @@ VisualEffect: m_Array: - m_Value: serializedVersion: 2 - key0: {r: 6.498019, g: 0, b: 0, a: 1} - key1: {r: 0, g: 0.6901961, b: 11.984314, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} + key0: {r: 0.54901963, g: 0.6862745, b: 0.7490196, a: 1} + key1: {r: 1.1058824, g: 1.3803922, b: 1.4980392, a: 1} + key2: {r: 2.2640715, g: 2.8221173, b: 3.0453355, a: 1} + key3: {r: 15.585392, g: 19.454105, b: 21.112125, a: 1} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} key6: {r: 0, g: 0, b: 0, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 + ctime1: 32768 + ctime2: 50308 + ctime3: 65535 ctime4: 0 ctime5: 0 ctime6: 0 ctime7: 0 atime0: 0 atime1: 65535 - atime2: 0 - atime3: 0 + atime2: 65535 + atime3: 65535 atime4: 0 atime5: 0 atime6: 0 atime7: 0 m_Mode: 0 - m_NumColorKeys: 2 + m_NumColorKeys: 4 m_NumAlphaKeys: 2 m_Name: Theme m_Overridden: 1 m_NamedObject: m_Array: - - m_Value: {fileID: 0} + - m_Value: {fileID: 892878085} m_Name: SpectrumDataTexture m_Overridden: 1 - m_Value: {fileID: 0} @@ -696,6 +538,158 @@ MonoBehaviour: preferences: {fileID: 657072715} ThemeParameter: m_Name: Theme +--- !u!114 &314607169 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314607162} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6dd81208ee44c0a4ea1f1682290e1979, type: 3} + m_Name: + m_EditorClassIdentifier: + selector: {fileID: 657072716} + Transformers: [] + Preview: + Values: + - 0.23888354 + - 0.17353822 + - 0.17295991 + - 0.15260774 + - 0.11234575 + - 0.12317718 + - 0.1110068 + - 0.1025876 + - 0.093349695 + - 0.09296363 + - 0.076809436 + - 0.09833406 + - 0.07439894 + - 0.064694025 + - 0.06052238 + - 0.06139929 + - 0.05652954 + - 0.065242484 + - 0.06411609 + - 0.07970958 + - 0.06205313 + - 0.061979752 + - 0.06218791 + - 0.06590707 + - 0.06686316 + - 0.062134624 + - 0.06405472 + - 0.05860386 + - 0.07035474 + - 0.06412209 + - 0.05555461 + - 0.05998336 + - 0.06521764 + - 0.06963375 + - 0.0675686 + - 0.06562733 + - 0.055545904 + - 0.071001604 + - 0.06494825 + - 0.05963746 + - 0.056340717 + - 0.062331866 + - 0.05734214 + - 0.0592357 + - 0.057231102 + - 0.05155186 + - 0.053182684 + - 0.046847064 + - 0.04873142 + - 0.044051025 + - 0.064280815 + - 0.05410839 + - 0.062013775 + - 0.06511413 + - 0.06791328 + - 0.061414752 + - 0.059348155 + - 0.0633455 + - 0.060843404 + - 0.064499326 + - 0.062092062 + - 0.06813059 + - 0.065631926 + - 0.066855475 + - 0.06286328 + - 0.060723882 + - 0.0580257 + - 0.058789603 + - 0.052211575 + - 0.055169087 + - 0.055587813 + - 0.048902012 + - 0.050588872 + - 0.045760464 + - 0.05104131 + - 0.05218332 + - 0.05052799 + - 0.055499926 + - 0.057268407 + - 0.059944674 + - 0.06044502 + - 0.059002664 + - 0.060153417 + - 0.0622742 + - 0.055628482 + - 0.058346428 + - 0.060046386 + - 0.0622248 + - 0.06243082 + - 0.06692159 + - 0.06429483 + - 0.07090308 + - 0.06833608 + - 0.078178816 + - 0.07494213 + - 0.072572984 + - 0.07389457 + - 0.073133044 + - 0.07174025 + - 0.07356867 + - 0.07129334 + - 0.07032652 + - 0.080316566 + - 0.07459777 + - 0.06886115 + - 0.069525816 + - 0.0787165 + - 0.082694106 + - 0.08049705 + - 0.08069088 + - 0.07739085 + - 0.07454328 + - 0.07627618 + - 0.072184876 + - 0.06830449 + - 0.069982134 + - 0.067618884 + - 0.068540566 + - 0.06810716 + - 0.06644499 + - 0.06437518 + - 0.056908622 + - 0.059050996 + - 0.057941042 + - 0.05201929 + - 0.049858764 + - 0.04815997 + - 0.026198257 + SpectrumSizeParameter: + m_Name: SpectrumSize + SpectrumDataTextureParameter: + m_Name: SpectrumDataTexture + symmetric: 1 + references: + version: 2 + RefIds: [] --- !u!1 &523739710 GameObject: m_ObjectHideFlags: 0 @@ -753,6 +747,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 634275950743134112, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: sources.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 634275950743134112, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: sources.Array.data[0] + value: + objectReference: {fileID: 523739711} + - target: {fileID: 634275950743134112, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: sources.Array.data[1] + value: + objectReference: {fileID: 820074939} + - target: {fileID: 634275950743134112, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: sources.Array.data[2] + value: + objectReference: {fileID: 0} + - target: {fileID: 634275950743134112, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: sources.Array.data[3] + value: + objectReference: {fileID: 0} - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_Pivot.x value: 0 @@ -841,6 +855,22 @@ PrefabInstance: propertyPath: m_Name value: Menu objectReference: {fileID: 0} + - target: {fileID: 6749243352969479682, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6749243352969479682, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 657072716} + - target: {fileID: 6749243352969479682, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: UseNextSource + objectReference: {fileID: 0} + - target: {fileID: 6749243352969479682, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: AudioSelector, Assembly-CSharp + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} --- !u!114 &657072715 stripped @@ -854,6 +884,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26b88d85e12af85469a5e3e4cfc3586b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &657072716 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 634275950743134112, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + m_PrefabInstance: {fileID: 657072714} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc21ac8b706913b47897e9f83d170bc5, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &667181310 GameObject: m_ObjectHideFlags: 0 @@ -884,7 +925,6 @@ Transform: m_Children: - {fileID: 523739712} - {fileID: 820074938} - - {fileID: 1430702716} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -938,6 +978,53 @@ MonoBehaviour: MinFrequency: 80 MaxFrequency: 20000 Filters: [] +--- !u!28 &892878085 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AudioSpectrumData128 + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 2 + m_Width: 256 + m_Height: 1 + m_CompleteImageSize: 1024 + m_MipsStripped: 0 + m_TextureFormat: 18 + m_MipCount: 1 + m_IsReadable: 1 + m_IsPreProcessed: 0 + m_IgnoreMasterTextureLimit: 0 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_VTOnly: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 0 + m_PlatformBlob: + image data: 1024 + _typelessdata: ba9dd63c6443453db4384c3d2e12553d96536d3d75df713d0419693d22d7833d5014883dc47b8b3dff5e8c3dc57b8a3dcb528f3d39e38b3daad5933db0369c3d26aa983d187f9e3d4341a53da3dba43d875ba93d1e36a13d8d638e3d13078d3db7c6983d037da43d5a07903d3e02923d2cab963d8dec923dc7c6953d0956973d25a1943d427b993d371ca03dc9f38b3da235913d02ad833d300e893d76b77f3d6fdf7e3d33f3753daafc6e3db1da633d3b137f3d6e63763dc7ac713d3395773d8c88753d47926a3de453633d70f64e3d2dbe553db110513d536f3b3d47364f3d7a4d483d0cb0633dfbf8613dcedb553d5ecd703d5bac6d3d9bb9783d77be803d86eb883d086a863d0d888b3d3f547e3d3918843def36793d49bb813d0d17733d098e7b3d1e168b3d8f5a853d28027e3dc2a05d3da9a5833dd96e343d999a473db5e23f3d16d6593d0b28533d296b6a3d22a1723d97df6a3db34f7f3d86c5663d6946743d9703853d4a69913d1a84633d9f67863d68618a3d249c8e3dd390853d1db1753d3b8d633d7152833d2516903d9a0a703d1f2f833de0807e3d8def883d49fa863dc0b87e3d7bde7d3d6c2b7e3dc73ea33d4c4f833dda9d853d858b673dd27d7b3d51e6773d4d7e843d795e983d5e63c93d444e9d3db763be3d202ebf3d7319d23d8857e33d5144fc3d8715e63d34451c3e671c313e01b4313ee39d743ee39d743e01b4313e671c313e34451c3e8715e63d5144fc3d8857e33d7319d23d202ebf3db763be3d444e9d3d5e63c93d795e983d4d7e843d51e6773dd27d7b3d858b673dda9d853d4c4f833dc73ea33d6c2b7e3d7bde7d3dc0b87e3d49fa863d8def883de0807e3d1f2f833d9a0a703d2516903d7152833d3b8d633d1db1753dd390853d249c8e3d68618a3d9f67863d1a84633d4a69913d9703853d6946743d86c5663db34f7f3d97df6a3d22a1723d296b6a3d0b28533d16d6593db5e23f3d999a473dd96e343da9a5833dc2a05d3d28027e3d8f5a853d1e168b3d098e7b3d0d17733d49bb813def36793d3918843d3f547e3d0d888b3d086a863d86eb883d77be803d9bb9783d5bac6d3d5ecd703dcedb553dfbf8613d0cb0633d7a4d483d47364f3d536f3b3db110513d2dbe553d70f64e3de453633d47926a3d8c88753d3395773dc7ac713d6e63763d3b137f3db1da633daafc6e3d33f3753d6fdf7e3d76b77f3d300e893d02ad833da235913dc9f38b3d371ca03d427b993d25a1943d0956973dc7c6953d8dec923d2cab963d3e02923d5a07903d037da43db7c6983d13078d3d8d638e3d1e36a13d875ba93da3dba43d4341a53d187f9e3d26aa983db0369c3daad5933d39e38b3dcb528f3dc57b8a3dff5e8c3dc47b8b3d5014883d22d7833d0419693d75df713d96536d3d2e12553db4384c3d6443453dba9dd63c + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1217833488 GameObject: m_ObjectHideFlags: 0 @@ -1138,100 +1225,3 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &1430702715 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1430702716} - - component: {fileID: 1430702717} - m_Layer: 0 - m_Name: WasapiLoopbackLofi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1430702716 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1430702715} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 667181311} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1430702717 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1430702715} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 120ca4c4f9442e14db8c72acac5da136, type: 3} - m_Name: - m_EditorClassIdentifier: - CaptureType: 0 - SpectrumSize: 32 - ScalingStrategy: 2 - MinFrequency: 80 - MaxFrequency: 22000 - Filters: [] ---- !u!28 &1444077409 -Texture2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AudioSpectrumData128 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_IsAlphaChannelOptional: 0 - serializedVersion: 2 - m_Width: 256 - m_Height: 1 - m_CompleteImageSize: 1024 - m_MipsStripped: 0 - m_TextureFormat: 18 - m_MipCount: 1 - m_IsReadable: 1 - m_IsPreProcessed: 0 - m_IgnoreMasterTextureLimit: 0 - m_StreamingMipmaps: 0 - m_StreamingMipmapsPriority: 0 - m_VTOnly: 0 - m_AlphaIsTransparency: 0 - m_ImageCount: 1 - m_TextureDimension: 2 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 1 - m_MipBias: 0 - m_WrapU: 0 - m_WrapV: 0 - m_WrapW: 0 - m_LightmapFormat: 0 - m_ColorSpace: 0 - m_PlatformBlob: - image data: 1024 - _typelessdata: 2ad39a3d2ad31a3e3665423ebae8823e62e8823e11f2873e96e68c3e22d7903ebf48a33eaad7a33e494aa43e8838a53e98a8a23ed6b0a23e147aa53e5934b33e9eaaba3ee00fb73e8081b93e6534b43ebe6cb93e365bb03e92e4ac3e34abb83e806db63e0630aa3eda5eba3ea824ba3e5866cf3e6a30ca3eb0fad53e2c97e53e90d0d63e8a7cc23edeb9c83e6b30b23ec544cc3ee3ddb63ee23eb83ef46cbc3e24b3ae3e7a27b43e1eaf9a3e7e9fb03ef588b93e9896ac3eb02ab23e1416b93e4e31a73e7280b73ecf35a83e2eba943e0942a23ea777a43ec80a9e3eeeb8a43e1e37af3e5c2baa3ed958ad3ef9b5b33e5bdcd63ec16fb83e884caf3e5cb2b33e6845b03e3c79af3eac68b93ef77ac63e7d22d73e562bce3e62a3b33ece9ec53e3fe9bb3e4a1fc93ed399b43e8758a73e2221b43eae0bcf3e54ddf03e6859d93eb601ea3e4b46d83e66d7cd3ece85e23ed1a5bc3e747eb53e0d27b73e66e8cc3e40ccde3ee011cf3ed2cfa23e2ec5933e4257a43e8a25b53ed45ad33e1625c33ec5e49d3eac92b23e146dae3e36d7c63eb98ee63ecf0df03eb225e53e2d8fa53eaee6a73e357fb63e27e5bb3ea400cb3ed08caf3eeaafa03e2659ac3e2cd5aa3e2a0db63e0e49ce3e1430e03e3af1c83ea806a23e780e9d3e9c6da83e8715a53ed7c7aa3e82b9bd3ed2b5b23e706f863ea5057a3e50d37b3e5829883ede0e7c3ede0e7c3e5829883e50d37b3ea5057a3e706f863ed2b5b23e82b9bd3ed7c7aa3e8715a53e9c6da83e780e9d3ea806a23e3af1c83e1430e03e0e49ce3e2a0db63e2cd5aa3e2659ac3eeaafa03ed08caf3ea400cb3e27e5bb3e357fb63eaee6a73e2d8fa53eb225e53ecf0df03eb98ee63e36d7c63e146dae3eac92b23ec5e49d3e1625c33ed45ad33e8a25b53e4257a43e2ec5933ed2cfa23ee011cf3e40ccde3e66e8cc3e0d27b73e747eb53ed1a5bc3ece85e23e66d7cd3e4b46d83eb601ea3e6859d93e54ddf03eae0bcf3e2221b43e8758a73ed399b43e4a1fc93e3fe9bb3ece9ec53e62a3b33e562bce3e7d22d73ef77ac63eac68b93e3c79af3e6845b03e5cb2b33e884caf3ec16fb83e5bdcd63ef9b5b33ed958ad3e5c2baa3e1e37af3eeeb8a43ec80a9e3ea777a43e0942a23e2eba943ecf35a83e7280b73e4e31a73e1416b93eb02ab23e9896ac3ef588b93e7e9fb03e1eaf9a3e7a27b43e24b3ae3ef46cbc3ee23eb83ee3ddb63ec544cc3e6b30b23edeb9c83e8a7cc23e90d0d63e2c97e53eb0fad53e6a30ca3e5866cf3ea824ba3eda5eba3e0630aa3e806db63e34abb83e92e4ac3e365bb03ebe6cb93e6534b43e8081b93ee00fb73e9eaaba3e5934b33e147aa53ed6b0a23e98a8a23e8838a53e494aa43eaad7a33ebf48a33e22d7903e96e68c3e11f2873e62e8823ebae8823e3665423e2ad31a3e2ad39a3d - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: diff --git a/Assets/Util/AudioSelector.cs b/Assets/Util/AudioSelector.cs new file mode 100644 index 0000000..391614f --- /dev/null +++ b/Assets/Util/AudioSelector.cs @@ -0,0 +1,23 @@ +using Assets.WasapiAudio.Scripts.Unity; +using System.Collections.Generic; +using System.Collections; +using UnityEngine; + +public class AudioSelector : MonoBehaviour { + public WasapiAudioSource[] sources; + private int sources_i = 0; + + void Awake() { + sources_i = 0; + Debug.Log($"{sources[sources_i]}"); + } + + public void UseNextSource() { + sources_i = (sources_i + 1) % sources.Length; + } + + public WasapiAudioSource CurrentSource() { + return sources[sources_i]; + } +} + diff --git a/Assets/Audio/SpectreVfxBinder.cs.meta b/Assets/Util/AudioSelector.cs.meta similarity index 83% rename from Assets/Audio/SpectreVfxBinder.cs.meta rename to Assets/Util/AudioSelector.cs.meta index 816137f..7ae1622 100644 --- a/Assets/Audio/SpectreVfxBinder.cs.meta +++ b/Assets/Util/AudioSelector.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2c94a50cf5c1d2449fe8305e8a79075 +guid: fc21ac8b706913b47897e9f83d170bc5 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Audio/SpectreVfxSdfBinder.cs b/Assets/Util/SpectreVfxSdfBinder.cs similarity index 100% rename from Assets/Audio/SpectreVfxSdfBinder.cs rename to Assets/Util/SpectreVfxSdfBinder.cs diff --git a/Assets/Audio/SpectreVfxSdfBinder.cs.meta b/Assets/Util/SpectreVfxSdfBinder.cs.meta similarity index 100% rename from Assets/Audio/SpectreVfxSdfBinder.cs.meta rename to Assets/Util/SpectreVfxSdfBinder.cs.meta diff --git a/Assets/Audio/SpectrumFullscreenPassBinder.cs b/Assets/Util/SpectrumFullscreenPassBinder.cs similarity index 96% rename from Assets/Audio/SpectrumFullscreenPassBinder.cs rename to Assets/Util/SpectrumFullscreenPassBinder.cs index 82677f1..32d21d8 100644 --- a/Assets/Audio/SpectrumFullscreenPassBinder.cs +++ b/Assets/Util/SpectrumFullscreenPassBinder.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using Assets.WasapiAudio.Scripts.Unity; [RequireComponent(typeof(Material))] -public class SpectrumFullscreenPassBinder : MonoBehaviour -{ +public class SpectrumFullscreenPassBinder : MonoBehaviour { public WasapiAudioSource source; private Texture2D _texture; @@ -76,8 +75,6 @@ public class SpectrumFullscreenPassBinder : MonoBehaviour } public void UpdateBinding() { - UpdateTexture(); - // !!!! // you must set these via a literal string for some raeson // having them as a public property didn't work diff --git a/Assets/Audio/SpectrumFullscreenPassBinder.cs.meta b/Assets/Util/SpectrumFullscreenPassBinder.cs.meta similarity index 100% rename from Assets/Audio/SpectrumFullscreenPassBinder.cs.meta rename to Assets/Util/SpectrumFullscreenPassBinder.cs.meta diff --git a/Assets/Audio/SpectrumMaterialBinder.cs b/Assets/Util/SpectrumMaterialBinder.cs similarity index 100% rename from Assets/Audio/SpectrumMaterialBinder.cs rename to Assets/Util/SpectrumMaterialBinder.cs diff --git a/Assets/Audio/SpectrumMaterialBinder.cs.meta b/Assets/Util/SpectrumMaterialBinder.cs.meta similarity index 100% rename from Assets/Audio/SpectrumMaterialBinder.cs.meta rename to Assets/Util/SpectrumMaterialBinder.cs.meta diff --git a/Assets/Audio/SpectrumShaderBinder.cs b/Assets/Util/SpectrumShaderBinder.cs similarity index 100% rename from Assets/Audio/SpectrumShaderBinder.cs rename to Assets/Util/SpectrumShaderBinder.cs diff --git a/Assets/Audio/SpectrumShaderBinder.cs.meta b/Assets/Util/SpectrumShaderBinder.cs.meta similarity index 100% rename from Assets/Audio/SpectrumShaderBinder.cs.meta rename to Assets/Util/SpectrumShaderBinder.cs.meta diff --git a/Assets/Audio/ThemeLightBinder.cs b/Assets/Util/ThemeLightBinder.cs similarity index 100% rename from Assets/Audio/ThemeLightBinder.cs rename to Assets/Util/ThemeLightBinder.cs diff --git a/Assets/Audio/ThemeLightBinder.cs.meta b/Assets/Util/ThemeLightBinder.cs.meta similarity index 100% rename from Assets/Audio/ThemeLightBinder.cs.meta rename to Assets/Util/ThemeLightBinder.cs.meta diff --git a/Assets/Audio/ThemeShaderBinder.cs b/Assets/Util/ThemeShaderBinder.cs similarity index 100% rename from Assets/Audio/ThemeShaderBinder.cs rename to Assets/Util/ThemeShaderBinder.cs diff --git a/Assets/Audio/ThemeShaderBinder.cs.meta b/Assets/Util/ThemeShaderBinder.cs.meta similarity index 100% rename from Assets/Audio/ThemeShaderBinder.cs.meta rename to Assets/Util/ThemeShaderBinder.cs.meta diff --git a/Assets/Util/VfxSpectrumBinder.cs b/Assets/Util/VfxSpectrumBinder.cs new file mode 100644 index 0000000..7abf44e --- /dev/null +++ b/Assets/Util/VfxSpectrumBinder.cs @@ -0,0 +1,72 @@ +using UnityEngine; +using UnityEngine.VFX; +using UnityEngine.VFX.Utility; +using Assets.WasapiAudio.Scripts.Unity; + +[AddComponentMenu("VFX/Property Binders/Kaiju/VFX Spectrum Binder")] +[VFXBinder("Kaiju/VFX Spectrum Binder")] +public class VfxSpectrumBinder : VfxAudioVisualizationEffect { + [VFXPropertyBinding("System.UInt32"), SerializeField] + protected ExposedProperty SpectrumSizeParameter = "SpectrumSize"; + + [VFXPropertyBinding("UnityEngine.Texture2D"), SerializeField] + protected ExposedProperty SpectrumDataTextureParameter = "SpectrumDataTexture"; + + public bool symmetric = false; + + private Texture2D _texture; + private Color[] _colorCache; + + private void InitialiseTexture() { + Debug.Log("Reinitialising spectrum texture..."); + if (symmetric) { + _texture = new Texture2D(SpectrumSize * 2, 1, TextureFormat.RFloat, false); + _colorCache = new Color[SpectrumSize * 2]; + } else { + _texture = new Texture2D(SpectrumSize, 1, TextureFormat.RFloat, false); + _colorCache = new Color[SpectrumSize]; + } + + _texture.name = $"AudioSpectrumData{SpectrumSize}"; + } + + private void UpdateTexture() { + // init + if (_texture == null) InitialiseTexture(); + + // has symmetric been toggled and the texture needs updating? + if (symmetric && _texture.width != SpectrumSize * 2) InitialiseTexture(); + if (!symmetric && _texture.width != SpectrumSize) InitialiseTexture(); + + var spectrumData = GetSpectrumData(); + + if (symmetric) { + for (int i = 0; i < SpectrumSize; i++) { + _colorCache[SpectrumSize + i] = new Color(spectrumData[i], 0, 0, 0); + _colorCache[SpectrumSize - (i + 1)] = new Color(spectrumData[i], 0, 0, 0); + } + } else { + for (int i = 0; i < SpectrumSize; i++) { + _colorCache[i] = new Color(spectrumData[i], 0, 0, 0); + } + } + + _texture.SetPixels(_colorCache); + _texture.Apply(); + } + + public override void UpdateBinding(VisualEffect component) { + base.UpdateBinding(component); + UpdateTexture(); + if (symmetric) { + component.SetUInt(SpectrumSizeParameter, (uint) SpectrumSize * 2); + } else { + component.SetUInt(SpectrumSizeParameter, (uint) SpectrumSize); + } + component.SetTexture(SpectrumDataTextureParameter, _texture); + } + + public override string ToString() { + return "Audio Spectrum Data"; + } +} diff --git a/Assets/Util/VfxSpectrumBinder.cs.meta b/Assets/Util/VfxSpectrumBinder.cs.meta new file mode 100644 index 0000000..d883b74 --- /dev/null +++ b/Assets/Util/VfxSpectrumBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6dd81208ee44c0a4ea1f1682290e1979 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WasapiAudio/Scripts/Unity/VfxAudioVisualizationEffect.cs b/Assets/WasapiAudio/Scripts/Unity/VfxAudioVisualizationEffect.cs index e3a54c7..d42fedb 100644 --- a/Assets/WasapiAudio/Scripts/Unity/VfxAudioVisualizationEffect.cs +++ b/Assets/WasapiAudio/Scripts/Unity/VfxAudioVisualizationEffect.cs @@ -8,7 +8,8 @@ namespace Assets.WasapiAudio.Scripts.Unity public abstract class VfxAudioVisualizationEffect : VFXBinderBase { // Inspector Properties - public WasapiAudioSource WasapiAudioSource; + public AudioSelector selector; + WasapiAudioSource WasapiAudioSource; [SerializeReference] [SerializeReferenceButton] @@ -19,13 +20,13 @@ namespace Assets.WasapiAudio.Scripts.Unity protected int SpectrumSize { get; private set; } - public override bool IsValid(VisualEffect component) - { - return WasapiAudioSource != null; + public override bool IsValid(VisualEffect component) { + return selector != null + && selector.CurrentSource() != null; } - public override void UpdateBinding(VisualEffect component) - { + public override void UpdateBinding(VisualEffect component) { + WasapiAudioSource = selector.CurrentSource(); SpectrumSize = WasapiAudioSource.SpectrumSize; Preview = new SpectrumData(); } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f77cf60..2fcfe4a 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 5500520454045f0a0e0c5e214171094444164c2b787b7f69752f1931bbb63669 + value: 5004505157545e03590c087b44725a44134e492c752c22317c7c4463b3b56260 flags: 0 RecentlyUsedSceneGuid-1: value: 5702040754575f0f595c5d7747270a44174e4f2b2d7a7735287f4e61b2e5326f flags: 0 RecentlyUsedSceneGuid-2: - value: 56550604070d5f5a095e097041250c4443164b7c7b717232287b4565b6e43561 + value: 50500c0301500c58590b557749720f4447161b7e2d2e22332f2b1c6ab5b0323d flags: 0 RecentlyUsedSceneGuid-3: - value: 5a04555f540c5f0a59575b7343705a44414e407f7a7174697e7d4d31e1b9326a + value: 5101025151565c0d0c5a0d7340205c44401640782a7924642c2c4d6bb3b36c3d flags: 0 RecentlyUsedSceneGuid-4: - value: 5552055654570f0c5b57587b11745b44444e1e2f7b2c23322b781e6be7b16d3b + value: 06545107560c500a0e0f5876122706444f164d297f2e7534742d1964bbb1653c flags: 0 RecentlyUsedSceneGuid-5: - value: 56090c5203075c5f555f597745270f441016487b757b2763797e1e61e6e1303c + value: 5b060c5f03535e020b5e5f7542705a44434f4d7a2a2c27362f7f1830e3e6353e flags: 0 RecentlyUsedSceneGuid-6: - value: 575201005001585d0e0c547a49205b4410164f29792d23337e7e4465e3b5603c + value: 05050651520d5b5a595e0a2448700944154f4e78747c23647f7d1c6be3b46039 flags: 0 RecentlyUsedSceneGuid-7: - value: 5606060550530a5a5e5b5573417a5e4444164e7f7f2e70647c794566e7e3376e + value: 065055040404080d0b0b0d2441755a44124f402b742d70637c284d63e0e5606c flags: 0 RecentlyUsedSceneGuid-8: value: 550407570457580d5a0f0a7a13755c4417154b2b7a707369757f4a67b7e56368 flags: 0 RecentlyUsedSceneGuid-9: - value: 020405530005580d5e5b552616755b444e164e722e2d71607f794935b2b8353e + value: 0155075654030a0f0c56552444250e44104e4a787f2d22362e7e1c6be4b7633b flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c723e3b3b270b3e3a2729633c133af6f9 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 03f6983..d9b9168 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -224,9 +224,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 7a660000 m_LastClickedID: 0 - m_ExpandedIDs: 1077fbff3478fbff1c79fbffee79fbffbe7afbff8e7bfbff607cfbff327dfbff047efbffd67efbffa87ffbff7480fbff4081fbff1282fbffe482fbffb683fbff8884fbff5a85fbff2c86fbff0087fbffd287fbffac88fbff2e8bfbff5a8cfbff548ffbff2690fbfff690fbffc691fbff9892fbff6a93fbff3c94fbff1a95fbffec95fbffb896fbff8697fbff5898fbff2a99fbfffc99fbffce9afbffa29bfbff749cfbff489dfbff1a9efbfffc9efbff76c5fbff78c5fbff54c7fbffe2d0fbff34d9fbff80e3fbff00edfbff7cf8fbff9cfffbffd2e5fcffd4e5fcff04eefcff840afdff9212fdffea2dfdffd835fdff625afdff8a74ffff229cffff72adffff3cc1ffff24c3ffff02c5ffff1cfbffff9c8b00004e96000094960000fa960000e2cb0000a8ea0000d2ea000052eb0000 + m_ExpandedIDs: 7a63faff5c6bfafff87afaffdc7cfaff8e84faff0687faff2a88faff1289faffe489faffb48afaff848bfaff568cfaff288dfafffa8dfaffcc8efaff9e8ffaff6a90faff3691faff0892faffda92faffac93faff7e94faff5095faff2296fafff696faffc897faffa298faff2c9bfaff569cfaff529ffaff24a0fafff4a0faffc4a1faff96a2faff68a3faff3aa4faff18a5faffeaa5faffb6a6faff84a7faff56a8faff28a9fafffaa9faffccaafaffa0abfaff72acfaff46adfaff18aefafffaaefaffc8c0fafff2c1faffeec4faffc2c5faff94c6faff66c7faff3ac8faff0ec9faffe2c9faffc2cafaff96cbfaff64ccfaff34cdfaff08cefaffdccefaffb0cffaff84d0faff5ad1faff2ed2faff04d3faffd8d3faffbcd4faff48fdfaff72fefaff6e01fbff4202fbff1403fbffe603fbffba04fbff8e05fbff6206fbff4207fbff1608fbffe408fbffb409fbff880afbff5c0bfbff300cfbff040dfbffda0dfbffae0efbff840ffbff5810fbff3c11fbff664afbff924bfbff8c4efbff5e4ffbff2e50fbfffe50fbffd051fbffa252fbff7453fbff4654fbff1855fbffe455fbffb056fbff8257fbff5458fbff2659fbfff859fbffca5afbff9c5bfbff705cfbff425dfbff1c5efbff2261fbfff461fbffd262fbffa463fbff7064fbff3e65fbff1066fbffe266fbffb467fbff8668fbff5a69fbff2c6afbff006bfbffd26bfbffb46cfbff1077fbff3478fbff1c79fbffee79fbffbe7afbff8e7bfbff607cfbff327dfbff047efbffd67efbffa87ffbff7480fbff4081fbff1282fbffe482fbffb683fbff8884fbff5a85fbff2c86fbff0087fbffd287fbffac88fbff2e8bfbff5a8cfbff548ffbff2690fbfff690fbffc691fbff9892fbff6a93fbff3c94fbff1a95fbffec95fbffb896fbff8697fbff5898fbff2a99fbfffc99fbffce9afbffa29bfbff749cfbff489dfbff1a9efbfffc9efbff76c5fbff78c5fbff54c7fbffe2d0fbff34d9fbff80e3fbff00edfbff7cf8fbff9cfffbffd2e5fcffd4e5fcff04eefcff840afdff9212fdffea2dfdffd835fdff625afdff6227ffff8a74ffff229cffff72adffff3cc1ffff24c3ffff02c5ffffd8eeffffc4f0ffff1cfbffff9c8b00004e96000094960000fa960000e2cb0000a8ea0000d2ea000052eb0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -712,7 +712,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -727,7 +728,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 30830000 m_LastClickedID: 33584 - m_ExpandedIDs: ffffffff00000000f2630000f4630000f6630000f8630000fa630000fc630000fe63000000640000026400000464000006640000086400000a6400000c6400000e64000010640000126400001464000016640000a6650000e4650000b6ca0000 + m_ExpandedIDs: ffffffff000000008a6500008c6500008e65000090650000926500009465000096650000986500009a6500009c6500009e650000a0650000a2650000a4650000a6650000a8650000aa650000ac650000ae650000b0650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -752,10 +753,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2630000f4630000f6630000f8630000fa630000fc630000fe63000000640000026400000464000006640000086400000a6400000c6400000e64000010640000126400001464000016640000a665000000310100 + scrollPos: {x: 0, y: 1200} + m_SelectedIDs: 7a660000 + m_LastClickedID: 26234 + m_ExpandedIDs: ffffffff000000008a6500008c6500008e65000090650000926500009465000096650000986500009a6500009c6500009e650000a0650000a2650000a4650000a6650000a8650000aa650000ac650000ae650000b0650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -780,8 +781,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 7a660000 + m_LastClickedInstanceID: 26234 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -887,8 +888,8 @@ MonoBehaviour: y: 0 width: 616 height: 1307 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 0800fe8..980b57b 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 25 + controlID: 439 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 26 + controlID: 440 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 27 + controlID: 441 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -320,7 +320,7 @@ MonoBehaviour: m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 - m_Stats: 1 + m_Stats: 0 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 @@ -339,7 +339,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -401,9 +401,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: b2680000 + m_SelectedIDs: 2c660000 m_LastClickedID: 0 - m_ExpandedIDs: 56d9ffff18fbffff + m_ExpandedIDs: 7a63faff5c6bfafff87afaffdc7cfaff8e84faff0687faff2a88faff1289faffe489faffb48afaff848bfaff568cfaff288dfafffa8dfaffcc8efaff9e8ffaff6a90faff3691faff0892faffda92faffac93faff7e94faff5095faff2296fafff696faffc897faffa298faff2c9bfaff569cfaff529ffaff24a0fafff4a0faffc4a1faff96a2faff68a3faff3aa4faff18a5faffeaa5faffb6a6faff84a7faff56a8faff28a9fafffaa9faffccaafaffa0abfaff72acfaff46adfaff18aefafffaaefaffc8c0fafff2c1faffeec4faffc2c5faff94c6faff66c7faff3ac8faff0ec9faffe2c9faffc2cafaff96cbfaff64ccfaff34cdfaff08cefaffdccefaffb0cffaff84d0faff5ad1faff2ed2faff04d3faffd8d3faffbcd4faff48fdfaff72fefaff6e01fbff4202fbff1403fbffe603fbffba04fbff8e05fbff6206fbff4207fbff1608fbffe408fbffb409fbff880afbff5c0bfbff300cfbff040dfbffda0dfbffae0efbff840ffbff5810fbff3c11fbff664afbff924bfbff8c4efbff5e4ffbff2e50fbfffe50fbffd051fbffa252fbff7453fbff4654fbff1855fbffe455fbffb056fbff8257fbff5458fbff2659fbfff859fbffca5afbff9c5bfbff705cfbff425dfbff1c5efbff2261fbfff461fbffd262fbffa463fbff7064fbff3e65fbff1066fbffe266fbffb467fbff8668fbff5a69fbff2c6afbff006bfbffd26bfbffb46cfbff1077fbff3478fbff1c79fbffee79fbffbe7afbff8e7bfbff607cfbff327dfbff047efbffd67efbffa87ffbff7480fbff4081fbff1282fbffe482fbffb683fbff8884fbff5a85fbff2c86fbff0087fbffd287fbffac88fbff2e8bfbff5a8cfbff548ffbff2690fbfff690fbffc691fbff9892fbff6a93fbff3c94fbff1a95fbffec95fbffb896fbff8697fbff5898fbff2a99fbfffc99fbffce9afbffa29bfbff749cfbff489dfbff1a9efbfffc9efbff76c5fbff78c5fbff54c7fbffe2d0fbff34d9fbff80e3fbff00edfbff7cf8fbff9cfffbffd2e5fcffd4e5fcff04eefcff840afdff9212fdffea2dfdffd835fdff625afdffb8d2feff201affff221affff6227ffff8a74ffff229cffff72adffff3cc1ffff24c3ffff02c5ffffd8eeffffc4f0ffff1cfbffff426e00009c8b00004e96000094960000fa960000e2cb0000a8ea0000d2ea000052eb0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -419,7 +419,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -461,7 +461,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -1} + snapOffsetDelta: {x: -101, y: -26} snapCorner: 3 id: Tool Settings index: 0 @@ -483,7 +483,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar index: 0 @@ -494,7 +494,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -505,7 +505,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar index: 0 @@ -527,7 +527,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -538,7 +538,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Camera index: 1 @@ -549,7 +549,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -560,7 +560,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -571,7 +571,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -582,7 +582,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -593,7 +593,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -604,7 +604,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -615,7 +615,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -626,7 +626,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -637,7 +637,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 10 @@ -659,7 +659,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Visual Effect index: 12 @@ -670,7 +670,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Visual Effect Event Tester index: 13 @@ -849,7 +849,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 30830000 m_LastClickedID: 33584 - m_ExpandedIDs: 000000009c6600009e660000a0660000a2660000a4660000a6660000a8660000aa660000ac660000ae660000b0660000b2660000b4660000b6660000b8660000ba660000bc660000be660000c0660000c2660000 + m_ExpandedIDs: ffffffff000000008a6500008c6500008e65000090650000926500009465000096650000986500009a6500009c6500009e650000a0650000a2650000a4650000a6650000a8650000aa650000ac650000ae650000b0650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -874,21 +874,21 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 660} + scrollPos: {x: 0, y: 780} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000009c6600009e660000a0660000a2660000a4660000a6660000a8660000aa660000ac660000ae660000b0660000b2660000b4660000b6660000b8660000bc660000be660000c0660000c2660000 + m_ExpandedIDs: ffffffff000000008a6500008c6500008e65000090650000926500009465000096650000986500009a6500009c6500009e650000a0650000a2650000a4650000a6650000a8650000aa650000ac650000ae650000d4650000ec6500002a66000092660000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: XboxControls - m_OriginalName: XboxControls + m_Name: MDNA_DreamLiquid + m_OriginalName: MDNA_DreamLiquid m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 26918 + m_UserData: 26154 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0