diff --git a/Assets/__Scenes/03_Mapper.unity b/Assets/__Scenes/03_Mapper.unity index 53e85af2f..4e5b5f51a 100644 --- a/Assets/__Scenes/03_Mapper.unity +++ b/Assets/__Scenes/03_Mapper.unity @@ -6291,85 +6291,6 @@ MonoBehaviour: Atsc: {fileID: 570484802} Tipc: {fileID: 1649845923} timelineCanvas: {fileID: 1919095322} ---- !u!21 &203199593 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Inherited From Round Corners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BumpScale: 1 - - _ColorMask: 15 - - _Cull: 2 - - _Cutoff: 0.5 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _ReceiveShadows: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _Surface: 0 - - _UseUIAlphaClip: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _WidthHeightRadius: {r: 37, g: 14, b: 2, a: 0} - - _halfSize: {r: 29, g: 10, b: 0, a: 0} - - _r: {r: 3, g: 3, b: 3, a: 3} - - _rect2props: {r: 0.0000019073486, g: -0.0000038146973, b: 25.455845, a: 25.455845} - m_BuildTextureStacks: [] --- !u!1 &210755191 GameObject: m_ObjectHideFlags: 0 @@ -28341,85 +28262,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 838757516} m_CullTransparentMesh: 0 ---- !u!21 &840669148 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Inherited From Round Corners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - - _BumpScale: 1 - - _ColorMask: 15 - - _Cull: 2 - - _Cutoff: 0.5 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _ReceiveShadows: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _Surface: 0 - - _UseUIAlphaClip: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - _WidthHeightRadius: {r: 34.4, g: 16.4, b: 4, a: 0} - - _halfSize: {r: 29, g: 10, b: 0, a: 0} - - _r: {r: 3, g: 3, b: 3, a: 3} - - _rect2props: {r: 0.0000019073486, g: -0.0000038146973, b: 25.455845, a: 25.455845} - m_BuildTextureStacks: [] --- !u!1 &843763612 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/__Scripts/MapEditor/Mapping/Strobe Generator/Passes/StrobeStepGradientPass.cs b/Assets/__Scripts/MapEditor/Mapping/Strobe Generator/Passes/StrobeStepGradientPass.cs index 133165ddc..36040c10b 100644 --- a/Assets/__Scripts/MapEditor/Mapping/Strobe Generator/Passes/StrobeStepGradientPass.cs +++ b/Assets/__Scripts/MapEditor/Mapping/Strobe Generator/Passes/StrobeStepGradientPass.cs @@ -105,27 +105,6 @@ public override IEnumerable StrobePassForLane(IEnumerable if (alternateColors) value = InvertColors(value); } - if (distanceInBeats < -0.01f) - { - var lastEvent = new MapEvent(endTime, type, value, new JSONObject()); - lastEvent.CustomData.Add("_color", colorPoints.OrderByDescending(x => x.Key).First().Value); - - if (propMode != EventsContainer.PropMode.Off) - { - if (value != MapEvent.LightValueBlueON && value != MapEvent.LightValueRedON && - value != MapEvent.LightValueOff) - { - lastEvent.Value = value < 5 - ? MapEvent.LightValueBlueON - : MapEvent.LightValueRedON; - } - - lastEvent.CustomData.Add("_lightID", propID); - } - - generatedObjects.Add(lastEvent); - } - return generatedObjects; }