From d36158bc486570a872db2ba3d06f56842cf2c0f1 Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 2 Jun 2022 11:08:59 +1000 Subject: [PATCH] botany shader --- Assets/Audio/SpectrumShaderBinder.cs | 1 + Assets/Scenes/MDNA_Botany.unity | 35 ++- Assets/Scenes/MDNA_Botany/Botany.mat | 4 +- Assets/Scenes/MDNA_Botany/Botany.shader | 107 +++---- Assets/Scenes/MDNA_Botany/BotanyBinder.cs | 26 ++ .../Scenes/MDNA_Botany/BotanyBinder.cs.meta | 11 + .../MDNA_Botany/Global Volume Profile.asset | 15 - .../Global Volume Profile.asset.meta | 8 - Assets/Scenes/MDNA_Liugi/Liugi.mat | 2 +- .../Scenes/MDNA_Liugi/LiugiPropertyBinder.cs | 2 +- Assets/Scenes/MDNA_Luigi.unity | 8 +- Assets/Scenes/MDNA_Nebula.unity | 6 +- Assets/Scenes/MNML_CircleBar.unity | 264 +++++++++--------- .../_VisualisationTemplate.scenetemplate | 10 +- 14 files changed, 276 insertions(+), 223 deletions(-) create mode 100644 Assets/Scenes/MDNA_Botany/BotanyBinder.cs create mode 100644 Assets/Scenes/MDNA_Botany/BotanyBinder.cs.meta delete mode 100644 Assets/Scenes/MDNA_Botany/Global Volume Profile.asset delete mode 100644 Assets/Scenes/MDNA_Botany/Global Volume Profile.asset.meta diff --git a/Assets/Audio/SpectrumShaderBinder.cs b/Assets/Audio/SpectrumShaderBinder.cs index 70254da..be8e49e 100644 --- a/Assets/Audio/SpectrumShaderBinder.cs +++ b/Assets/Audio/SpectrumShaderBinder.cs @@ -68,6 +68,7 @@ public class SpectrumShaderBinder : MonoBehaviour } _texture.SetPixels(_colorCache); + _texture.wrapMode = TextureWrapMode.Clamp; _texture.Apply(); } diff --git a/Assets/Scenes/MDNA_Botany.unity b/Assets/Scenes/MDNA_Botany.unity index 9af9d68..d7be3cd 100644 --- a/Assets/Scenes/MDNA_Botany.unity +++ b/Assets/Scenes/MDNA_Botany.unity @@ -638,7 +638,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3a97ccee1c1df8e47bdc9e321a823b3d, type: 3} m_Name: m_EditorClassIdentifier: - material: {fileID: 2100000, guid: bc9fcf14a05bed241ab2c8df328c69d4, type: 2} --- !u!1 &523739710 GameObject: m_ObjectHideFlags: 0 @@ -897,6 +896,10 @@ PrefabInstance: propertyPath: PrevButton value: 8 objectReference: {fileID: 0} + - target: {fileID: 3099289455289463194, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} - target: {fileID: 5305278010342315827, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} propertyPath: m_Pivot.x value: 0 @@ -985,6 +988,10 @@ PrefabInstance: propertyPath: m_Name value: Menu objectReference: {fileID: 0} + - target: {fileID: 7200639167805561534, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 31660dba95ae9a9408051002a1e4c382, type: 3} --- !u!1 &667181310 @@ -1113,7 +1120,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateZoom m_Mode: 2 m_Arguments: @@ -1252,7 +1259,7 @@ MonoBehaviour: antialiasing: 1 SMAAQuality: 2 dithering: 0 - stopNaNs: 0 + stopNaNs: 1 taaSharpenStrength: 0.5 TAAQuality: 1 taaHistorySharpening: 0.35 @@ -1513,7 +1520,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateWildness m_Mode: 2 m_Arguments: @@ -1936,7 +1943,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 'Thanks to nimitz at Shadertoy (twitter: @stormoid)' + m_Text: Thanks to leon at Shadertoy --- !u!222 &1655664965 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2200,6 +2207,7 @@ GameObject: - component: {fileID: 2035115415} - component: {fileID: 2035115417} - component: {fileID: 2035115418} + - component: {fileID: 2035115419} m_Layer: 0 m_Name: ShaderPass m_TagString: Untagged @@ -2233,7 +2241,7 @@ MonoBehaviour: - rid: 2533213763830546433 type: {class: FullScreenCustomPass, ns: UnityEngine.Rendering.HighDefinition, asm: Unity.RenderPipelines.HighDefinition.Runtime} data: - m_Name: Liugi + m_Name: Luigi enabled: 1 targetColorBuffer: 0 targetDepthBuffer: 0 @@ -2293,6 +2301,19 @@ MonoBehaviour: m_EditorClassIdentifier: material: {fileID: 2100000, guid: bc9fcf14a05bed241ab2c8df328c69d4, type: 2} preferences: {fileID: 422322493} +--- !u!114 &2035115419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2035115414} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ce50dfd303cb104499ebc02baab5608, type: 3} + m_Name: + m_EditorClassIdentifier: + material: {fileID: 2100000, guid: bc9fcf14a05bed241ab2c8df328c69d4, type: 2} --- !u!1 &2045334060 GameObject: m_ObjectHideFlags: 0 @@ -2499,7 +2520,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateBrightness m_Mode: 2 m_Arguments: diff --git a/Assets/Scenes/MDNA_Botany/Botany.mat b/Assets/Scenes/MDNA_Botany/Botany.mat index df2fe97..32a2c0a 100644 --- a/Assets/Scenes/MDNA_Botany/Botany.mat +++ b/Assets/Scenes/MDNA_Botany/Botany.mat @@ -235,7 +235,7 @@ Material: - _UVEmissive: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 - - _Wildness: 6.942857 + - _Wildness: 0.593 - _Wow: 4 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 @@ -243,7 +243,7 @@ Material: - _ZWrite: 1 - _Zing: 0 - _Zip: 0.5 - - _Zoom: -0.43428576 + - _Zoom: 4.99 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/MDNA_Botany/Botany.shader b/Assets/Scenes/MDNA_Botany/Botany.shader index 3456104..b5c9325 100644 --- a/Assets/Scenes/MDNA_Botany/Botany.shader +++ b/Assets/Scenes/MDNA_Botany/Botany.shader @@ -6,8 +6,8 @@ Shader "FullScreen/Botany" _ThemeTexture("ThemeTexture", 2D) = "white" {} _SpectrumSize("SpectrumSize", float) = 16 - _Zoom("Zoom", range(-2, 2)) = 0.5 - _Wildness("Wildness", range(1, 10)) = 4.0 + _Zoom("Zoom", range(1, 10)) = 5 + _Wildness("Wildness", range(0.2, 2.0)) = 0.8 _Brightness("Brightness", range(1, 10)) = 4.0 } @@ -30,6 +30,11 @@ Shader "FullScreen/Botany" float time; float rng; + float sub; + float bass; + float mids; + float highs; + // ------------------------------------- // https://www.shadertoy.com/view/NddSWs // source @@ -37,36 +42,39 @@ Shader "FullScreen/Botany" // Dave Hoskins // https://www.shadertoy.com/view/4djSRW float hash13(float3 p3) { - p3 = frac(p3 * .1031); - p3 += dot(p3, p3.zyx + 31.32); + p3 = frac(p3 * .420); + p3 += dot(p3, p3.zyx + 322.8); return frac((p3.x + p3.y) * p3.z); } // Inigo Quilez // https://iquilezles.org/articles/distfunctions - float smin( float d1, float d2, float k ) { - float h = clamp( 0.5 + 0.5*(d2-d1)/k, 0.0, 1.0 ); - return lerp( d2, d1, h ) - k*h*(1.0-h); } + float smin(float d1, float d2, float k) { + float h = clamp(0.5 + bass * (d2-d1) / k, 0.0, 1.0); + return lerp(d2, d1, h) - k*h*(1.0-h); + } - float smoothing(float d1, float d2, float k) { return clamp( 0.5 + 0.5*(d2-d1)/k, 0.0, 1.0 ); } + float smoothing(float d1, float d2, float k) { return clamp( 0.5 + 0.5 *(d2-d1)/k, 0.0, 1.0 ); } // rotation matrix float2x2 rot(float a) { - float2x2 rm = {cos(a),-sin(a),sin(a),cos(a) }; + float2x2 rm = { cos(a), -sin(a), sin(a), cos(a) }; return rm; } - float3 repeat(float3 p, float r) { - return (p % r) / 2.0; + #define mod(x, y) (x - y * floor(x / y)) + + float3 repeat(float3 p, float3 r) { + return mod(p , r) - r / 2.0; } // sdf float map (float3 p) { // time stretched with noise - float t = time*1. + rng*0.9; + float t = time * 1.0 + rng * 2.9; // domain repetition - float grid = 5.0; + float3 grid = float3(_Zoom, _Zoom, _Zoom); float3 cell = floor(p/grid); p = repeat(p, grid); @@ -84,30 +92,34 @@ Shader "FullScreen/Botany" // kaleidoscopic iterated function const int count = 4; - float a = 1.0; + // float a = 1.0; + float a = 2.0; float scene = 1000.0; float shape = 1000.0; for (int index = 0; index < count; ++index) { // fold and translate - p.xz = abs(p.xz)-(.5+wave)*a; + p.xz = abs(p.xz) - (_Wildness + wave) * a; + // p.xz = abs(p.xz) - (0.5 + wave) * a; // rotate - p.xz = mul(rot(angle.y/a), p.xz); - p.yz = mul(rot(angle.x/a), p.yz); - p.yx = mul(rot(angle.z/a), p.yx); + // p.xz = mul(rot(angle.y/a), p.xz); + // p.yz = mul(rot(angle.x/a), p.yz); + // p.yx = mul(rot(angle.z/a), p.yx); - // p.xz = mul(p.xz, rot(angle.y/a)); - // p.yz = mul(p.yz, rot(angle.x/a)); - // p.yx = mul(p.yx, rot(angle.z/a)); + p.xz = mul(p.xz, rot(angle.y/a)); + p.yz = mul(p.yz, rot(angle.x/a)); + p.yx = mul(p.yx, rot(angle.z/a)); // sphere shape = length(p)-0.2*a*size; // material blending - material = lerp(material, float(index), smoothing(shape, scene, 0.3*a)); + // material = lerp(material, float(index), smoothing(shape, scene, 0.3*a)); + material = lerp(material, float(index), smoothing(shape, scene, mids*a)); // add with a blend - scene = smin(scene, shape, 1.0 * a); + // scene = smin(scene, shape, 1.0 * a); + scene = smin(scene, shape, 2.0 * sub * a); // falloff transformations a /= 1.9; @@ -120,40 +132,44 @@ Shader "FullScreen/Botany" float depth = LoadCameraDepth(varyings.positionCS.xy); PositionInputs posInput = GetPositionInput(varyings.positionCS.xy, _ScreenSize.zw, depth, UNITY_MATRIX_I_VP, UNITY_MATRIX_V); float2 ndc = posInput.positionNDC; + + // convert to glsl mode and fix aspect ratio float2 guv = posInput.positionNDC - 0.5; + guv.x *= _ScreenParams.x / _ScreenParams.y; // musique - float sub = tex2D(_SpectrumTexture, 0.0); - float bass = tex2D(_SpectrumTexture, 0.25); - float mids = tex2D(_SpectrumTexture, 0.50); - float highs = tex2D(_SpectrumTexture, 0.75); - float4 spectrum = float4(sub, bass, mids, highs); + sub = tex2D(_SpectrumTexture, 0.0); + bass = tex2D(_SpectrumTexture, 0.25); + mids = tex2D(_SpectrumTexture, 0.50); + highs = tex2D(_SpectrumTexture, 0.75); + // float4 spectrum = float4(sub, bass, mids, highs); time = _Time.y; float4 colour = float4(0.0, 0.0, 0.0, 1.0); material = 0.0; - // white noise - float3 seed = float3(guv, time); - float rng = hash13(seed); - // camera coordinates - float2 uv = guv; - float3 eye = float3(1.0, 1.0, 1.0); + float2 uv = guv * 2.5; + float3 eye = float3(sin(time * 0.1) * 5.0, cos(time * 0.1) * 5.0, 1.0); + // float3 eye = float3(5.0, 5.0, 1.0); float3 at = float3(0.0, 0.0, 0.0); float3 z = normalize(at-eye); - float3 x = normalize(cross(z, float3(0,1,0))); + float3 x = normalize(cross(z, float3(0.0,1.0,0.0))); float3 y = cross(x, z); float3 ray = normalize(float3(z + uv.x * x + uv.y * y)); float3 pos = eye; // // camera control - float2 M = 6.28 * float2(1.0, 1.0); - ray.xz = mul(ray.xz, rot(M.x)); - pos.xz = mul(pos.xz, rot(M.x)); - ray.xy = mul(ray.xy, rot(M.y)); - pos.xy = mul(pos.xy, rot(M.y)); + // float2 M = 6.28 * float2(1.0, 1.0); + // ray.xz = mul(ray.xz, rot(M.x)); + // pos.xz = mul(pos.xz, rot(M.x)); + // ray.xy = mul(ray.xy, rot(M.y)); + // pos.xy = mul(pos.xy, rot(M.y)); + + // white noise + float3 seed = float3(ndc, highs * 420.0); + float rng = hash13(seed); // raymarch float steps = 30.0; @@ -166,7 +182,7 @@ Shader "FullScreen/Botany" } // dithering - dist *= 0.9 + .1 * rng; + // dist *= 0.9 + .1 * rng; // raymarch pos += ray * dist; @@ -178,19 +194,16 @@ Shader "FullScreen/Botany" // compute normal by NuSan (https://www.shadertoy.com/view/3sBGzV) float2 off=float2(.001,0); float3 normal = normalize(map(pos)-float3(map(pos-off.xyy), map(pos-off.yxy), map(pos-off.yyx))); - - // Inigo Quilez color palette (https://iquilezles.org/articles/palettes) - float3 tint = .5+.5*cos(float3(3.0,2.0,1.0)+material*.5+length(pos)*.5); + float3 tint = tex2D(_ThemeTexture, material); // lighting - float ld = dot(reflect(ray, normal), float3(0,1,0))*0.5+0.5; + float ld = dot(reflect(ray, normal), float3(0.0,1.0,0.0))*0.5+0.5; float3 light = float3(1.000,0.502,0.502) * sqrt(ld); ld = dot(reflect(ray, normal), float3(0,0,-1))*0.5+0.5; light += float3(0.400,0.714,0.145) * sqrt(ld)*.5; // pixel color - colour = float4((tint + light) * shade, 1.0); - colour = float4(tint * shade, 1.0); + colour.rgb = (tint + light) * shade; // temporal buffer // colour = max(colour, texture(iChannel0, fragCoord/iResolution.xy) - 0.01); diff --git a/Assets/Scenes/MDNA_Botany/BotanyBinder.cs b/Assets/Scenes/MDNA_Botany/BotanyBinder.cs new file mode 100644 index 0000000..b2b06bb --- /dev/null +++ b/Assets/Scenes/MDNA_Botany/BotanyBinder.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections.Generic; + +public class BotanyBinder : MonoBehaviour { + public Material material; + + private void Start() { + if (material == null) { + Debug.Log("Material Binder needs a Material."); + gameObject.SetActive(false); + } + } + + public void UpdateWildness(Slider s) { + material.SetFloat("_Wildness", s.value); + } + + public void UpdateZoom(Slider s) { + material.SetFloat("_Zoom", s.value); + } + + public void UpdateBrightness(Slider s) { + material.SetFloat("_Brightness", s.value); + } +} diff --git a/Assets/Scenes/MDNA_Botany/BotanyBinder.cs.meta b/Assets/Scenes/MDNA_Botany/BotanyBinder.cs.meta new file mode 100644 index 0000000..0567998 --- /dev/null +++ b/Assets/Scenes/MDNA_Botany/BotanyBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8ce50dfd303cb104499ebc02baab5608 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MDNA_Botany/Global Volume Profile.asset b/Assets/Scenes/MDNA_Botany/Global Volume Profile.asset deleted file mode 100644 index 5811643..0000000 --- a/Assets/Scenes/MDNA_Botany/Global Volume Profile.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} - m_Name: Global Volume Profile - m_EditorClassIdentifier: - components: [] diff --git a/Assets/Scenes/MDNA_Botany/Global Volume Profile.asset.meta b/Assets/Scenes/MDNA_Botany/Global Volume Profile.asset.meta deleted file mode 100644 index f9a6cfa..0000000 --- a/Assets/Scenes/MDNA_Botany/Global Volume Profile.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 876ee73c139c26a499755365f6d771a5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/MDNA_Liugi/Liugi.mat b/Assets/Scenes/MDNA_Liugi/Liugi.mat index 0f2eddd..3cfc871 100644 --- a/Assets/Scenes/MDNA_Liugi/Liugi.mat +++ b/Assets/Scenes/MDNA_Liugi/Liugi.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Liugi + m_Name: Luigi m_Shader: {fileID: 4800000, guid: 325e2232657b5c041ab84549021817d3, type: 3} m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 diff --git a/Assets/Scenes/MDNA_Liugi/LiugiPropertyBinder.cs b/Assets/Scenes/MDNA_Liugi/LiugiPropertyBinder.cs index 33479d6..e7bf62d 100644 --- a/Assets/Scenes/MDNA_Liugi/LiugiPropertyBinder.cs +++ b/Assets/Scenes/MDNA_Liugi/LiugiPropertyBinder.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; using System.Collections.Generic; -public class LiugiPropertyBinder : MonoBehaviour { +public class LuigiPropertyBinder : MonoBehaviour { public Material material; private void Start() { diff --git a/Assets/Scenes/MDNA_Luigi.unity b/Assets/Scenes/MDNA_Luigi.unity index 024e2c3..57ebb1a 100644 --- a/Assets/Scenes/MDNA_Luigi.unity +++ b/Assets/Scenes/MDNA_Luigi.unity @@ -1113,7 +1113,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateZoom m_Mode: 2 m_Arguments: @@ -1513,7 +1513,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateWildness m_Mode: 2 m_Arguments: @@ -2233,7 +2233,7 @@ MonoBehaviour: - rid: 2533213763830546433 type: {class: FullScreenCustomPass, ns: UnityEngine.Rendering.HighDefinition, asm: Unity.RenderPipelines.HighDefinition.Runtime} data: - m_Name: Liugi + m_Name: Luigi enabled: 1 targetColorBuffer: 0 targetDepthBuffer: 0 @@ -2499,7 +2499,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateBrightness m_Mode: 2 m_Arguments: diff --git a/Assets/Scenes/MDNA_Nebula.unity b/Assets/Scenes/MDNA_Nebula.unity index 58c6ecb..fe19c7d 100644 --- a/Assets/Scenes/MDNA_Nebula.unity +++ b/Assets/Scenes/MDNA_Nebula.unity @@ -1121,7 +1121,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateZoom m_Mode: 2 m_Arguments: @@ -1521,7 +1521,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateWildness m_Mode: 2 m_Arguments: @@ -2507,7 +2507,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 449249020} - m_TargetAssemblyTypeName: LiugiPropertyBinder, Assembly-CSharp + m_TargetAssemblyTypeName: LuigiPropertyBinder, Assembly-CSharp m_MethodName: UpdateBrightness m_Mode: 2 m_Arguments: diff --git a/Assets/Scenes/MNML_CircleBar.unity b/Assets/Scenes/MNML_CircleBar.unity index db751c6..d65825c 100644 --- a/Assets/Scenes/MNML_CircleBar.unity +++ b/Assets/Scenes/MNML_CircleBar.unity @@ -245,7 +245,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100829523} - m_LocalRotation: {x: 0.16018224, y: 0.000000009349981, z: -0.0000000015172936, w: 0.9870875} + m_LocalRotation: {x: 0.16018224, y: -0.000000009349981, z: 0.0000000015172936, w: 0.9870875} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -329,7 +329,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 135872332} - m_LocalRotation: {x: 0.124220625, y: 0.0000000070583512, z: -8.8363683e-10, w: 0.9922547} + m_LocalRotation: {x: 0.124220625, y: -0.0000000031629452, z: 3.9596992e-10, w: 0.9922547} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1971,7 +1971,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 936348874} - m_LocalRotation: {x: 0.14220117, y: -0.000000017570699, z: 0.0000000023692523, w: 0.98983777} + m_LocalRotation: {x: 0.14220117, y: -0.000000017570704, z: 0.0000000023692759, w: 0.98983777} m_LocalPosition: {x: 0, y: 50, z: -150} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2715,7 +2715,7 @@ VisualEffect: m_Overridden: 1 m_NamedObject: m_Array: - - m_Value: {fileID: 29127178} + - m_Value: {fileID: 0} m_Name: SpectrumDataTexture m_Overridden: 1 - m_Value: {fileID: 0} @@ -2744,134 +2744,134 @@ MonoBehaviour: - rid: 1586242992680206341 Preview: Values: - - 0.27779937 - - 0.37150243 - - 0.33992046 - - 0.27220902 - - 0.24655327 - - 0.23353723 - - 0.20257042 - - 0.17817357 - - 0.1534759 - - 0.13434821 - - 0.12983596 - - 0.12695219 - - 0.12730718 - - 0.12744442 - - 0.1096836 - - 0.09834099 - - 0.12030482 - - 0.122969195 - - 0.14775443 - - 0.1275448 - - 0.13306977 - - 0.12975214 - - 0.11413343 - - 0.11243617 - - 0.10301358 - - 0.099607445 - - 0.117029116 - - 0.11405827 - - 0.108746976 - - 0.09338362 - - 0.09942425 - - 0.103331074 - - 0.09931317 - - 0.1101714 - - 0.122827664 - - 0.13363263 - - 0.14041218 - - 0.14942186 - - 0.1601057 - - 0.18784477 - - 0.1986247 - - 0.19006516 - - 0.18084103 - - 0.1679318 - - 0.16053502 - - 0.16791688 - - 0.18131405 - - 0.17424269 - - 0.16757171 - - 0.16269137 - - 0.16934305 - - 0.16377996 - - 0.15562946 - - 0.15975817 - - 0.16621846 - - 0.16116358 - - 0.17781742 - - 0.19947009 - - 0.19072303 - - 0.19118658 - - 0.18634002 - - 0.17839423 - - 0.17492625 - - 0.16282077 - - 0.15284772 - - 0.14901333 - - 0.14637388 - - 0.13893136 - - 0.13649753 - - 0.13376766 - - 0.12554322 - - 0.12470196 - - 0.11234188 - - 0.10481985 - - 0.11423441 - - 0.1141712 - - 0.12238519 - - 0.118600376 - - 0.11623406 - - 0.10683894 - - 0.11048236 - - 0.09439213 - - 0.09885539 - - 0.09424434 - - 0.092563435 - - 0.08932962 - - 0.08643931 - - 0.08193354 - - 0.08133891 - - 0.09045166 - - 0.078965224 - - 0.0975832 - - 0.09004327 - - 0.0897785 - - 0.087627694 - - 0.08314287 - - 0.08581509 - - 0.089414425 - - 0.08368465 - - 0.09174153 - - 0.09783801 - - 0.09555896 - - 0.09540714 - - 0.09557513 - - 0.09027424 - - 0.09885219 - - 0.10443502 - - 0.09206318 - - 0.11211626 - - 0.10760421 - - 0.107895374 - - 0.09806227 - - 0.10963627 - - 0.10346675 - - 0.11158 - - 0.10862545 - - 0.09776547 - - 0.10894385 - - 0.11934816 - - 0.1194208 - - 0.11963385 - - 0.11283746 - - 0.11057861 - - 0.102490164 - - 0.094838336 - - 0.07979106 - - 0.067613706 - - 0.045777485 + - 0.11574019 + - 0.14427094 + - 0.12546332 + - 0.11692043 + - 0.117611945 + - 0.113828525 + - 0.10858564 + - 0.09853668 + - 0.10794008 + - 0.10117113 + - 0.08488079 + - 0.06825772 + - 0.06509167 + - 0.074332885 + - 0.06721015 + - 0.06518063 + - 0.052961983 + - 0.05309108 + - 0.046518106 + - 0.051797915 + - 0.051629182 + - 0.063646965 + - 0.05837292 + - 0.056427184 + - 0.04754884 + - 0.048516914 + - 0.04961164 + - 0.041842047 + - 0.04637763 + - 0.036349233 + - 0.03405726 + - 0.033816814 + - 0.03844498 + - 0.039527923 + - 0.047020074 + - 0.061134014 + - 0.048109 + - 0.04527379 + - 0.039810024 + - 0.038449526 + - 0.041317135 + - 0.041901693 + - 0.039522793 + - 0.03376125 + - 0.034552015 + - 0.033249144 + - 0.043666266 + - 0.045217488 + - 0.043236636 + - 0.03856832 + - 0.038166028 + - 0.036320683 + - 0.036126662 + - 0.036395427 + - 0.039364308 + - 0.04215106 + - 0.0455254 + - 0.043237265 + - 0.054524966 + - 0.05734286 + - 0.046353396 + - 0.045560237 + - 0.043489434 + - 0.050780796 + - 0.051089138 + - 0.04807486 + - 0.048136335 + - 0.045353502 + - 0.037975773 + - 0.04254825 + - 0.052576162 + - 0.051684562 + - 0.054263666 + - 0.053547118 + - 0.044796336 + - 0.041640583 + - 0.044358354 + - 0.04465904 + - 0.049020313 + - 0.051431064 + - 0.057292778 + - 0.053932484 + - 0.053825792 + - 0.05871694 + - 0.05621033 + - 0.050768584 + - 0.052570984 + - 0.04982516 + - 0.03954494 + - 0.04495275 + - 0.03899289 + - 0.04587906 + - 0.041755605 + - 0.044911306 + - 0.038642347 + - 0.042761546 + - 0.039317586 + - 0.034676753 + - 0.043289565 + - 0.050587945 + - 0.043424364 + - 0.038925618 + - 0.03495137 + - 0.032964792 + - 0.03304073 + - 0.031827226 + - 0.027512405 + - 0.023769446 + - 0.02313409 + - 0.021628764 + - 0.019430606 + - 0.01970557 + - 0.01726757 + - 0.015085336 + - 0.014538696 + - 0.015949324 + - 0.014471732 + - 0.013289911 + - 0.013391674 + - 0.013692776 + - 0.014338682 + - 0.014606497 + - 0.014619604 + - 0.015188017 + - 0.015477716 + - 0.015811048 + - 0.015030684 + - 0.011600578 SpectrumSizeParameter: m_Name: SpectrumSize SpectrumDataTextureParameter: diff --git a/Assets/Scenes/_VisualisationTemplate.scenetemplate b/Assets/Scenes/_VisualisationTemplate.scenetemplate index 5964c3d..d7816d8 100644 --- a/Assets/Scenes/_VisualisationTemplate.scenetemplate +++ b/Assets/Scenes/_VisualisationTemplate.scenetemplate @@ -21,18 +21,22 @@ MonoBehaviour: instantiationMode: 1 - dependency: {fileID: 8926484042661614526, guid: 9cbb8f82eeb89994bbbeb66cd050c4bc, type: 3} instantiationMode: 1 + - dependency: {fileID: 2800000, guid: 387ab4c827447484bae10f9964d87bbd, type: 3} + instantiationMode: 0 + - dependency: {fileID: 2800000, guid: bcf19558d625cc1459278eea869f67c1, type: 3} + instantiationMode: 0 + - dependency: {fileID: 2800000, guid: 90fb07f64b16f354aabd37bb417cc735, type: 3} + instantiationMode: 0 - dependency: {fileID: 12800000, guid: 2eec6d9eb205aff4ab971dea4ede1c30, type: 3} instantiationMode: 1 - dependency: {fileID: 2100000, guid: 73ddb2958e9cd451c82f37c26efa5eb0, type: 2} instantiationMode: 0 - - dependency: {fileID: 2800000, guid: 90fb07f64b16f354aabd37bb417cc735, type: 3} + - dependency: {fileID: 2800000, guid: 2172509423aef564cbffe0df01411020, type: 3} instantiationMode: 0 - dependency: {fileID: 2800000, guid: 5f2a108eb023faf43a809979fd3d38f2, type: 3} instantiationMode: 1 - dependency: {fileID: -3888481672020999207, guid: c50f3ace9fc08934fb2a5bd9b3f30ae0, type: 3} instantiationMode: 0 - - dependency: {fileID: -3888481672020999207, guid: 90fc041dc7165b84bbf29c4d18335b36, type: 3} - instantiationMode: 0 - dependency: {fileID: 2800000, guid: 276d9e395ae18fe40a9b4988549f2349, type: 3} instantiationMode: 0 templatePipeline: {fileID: 0}