diff --git a/Assets/Kino/Glitch/AnalogGlitch.cs b/Assets/Kino/Glitch/AnalogGlitch.cs index 37787ea..fe17b78 100644 --- a/Assets/Kino/Glitch/AnalogGlitch.cs +++ b/Assets/Kino/Glitch/AnalogGlitch.cs @@ -21,95 +21,51 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // using UnityEngine; +using UnityEngine.Rendering.PostProcessing; namespace Kino { - [ExecuteInEditMode] - [RequireComponent(typeof(Camera))] - [AddComponentMenu("Kino Image Effects/Analog Glitch")] - public class AnalogGlitch : MonoBehaviour - { - #region Public Properties - - // Scan line jitter - - [SerializeField, Range(0, 1)] - float _scanLineJitter = 0; - - public float scanLineJitter { - get { return _scanLineJitter; } - set { _scanLineJitter = value; } - } - - // Vertical jump - - [SerializeField, Range(0, 1)] - float _verticalJump = 0; - - public float verticalJump { - get { return _verticalJump; } - set { _verticalJump = value; } - } - - // Horizontal shake - - [SerializeField, Range(0, 1)] - float _horizontalShake = 0; - - public float horizontalShake { - get { return _horizontalShake; } - set { _horizontalShake = value; } - } + [System.Serializable] + [UnityEngine.Rendering.PostProcessing.PostProcess(typeof(AnalogGlitchRenderer), PostProcessEvent.AfterStack, "Kino Image Effects/Analog Glitch")] + public class AnalogGlitch : PostProcessEffectSettings + { + [Range(0, 1)] + public FloatParameter scanLineJitter = new FloatParameter(); - // Color drift + [Range(0, 1)] + public FloatParameter verticalJump = new FloatParameter(); - [SerializeField, Range(0, 1)] - float _colorDrift = 0; + [Range(0, 1)] + public FloatParameter horizontalShake = new FloatParameter(); - public float colorDrift { - get { return _colorDrift; } - set { _colorDrift = value; } - } + [Range(0, 1)] + public FloatParameter colorDrift = new FloatParameter(); + } - #endregion + public class AnalogGlitchRenderer : PostProcessEffectRenderer + { + private float _verticalJumpTime; - #region Private Properties - - [SerializeField] Shader _shader; - - Material _material; - - float _verticalJumpTime; - - #endregion - - #region MonoBehaviour Functions - - void OnRenderImage(RenderTexture source, RenderTexture destination) - { - if (_material == null) - { - _material = new Material(_shader); - _material.hideFlags = HideFlags.DontSave; - } - - _verticalJumpTime += Time.deltaTime * _verticalJump * 11.3f; + public override void Render(PostProcessRenderContext context) + { + var sheet = context.propertySheets.Get(Shader.Find("Hidden/Kino/Glitch/Analog")); - var sl_thresh = Mathf.Clamp01(1.0f - _scanLineJitter * 1.2f); - var sl_disp = 0.002f + Mathf.Pow(_scanLineJitter, 3) * 0.05f; - _material.SetVector("_ScanLineJitter", new Vector2(sl_disp, sl_thresh)); + _verticalJumpTime += Time.deltaTime * settings.verticalJump * 11.3f; - var vj = new Vector2(_verticalJump, _verticalJumpTime); - _material.SetVector("_VerticalJump", vj); + var sl_thresh = Mathf.Clamp01(1.0f - settings.scanLineJitter * 1.2f); + var sl_disp = 0.002f + Mathf.Pow(settings.scanLineJitter, 3) * 0.05f; + sheet.properties.SetVector("_ScanLineJitter", new Vector2(sl_disp, sl_thresh)); - _material.SetFloat("_HorizontalShake", _horizontalShake * 0.2f); + var vj = new Vector2(settings.verticalJump, _verticalJumpTime); + sheet.properties.SetVector("_VerticalJump", vj); - var cd = new Vector2(_colorDrift * 0.04f, Time.time * 606.11f); - _material.SetVector("_ColorDrift", cd); + sheet.properties.SetFloat("_HorizontalShake", settings.horizontalShake * 0.2f); - Graphics.Blit(source, destination, _material); - } + var cd = new Vector2(settings.colorDrift * 0.04f, Time.time * 606.11f); + sheet.properties.SetVector("_ColorDrift", cd); - #endregion + context.command.BlitFullscreenTriangle(context.source, context.destination, sheet, 0); } + + } } diff --git a/Assets/Kino/Glitch/DigitalGlitch.cs b/Assets/Kino/Glitch/DigitalGlitch.cs index 6e4a73a..fee3c16 100644 --- a/Assets/Kino/Glitch/DigitalGlitch.cs +++ b/Assets/Kino/Glitch/DigitalGlitch.cs @@ -20,111 +20,97 @@ // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // + +using UnityEditor; using UnityEngine; +using UnityEngine.Rendering.PostProcessing; namespace Kino { - [ExecuteInEditMode] - [RequireComponent(typeof(Camera))] - [AddComponentMenu("Kino Image Effects/Digital Glitch")] - public class DigitalGlitch : MonoBehaviour - { - #region Public Properties - - [SerializeField, Range(0, 1)] - float _intensity = 0; - - public float intensity { - get { return _intensity; } - set { _intensity = value; } - } - - #endregion - #region Private Properties + [System.Serializable] + [UnityEngine.Rendering.PostProcessing.PostProcess(typeof(DigitalGlitchRenderer), PostProcessEvent.AfterStack, "Kino Image Effects/DigitalGlitch")] + public class DigitalGlitch : PostProcessEffectSettings + { + [SerializeField, Range(0, 1f)] + public FloatParameter intensity = new FloatParameter() { value = 0 }; + } - [SerializeField] Shader _shader; - Material _material; - Texture2D _noiseTexture; - RenderTexture _trashFrame1; - RenderTexture _trashFrame2; + public class DigitalGlitchRenderer : PostProcessEffectRenderer + { + private Texture2D _noiseTexture; + private RenderTexture _trashFrame1; + private RenderTexture _trashFrame2; - #endregion - #region Private Functions + #region Private Functions - static Color RandomColor() - { - return new Color(Random.value, Random.value, Random.value, Random.value); - } + public DigitalGlitchRenderer() : base() + { + if (_noiseTexture != null) return; - void SetUpResources() - { - if (_material != null) return; + _noiseTexture = new Texture2D(64, 32, TextureFormat.ARGB32, false); + _noiseTexture.hideFlags = HideFlags.DontSave; + _noiseTexture.wrapMode = TextureWrapMode.Clamp; + _noiseTexture.filterMode = FilterMode.Point; - _material = new Material(_shader); - _material.hideFlags = HideFlags.DontSave; + _trashFrame1 = new RenderTexture(Screen.width, Screen.height, 0); + _trashFrame2 = new RenderTexture(Screen.width, Screen.height, 0); + _trashFrame1.hideFlags = HideFlags.DontSave; + _trashFrame2.hideFlags = HideFlags.DontSave; - _noiseTexture = new Texture2D(64, 32, TextureFormat.ARGB32, false); - _noiseTexture.hideFlags = HideFlags.DontSave; - _noiseTexture.wrapMode = TextureWrapMode.Clamp; - _noiseTexture.filterMode = FilterMode.Point; + UpdateNoiseTexture(); + } - _trashFrame1 = new RenderTexture(Screen.width, Screen.height, 0); - _trashFrame2 = new RenderTexture(Screen.width, Screen.height, 0); - _trashFrame1.hideFlags = HideFlags.DontSave; - _trashFrame2.hideFlags = HideFlags.DontSave; + static Color RandomColor() + { + return new Color(Random.value, Random.value, Random.value, Random.value); + } - UpdateNoiseTexture(); - } + void UpdateNoiseTexture() + { + var color = RandomColor(); - void UpdateNoiseTexture() + for (var y = 0; y < _noiseTexture.height; y++) + { + for (var x = 0; x < _noiseTexture.width; x++) { - var color = RandomColor(); - - for (var y = 0; y < _noiseTexture.height; y++) - { - for (var x = 0; x < _noiseTexture.width; x++) - { - if (Random.value > 0.89f) color = RandomColor(); - _noiseTexture.SetPixel(x, y, color); - } - } - - _noiseTexture.Apply(); + if (Random.value > 0.89f) + { + color = RandomColor(); + } + _noiseTexture.SetPixel(x, y, color); } + } - #endregion + _noiseTexture.Apply(); + } - #region MonoBehaviour Functions + #endregion - void Update() - { - if (Random.value > Mathf.Lerp(0.9f, 0.5f, _intensity)) - { - SetUpResources(); - UpdateNoiseTexture(); - } - } + public override void Render(PostProcessRenderContext context) + { + var sheet = context.propertySheets.Get(Shader.Find("Hidden/Kino/Glitch/Digital")); + if (Random.value > Mathf.Lerp(0.9f, 0.5f, settings.intensity.value)) + { + UpdateNoiseTexture(); + } - void OnRenderImage(RenderTexture source, RenderTexture destination) - { - SetUpResources(); + // Update trash frames on a constant interval. + var fcount = Time.frameCount; + if (fcount % 13 == 0) context.command.Blit(context.source, _trashFrame1); - // Update trash frames on a constant interval. - var fcount = Time.frameCount; - if (fcount % 13 == 0) Graphics.Blit(source, _trashFrame1); - if (fcount % 73 == 0) Graphics.Blit(source, _trashFrame2); + if (fcount % 73 == 0) context.command.Blit(context.source, _trashFrame2); - _material.SetFloat("_Intensity", _intensity); - _material.SetTexture("_NoiseTex", _noiseTexture); - var trashFrame = Random.value > 0.5f ? _trashFrame1 : _trashFrame2; - _material.SetTexture("_TrashTex", trashFrame); - Graphics.Blit(source, destination, _material); - } + sheet.properties.SetFloat("_Intensity", settings.intensity); + sheet.properties.SetTexture("_NoiseTex", _noiseTexture); + var trashFrame = Random.value > 0.5f ? _trashFrame1 : _trashFrame2; + sheet.properties.SetTexture("_TrashTex", trashFrame); - #endregion + context.command.BlitFullscreenTriangle(context.source, context.destination, sheet, 0); } + + } } diff --git a/Assets/Kino/Glitch/Editor/AnalogGlitchEditor.cs b/Assets/Kino/Glitch/Editor/AnalogGlitchEditor.cs deleted file mode 100644 index 4c9784b..0000000 --- a/Assets/Kino/Glitch/Editor/AnalogGlitchEditor.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// KinoGlitch - Video glitch effect -// -// Copyright (C) 2015 Keijiro Takahashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using UnityEngine; -using UnityEditor; - -namespace Kino -{ - [CanEditMultipleObjects] - [CustomEditor(typeof(AnalogGlitch))] - public class AnalogGlitchEditor : Editor - { - SerializedProperty _scanLineJitter; - SerializedProperty _verticalJump; - SerializedProperty _horizontalShake; - SerializedProperty _colorDrift; - - void OnEnable() - { - _scanLineJitter = serializedObject.FindProperty("_scanLineJitter"); - _verticalJump = serializedObject.FindProperty("_verticalJump"); - _horizontalShake = serializedObject.FindProperty("_horizontalShake"); - _colorDrift = serializedObject.FindProperty("_colorDrift"); - } - - public override void OnInspectorGUI() - { - serializedObject.Update(); - - EditorGUILayout.PropertyField(_scanLineJitter); - EditorGUILayout.PropertyField(_verticalJump); - EditorGUILayout.PropertyField(_horizontalShake); - EditorGUILayout.PropertyField(_colorDrift); - - serializedObject.ApplyModifiedProperties(); - } - } -} diff --git a/Assets/Kino/Glitch/Editor/AnalogGlitchEditor.cs.meta b/Assets/Kino/Glitch/Editor/AnalogGlitchEditor.cs.meta deleted file mode 100644 index 9768d68..0000000 --- a/Assets/Kino/Glitch/Editor/AnalogGlitchEditor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 83a6afa77757d4190add8354f39c902c -timeCreated: 1435909592 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Kino/Glitch/Editor/DigitalGlitchEditor.cs b/Assets/Kino/Glitch/Editor/DigitalGlitchEditor.cs deleted file mode 100644 index bb04b7b..0000000 --- a/Assets/Kino/Glitch/Editor/DigitalGlitchEditor.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -// KinoGlitch - Video glitch effect -// -// Copyright (C) 2015 Keijiro Takahashi -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of -// this software and associated documentation files (the "Software"), to deal in -// the Software without restriction, including without limitation the rights to -// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -// the Software, and to permit persons to whom the Software is furnished to do so, -// subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using UnityEngine; -using UnityEditor; - -namespace Kino -{ - [CanEditMultipleObjects] - [CustomEditor(typeof(DigitalGlitch))] - public class DigitalGlitchEditor : Editor - { - SerializedProperty _intensity; - - void OnEnable() - { - _intensity = serializedObject.FindProperty("_intensity"); - } - - public override void OnInspectorGUI() - { - serializedObject.Update(); - - EditorGUILayout.PropertyField(_intensity); - - serializedObject.ApplyModifiedProperties(); - } - } -} diff --git a/Assets/Kino/Glitch/Editor/DigitalGlitchEditor.cs.meta b/Assets/Kino/Glitch/Editor/DigitalGlitchEditor.cs.meta deleted file mode 100644 index 1d0cffa..0000000 --- a/Assets/Kino/Glitch/Editor/DigitalGlitchEditor.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 51937fa103b7e49a2aecba62a4029a39 -timeCreated: 1435909592 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Kino/Glitch/Shader/AnalogGlitch.shader b/Assets/Kino/Glitch/Shader/AnalogGlitch.shader index a0ab0ec..ed6ce3d 100644 --- a/Assets/Kino/Glitch/Shader/AnalogGlitch.shader +++ b/Assets/Kino/Glitch/Shader/AnalogGlitch.shader @@ -22,17 +22,11 @@ // Shader "Hidden/Kino/Glitch/Analog" { - Properties - { - _MainTex ("-", 2D) = "" {} - } - CGINCLUDE - - #include "UnityCG.cginc" - - sampler2D _MainTex; + HLSLINCLUDE + #include "PostProcessing/Shaders/StdLib.hlsl" + TEXTURE2D_SAMPLER2D(_MainTex, sampler_MainTex); + float2 _MainTex_TexelSize; - float2 _ScanLineJitter; // (displacement, threshold) float2 _VerticalJump; // (amount, time) float _HorizontalShake; @@ -43,10 +37,10 @@ Shader "Hidden/Kino/Glitch/Analog" return frac(sin(dot(float2(x, y), float2(12.9898, 78.233))) * 43758.5453); } - half4 frag(v2f_img i) : SV_Target + half4 Frag(VaryingsDefault i) : SV_Target { - float u = i.uv.x; - float v = i.uv.y; + float u = i.texcoord.x; + float v = i.texcoord.y; // Scan line jitter float jitter = nrand(v, _Time.x) * 2 - 1; @@ -61,23 +55,27 @@ Shader "Hidden/Kino/Glitch/Analog" // Color drift float drift = sin(jump + _ColorDrift.y) * _ColorDrift.x; - half4 src1 = tex2D(_MainTex, frac(float2(u + jitter + shake, jump))); - half4 src2 = tex2D(_MainTex, frac(float2(u + jitter + shake + drift, jump))); + half4 src1 = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, frac(float2(u + jitter + shake, jump))); + half4 src2 = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, frac(float2(u + jitter + shake + drift, jump))); return half4(src1.r, src2.g, src1.b, 1); } - ENDCG + ENDHLSL + + SubShader { + Cull Off ZWrite Off ZTest Always + Pass { - ZTest Always Cull Off ZWrite Off - CGPROGRAM - #pragma vertex vert_img - #pragma fragment frag - #pragma target 3.0 - ENDCG + HLSLPROGRAM + + #pragma vertex VertDefault + #pragma fragment Frag + + ENDHLSL } } } diff --git a/Assets/Kino/Glitch/Shader/DigitalGlitch.shader b/Assets/Kino/Glitch/Shader/DigitalGlitch.shader index e79348a..327def9 100644 --- a/Assets/Kino/Glitch/Shader/DigitalGlitch.shader +++ b/Assets/Kino/Glitch/Shader/DigitalGlitch.shader @@ -22,25 +22,18 @@ // Shader "Hidden/Kino/Glitch/Digital" { - Properties - { - _MainTex ("-", 2D) = "" {} - _NoiseTex ("-", 2D) = "" {} - _TrashTex ("-", 2D) = "" {} - } + HLSLINCLUDE + #include "PostProcessing/Shaders/StdLib.hlsl" - CGINCLUDE + TEXTURE2D_SAMPLER2D(_MainTex, sampler_MainTex); + TEXTURE2D_SAMPLER2D(_NoiseTex, sampler_NoiseTex); + TEXTURE2D_SAMPLER2D(_TrashTex, sampler_TrashTex); - #include "UnityCG.cginc" - - sampler2D _MainTex; - sampler2D _NoiseTex; - sampler2D _TrashTex; float _Intensity; - float4 frag(v2f_img i) : SV_Target + float4 Frag(VaryingsDefault i) : SV_Target { - float4 glitch = tex2D(_NoiseTex, i.uv); + float4 glitch = SAMPLE_TEXTURE2D(_NoiseTex, sampler_NoiseTex, i.texcoord); float thresh = 1.001 - _Intensity * 1.001; float w_d = step(thresh, pow(glitch.z, 2.5)); // displacement glitch @@ -48,11 +41,11 @@ Shader "Hidden/Kino/Glitch/Digital" float w_c = step(thresh, pow(glitch.z, 3.5)); // color glitch // Displacement. - float2 uv = frac(i.uv + glitch.xy * w_d); - float4 source = tex2D(_MainTex, uv); + float2 uv = frac(i.texcoord + glitch.xy * w_d); + float4 source = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, uv); // Mix with trash frame. - float3 color = lerp(source, tex2D(_TrashTex, uv), w_f).rgb; + float3 color = lerp(source, SAMPLE_TEXTURE2D(_TrashTex, sampler_TrashTex, uv), w_f).rgb; // Shuffle color components. float3 neg = saturate(color.grb + (1 - dot(color, 1)) * 0.5); @@ -60,19 +53,21 @@ Shader "Hidden/Kino/Glitch/Digital" return float4(color, source.a); } - - ENDCG + + ENDHLSL SubShader { + Cull Off ZWrite Off ZTest Always + Pass { - ZTest Always Cull Off ZWrite Off - CGPROGRAM - #pragma vertex vert_img - #pragma fragment frag - #pragma target 3.0 - ENDCG + HLSLPROGRAM + + #pragma vertex VertDefault + #pragma fragment Frag + + ENDHLSL } } } diff --git a/Assets/Test/Test.anim b/Assets/Test/Test.anim deleted file mode 100644 index a37b426..0000000 --- a/Assets/Test/Test.anim +++ /dev/null @@ -1,339 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Test - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 3 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _colorDrift - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 3 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _scanLineJitter - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: .640410304 - outSlope: .640410304 - tangentMode: 0 - - time: 1.91666675 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _verticalJump - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 5.41666698 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 6 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _intensity - path: - classID: 114 - script: {fileID: 11500000, guid: 9a3a070408aa941ab83ae10be1708848, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 1.33333337 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1.58333337 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1.83333337 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 3 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 10 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _horizontalShake - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - path: 0 - attribute: 3390526223 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - classID: 114 - customType: 0 - isPPtrCurve: 0 - - path: 0 - attribute: 3670858886 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - classID: 114 - customType: 0 - isPPtrCurve: 0 - - path: 0 - attribute: 1490854075 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - classID: 114 - customType: 0 - isPPtrCurve: 0 - - path: 0 - attribute: 2754484623 - script: {fileID: 11500000, guid: 9a3a070408aa941ab83ae10be1708848, type: 3} - classID: 114 - customType: 0 - isPPtrCurve: 0 - - path: 0 - attribute: 862797083 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - classID: 114 - customType: 0 - isPPtrCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_StartTime: 0 - m_StopTime: 6 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 3 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _colorDrift - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 3 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _scanLineJitter - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: .640410304 - outSlope: .640410304 - tangentMode: 0 - - time: 1.91666675 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _verticalJump - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 4 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 5.41666698 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 6 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _intensity - path: - classID: 114 - script: {fileID: 11500000, guid: 9a3a070408aa941ab83ae10be1708848, type: 3} - - curve: - serializedVersion: 2 - m_Curve: - - time: 1.33333337 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1.58333337 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1.83333337 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 3 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 10 - m_PreInfinity: 2 - m_PostInfinity: 2 - attribute: _horizontalShake - path: - classID: 114 - script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_GenerateMotionCurves: 0 - m_Events: [] diff --git a/Assets/Test/Test.anim.meta b/Assets/Test/Test.anim.meta deleted file mode 100644 index d673a96..0000000 --- a/Assets/Test/Test.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c92a929b1f32e4496b7427c82990427b -timeCreated: 1435925994 -licenseType: Pro -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Test/Test.controller b/Assets/Test/Test.controller deleted file mode 100644 index b22fa27..0000000 --- a/Assets/Test/Test.controller +++ /dev/null @@ -1,67 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Test - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 110705068} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 0} ---- !u!1102 &110245848 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Test - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_Motion: {fileID: 7400000, guid: c92a929b1f32e4496b7427c82990427b, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: ---- !u!1107 &110705068 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 110245848} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 110245848} diff --git a/Assets/Test/Test.unity b/Assets/Test/Test.unity index 852f2cd..96e929b 100644 --- a/Assets/Test/Test.unity +++ b/Assets/Test/Test.unity @@ -1,32 +1,33 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: .25 + smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 9 m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 - m_FogDensity: .00999999978 + m_FogDensity: 0.01 m_LinearFogStart: 0 m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} - m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} - m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: .5 + m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -37,15 +38,13 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} ---- !u!127 &3 -LevelGameManager: - m_ObjectHideFlags: 0 + m_IndirectSpecularColor: {r: 0.18028374, g: 0.22571413, b: 0.3069228, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 11 m_GIWorkflowMode: 0 - m_LightmapsMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -56,46 +55,73 @@ LightmapSettings: m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 1 m_LightmapEditorSettings: - serializedVersion: 3 + serializedVersion: 10 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 + m_AO: 0 m_AOMaxDistance: 1 - m_Padding: 2 m_CompAOExponent: 0 + m_CompAOExponentDirect: 0 + m_Padding: 2 m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 m_TextureCompression: 1 m_FinalGather: 0 + m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 - m_LightmapSnapshot: {fileID: 0} - m_RuntimeCPUUsage: 25 + m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: .5 + agentTypeID: 0 + agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: .400000006 + agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: .166666672 manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &505543334 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 6 m_Component: - - 4: {fileID: 505543335} - - 114: {fileID: 505543336} + - component: {fileID: 505543335} + - component: {fileID: 505543336} m_Layer: 0 m_Name: Camera Pivot m_TagString: Untagged @@ -106,20 +132,21 @@ GameObject: --- !u!4 &505543335 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 505543334} - m_LocalRotation: {x: .342020184, y: 0, z: 0, w: .939692616} - m_LocalPosition: {x: 0, y: .400000006, z: 0} + m_LocalRotation: {x: 0.34202018, y: 0, z: 0, w: 0.9396926} + m_LocalPosition: {x: 0, y: 0.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2012891222} m_Father: {fileID: 0} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &505543336 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 505543334} m_Enabled: 1 @@ -178,17 +205,17 @@ Prefab: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: ca5eceb85768ac841bd2c12921c1cef2, type: 3} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: ca5eceb85768ac841bd2c12921c1cef2, type: 3} + m_IsPrefabAsset: 0 --- !u!1 &995860500 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 6 m_Component: - - 4: {fileID: 995860502} - - 108: {fileID: 995860501} + - component: {fileID: 995860502} + - component: {fileID: 995860501} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -199,13 +226,13 @@ GameObject: --- !u!108 &995860501 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 995860500} m_Enabled: 1 - serializedVersion: 6 + serializedVersion: 8 m_Type: 1 - m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 @@ -213,9 +240,11 @@ Light: m_Shadows: m_Type: 2 m_Resolution: -1 + m_CustomResolution: -1 m_Strength: 1 - m_Bias: .0500000007 - m_NormalBias: .400000006 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -224,33 +253,37 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 - m_AreaSize: {x: 1, y: 1} --- !u!4 &995860502 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 995860500} - m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} + m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.109381676, w: 0.87542605} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1209309981 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 6 m_Component: - - 4: {fileID: 1209309985} - - 33: {fileID: 1209309984} - - 64: {fileID: 1209309983} - - 23: {fileID: 1209309982} + - component: {fileID: 1209309985} + - component: {fileID: 1209309984} + - component: {fileID: 1209309983} + - component: {fileID: 1209309982} m_Layer: 0 m_Name: Plane m_TagString: Untagged @@ -261,75 +294,88 @@ GameObject: --- !u!23 &1209309982 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1209309981} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 m_Materials: - {fileID: 2100000, guid: d681c1d72c3c16149abd2f0f25ca628c, type: 2} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 --- !u!64 &1209309983 MeshCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1209309981} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Convex: 0 + m_CookingOptions: 14 + m_SkinWidth: 0.01 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &1209309984 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1209309981} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1209309985 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1209309981} - m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07} + m_LocalRotation: {x: 0, y: 1, z: 0, w: -0.00000016292068} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: .5, y: .5, z: .5} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2012891221 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 6 m_Component: - - 4: {fileID: 2012891222} - - 20: {fileID: 2012891226} - - 92: {fileID: 2012891225} - - 124: {fileID: 2012891224} - - 81: {fileID: 2012891223} - - 114: {fileID: 2012891229} - - 114: {fileID: 2012891228} - - 114: {fileID: 2012891227} - - 95: {fileID: 2012891230} - m_Layer: 0 + - component: {fileID: 2012891222} + - component: {fileID: 2012891226} + - component: {fileID: 2012891225} + - component: {fileID: 2012891224} + - component: {fileID: 2012891223} + - component: {fileID: 2012891229} + - component: {fileID: 2012891227} + - component: {fileID: 2012891228} + m_Layer: 8 m_Name: Main Camera m_TagString: MainCamera m_Icon: {fileID: 0} @@ -339,7 +385,7 @@ GameObject: --- !u!4 &2012891222 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} @@ -348,44 +394,49 @@ Transform: m_Children: [] m_Father: {fileID: 505543335} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!81 &2012891223 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_Enabled: 1 --- !u!124 &2012891224 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_Enabled: 1 --- !u!92 &2012891225 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_Enabled: 1 --- !u!20 &2012891226 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 y: 0 width: 1 height: 1 - near clip plane: .300000012 + near clip plane: 0.3 far clip plane: 100 field of view: 20 orthographic: 0 @@ -397,44 +448,97 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 + m_TargetEye: 3 m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 1 m_OcclusionCulling: 0 m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 - m_StereoMirrorMode: 0 + m_StereoSeparation: 0.022 --- !u!114 &2012891227 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9a3a070408aa941ab83ae10be1708848, type: 3} + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} m_Name: m_EditorClassIdentifier: - _intensity: 0 - _shader: {fileID: 4800000, guid: ba40dc630e1d9417cb9ea22586ece1e1, type: 3} + volumeTrigger: {fileID: 2012891222} + volumeLayer: + serializedVersion: 2 + m_Bits: 256 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 1 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 1 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: + - assemblyQualifiedName: Kino.DigitalGlitch, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - assemblyQualifiedName: Kino.AnalogGlitch, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null --- !u!114 &2012891228 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} m_Name: m_EditorClassIdentifier: - _scanLineJitter: 0 - _verticalJump: 0 - _horizontalShake: 0 - _colorDrift: 0 - _shader: {fileID: 4800000, guid: da33272284ea24f208f36998880990be, type: 3} + sharedProfile: {fileID: 11400000, guid: a2d468560f31346a698ed5c860728d41, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 --- !u!114 &2012891229 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2012891221} m_Enabled: 1 @@ -442,28 +546,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d637268abbbb5428e991dd9ec93136f2, type: 3} m_Name: m_EditorClassIdentifier: - positionFrequency: .200000003 - rotationFrequency: .200000003 - positionAmount: .200000003 + positionFrequency: 0.2 + rotationFrequency: 0.2 + positionAmount: 0.2 rotationAmount: 3 positionComponents: {x: 1, y: 1, z: 1} rotationComponents: {x: 1, y: 1, z: 0} positionOctave: 3 rotationOctave: 3 ---- !u!95 &2012891230 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2012891221} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7c0b5746436194670a1330e701de40f9, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 diff --git a/Assets/Kino/Glitch/Editor.meta b/Assets/Test/Test_Profiles.meta similarity index 58% rename from Assets/Kino/Glitch/Editor.meta rename to Assets/Test/Test_Profiles.meta index f6c1c01..c0addcc 100644 --- a/Assets/Kino/Glitch/Editor.meta +++ b/Assets/Test/Test_Profiles.meta @@ -1,9 +1,8 @@ fileFormatVersion: 2 -guid: 0c37dfef451934b1db26216248b232ed +guid: 5d4f5423fe36b42c7bd5060865a9c700 folderAsset: yes -timeCreated: 1435890461 -licenseType: Pro DefaultImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Test/Test_Profiles/Main Camera Profile.asset b/Assets/Test/Test_Profiles/Main Camera Profile.asset new file mode 100644 index 0000000..0ae2e36 --- /dev/null +++ b/Assets/Test/Test_Profiles/Main Camera Profile.asset @@ -0,0 +1,61 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3} + m_Name: Main Camera Profile + m_EditorClassIdentifier: + settings: + - {fileID: 114921481503169910} + - {fileID: 114709395188405180} +--- !u!114 &114709395188405180 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9a3a070408aa941ab83ae10be1708848, type: 3} + m_Name: DigitalGlitch + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + intensity: + overrideState: 1 + value: 0.314 +--- !u!114 &114921481503169910 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 870b9a8f0f82f4f56800cc427bcd1025, type: 3} + m_Name: AnalogGlitch + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + scanLineJitter: + overrideState: 1 + value: 0 + verticalJump: + overrideState: 1 + value: 0 + horizontalShake: + overrideState: 1 + value: 0 + colorDrift: + overrideState: 1 + value: 0 diff --git a/Assets/Test/Test.controller.meta b/Assets/Test/Test_Profiles/Main Camera Profile.asset.meta similarity index 52% rename from Assets/Test/Test.controller.meta rename to Assets/Test/Test_Profiles/Main Camera Profile.asset.meta index fd13937..d79ad7b 100644 --- a/Assets/Test/Test.controller.meta +++ b/Assets/Test/Test_Profiles/Main Camera Profile.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 7c0b5746436194670a1330e701de40f9 -timeCreated: 1435925994 -licenseType: Pro +guid: a2d468560f31346a698ed5c860728d41 NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/KinoGlitch.unitypackage b/KinoGlitch.unitypackage index 39e37af..741051b 100644 Binary files a/KinoGlitch.unitypackage and b/KinoGlitch.unitypackage differ diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..ca5d46f --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,36 @@ +{ + "dependencies": { + "com.unity.package-manager-ui": "1.9.11", + "com.unity.postprocessing": "2.0.17-preview", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000..e7886b2 --- /dev/null +++ b/ProjectSettings/ClusterInputManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!236 &1 +ClusterInputManager: + m_ObjectHideFlags: 0 + m_Inputs: [] diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..636a595 --- /dev/null +++ b/ProjectSettings/PresetManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + m_DefaultList: [] diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c0a4f83..d31fdae 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,99 +3,184 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 15 + productGUID: 0aeff0c25144441e1817c444998aec35 AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 + AndroidEnableSustainedPerformanceMode: 0 defaultScreenOrientation: 4 targetDevice: 2 - targetResolution: 0 + useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: KinoGlitch defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} + m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 1 + m_ShowUnitySplashLogo: 1 + m_SplashScreenOverlayOpacity: 1 + m_SplashScreenAnimation: 1 + m_SplashScreenLogoStyle: 1 + m_SplashScreenDrawMode: 0 + m_SplashScreenBackgroundAnimationZoom: 1 + m_SplashScreenLogoAnimationZoom: 1 + m_SplashScreenBackgroundLandscapeAspect: 1 + m_SplashScreenBackgroundPortraitAspect: 1 + m_SplashScreenBackgroundLandscapeUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenBackgroundPortraitUvs: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + m_SplashScreenLogos: [] + m_VirtualRealitySplashScreen: {fileID: 0} + m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 defaultScreenHeight: 768 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 - m_RenderingPath: 1 - m_MobileRenderingPath: 1 + m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 m_MTRendering: 1 - m_MobileMTRendering: 0 - m_Stereoscopic3D: 0 + m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 allowedAutorotateToLandscapeLeft: 1 useOSAutorotation: 1 use32BitDisplayBuffer: 1 + preserveFramebufferAlpha: 0 disableDepthAndStencilBuffers: 0 - defaultIsFullScreen: 1 + androidBlitType: 0 defaultIsNativeResolution: 1 + macRetinaSupport: 1 runInBackground: 0 captureSingleScreen: 0 - Override IPod Music: 0 + muteOtherAudioSources: 0 Prepare IOS For Recording: 0 + Force IOS Speakers When Recording: 0 + deferSystemGesturesMode: 0 + hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 resizableWindow: 0 useMacAppStoreValidation: 0 + macAppStoreCategory: public.app-category.games gpuSkinning: 0 + graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 xboxEnableKinectAutoTracking: 0 xboxEnableFitness: 0 visibleInBackground: 0 - macFullscreenMode: 2 - d3d9FullscreenMode: 1 - d3d11FullscreenMode: 1 + allowFullscreenSwitch: 1 + graphicsJobMode: 0 + fullscreenMode: 2 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 + xboxEnablePIXSampling: 0 + metalFramebufferOnly: 0 + n3dsDisableStereoscopicView: 0 + n3dsEnableSharedListOpt: 1 + n3dsEnableVSync: 0 xboxOneResolution: 0 - ps3SplashScreen: {fileID: 0} + xboxOneSResolution: 0 + xboxOneXResolution: 3 + xboxOneMonoLoggingLevel: 0 + xboxOneLoggingLevel: 1 + xboxOneDisableEsram: 0 + xboxOnePresentImmediateThreshold: 0 + switchQueueCommandMemory: 0 videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 + vulkanEnableSetSRGBWrite: 0 + vulkanUseSWCommandBuffers: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 16:10: 1 16:9: 1 Others: 1 - bundleIdentifier: com.Company.ProductName bundleVersion: 1.0 preloadedAssets: [] - metroEnableIndependentInputSource: 0 - metroEnableLowLatencyPresentationAPI: 0 + metroInputSource: 0 + wsaTransparentSwapchain: 0 + m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 - productGUID: 0aeff0c25144441e1817c444998aec35 + xboxOneEnable7thCore: 1 + isWsaHolographicRemotingEnabled: 0 + vrSettings: + cardboard: + depthFormat: 0 + enableTransitionView: 0 + daydream: + depthFormat: 0 + useSustainedPerformanceMode: 0 + enableVideoLayer: 0 + useProtectedVideoMemory: 0 + minimumSupportedHeadTracking: 0 + maximumSupportedHeadTracking: 1 + hololens: + depthFormat: 1 + depthBufferSharingEnabled: 0 + oculus: + sharedDepthBuffer: 0 + dashSupport: 0 + enable360StereoCapture: 0 + protectGraphicsMemory: 0 + useHDRDisplay: 0 + m_ColorGamuts: 00000000 + targetPixelDensity: 30 + resolutionScalingMode: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.1 + applicationIdentifier: + Android: com.Company.ProductName + Standalone: unity.DefaultCompany.KinoGlitch + iOS: com.Company.ProductName + tvOS: com.Company.ProductName + buildNumber: + iOS: AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 9 + AndroidMinSdkVersion: 16 + AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: - apiCompatibilityLevel: 2 + stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 - preloadShaders: 0 + keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iPhoneTargetOSVersion: 22 + iOSTargetOSVersionString: 8.0 + tvOSSdkVersion: 0 + tvOSRequireExtendedGameController: 0 + tvOSTargetOSVersionString: 9.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 + uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 @@ -105,10 +190,22 @@ PlayerSettings: iPhone47inSplashScreen: {fileID: 0} iPhone55inPortraitSplashScreen: {fileID: 0} iPhone55inLandscapeSplashScreen: {fileID: 0} + iPhone58inPortraitSplashScreen: {fileID: 0} + iPhone58inLandscapeSplashScreen: {fileID: 0} iPadPortraitSplashScreen: {fileID: 0} iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + appleTVSplashScreen: {fileID: 0} + appleTVSplashScreen2x: {fileID: 0} + tvOSSmallIconLayers: [] + tvOSSmallIconLayers2x: [] + tvOSLargeIconLayers: [] + tvOSLargeIconLayers2x: [] + tvOSTopShelfImageLayers: [] + tvOSTopShelfImageLayers2x: [] + tvOSTopShelfImageWideLayers: [] + tvOSTopShelfImageWideLayers2x: [] iOSLaunchScreenType: 0 iOSLaunchScreenPortrait: {fileID: 0} iOSLaunchScreenLandscape: {fileID: 0} @@ -118,14 +215,46 @@ PlayerSettings: iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: - AndroidTargetDevice: 0 + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: + iOSUseLaunchScreenStoryboard: 0 + iOSLaunchScreenCustomStoryboardPath: + iOSDeviceRequirements: [] + iOSURLSchemes: [] + iOSBackgroundModes: 0 + iOSMetalForceHardShadows: 0 + metalEditorSupport: 1 + metalAPIValidation: 1 + iOSRenderExtraFrameOnPause: 1 + appleDeveloperTeamID: + iOSManualSigningProvisioningProfileID: + tvOSManualSigningProvisioningProfileID: + iOSManualSigningProvisioningProfileType: 0 + tvOSManualSigningProvisioningProfileType: 0 + appleEnableAutomaticSigning: 0 + iOSRequireARKit: 0 + appleEnableProMotion: 0 + vulkanEditorSupport: 0 + clonedFromGUID: 00000000000000000000000000000000 + templatePackageId: + templateDefaultScene: + AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 + AndroidEnableTango: 0 androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 m_AndroidBanners: - width: 320 height: 180 @@ -135,45 +264,166 @@ PlayerSettings: m_BuildTargetIcons: - m_BuildTarget: m_Icons: - - m_Icon: {fileID: 0} - m_Size: 128 + - serializedVersion: 2 + m_Icon: {fileID: 0} + m_Width: 128 + m_Height: 128 + m_Kind: 0 + m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] - webPlayerTemplate: APPLICATION:Default + m_BuildTargetVRSettings: [] + m_BuildTargetEnableVuforiaSettings: [] + openGLRequireES31: 0 + openGLRequireES31AEP: 0 m_TemplateCustomTags: {} + mobileMTRendering: + iPhone: 1 + tvOS: 1 + m_BuildTargetGroupLightmapEncodingQuality: + - m_BuildTarget: Standalone + m_EncodingQuality: 1 + - m_BuildTarget: XboxOne + m_EncodingQuality: 1 + - m_BuildTarget: PS4 + m_EncodingQuality: 1 + m_BuildTargetGroupLightmapSettings: [] + playModeTestRunnerEnabled: 0 + runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 + cameraUsageDescription: locationUsageDescription: - XboxTitleId: - XboxImageXexPath: - XboxSpaPath: - XboxGenerateSpa: 0 - XboxDeployKinectResources: 0 - XboxSplashScreen: {fileID: 0} - xboxEnableSpeech: 0 - xboxAdditionalTitleMemorySize: 0 - xboxDeployKinectHeadOrientation: 0 - xboxDeployKinectHeadPosition: 0 - ps3TitleConfigPath: - ps3DLCConfigPath: - ps3ThumbnailPath: - ps3BackgroundPath: - ps3SoundPath: - ps3NPAgeRating: 12 - ps3TrophyCommId: - ps3NpCommunicationPassphrase: - ps3TrophyPackagePath: - ps3BootCheckMaxSaveGameSizeKB: 128 - ps3TrophyCommSig: - ps3SaveGameSlots: 1 - ps3TrialMode: 0 - ps3VideoMemoryForAudio: 0 - ps3EnableVerboseMemoryStats: 0 - ps3UseSPUForUmbra: 0 - ps3EnableMoveSupport: 1 - ps3DisableDolbyEncoding: 0 + microphoneUsageDescription: + switchNetLibKey: + switchSocketMemoryPoolSize: 6144 + switchSocketAllocatorPoolSize: 128 + switchSocketConcurrencyLimit: 14 + switchScreenResolutionBehavior: 2 + switchUseCPUProfiler: 0 + switchApplicationID: 0x01004b9000490000 + switchNSODependencies: + switchTitleNames_0: + switchTitleNames_1: + switchTitleNames_2: + switchTitleNames_3: + switchTitleNames_4: + switchTitleNames_5: + switchTitleNames_6: + switchTitleNames_7: + switchTitleNames_8: + switchTitleNames_9: + switchTitleNames_10: + switchTitleNames_11: + switchTitleNames_12: + switchTitleNames_13: + switchTitleNames_14: + switchPublisherNames_0: + switchPublisherNames_1: + switchPublisherNames_2: + switchPublisherNames_3: + switchPublisherNames_4: + switchPublisherNames_5: + switchPublisherNames_6: + switchPublisherNames_7: + switchPublisherNames_8: + switchPublisherNames_9: + switchPublisherNames_10: + switchPublisherNames_11: + switchPublisherNames_12: + switchPublisherNames_13: + switchPublisherNames_14: + switchIcons_0: {fileID: 0} + switchIcons_1: {fileID: 0} + switchIcons_2: {fileID: 0} + switchIcons_3: {fileID: 0} + switchIcons_4: {fileID: 0} + switchIcons_5: {fileID: 0} + switchIcons_6: {fileID: 0} + switchIcons_7: {fileID: 0} + switchIcons_8: {fileID: 0} + switchIcons_9: {fileID: 0} + switchIcons_10: {fileID: 0} + switchIcons_11: {fileID: 0} + switchIcons_12: {fileID: 0} + switchIcons_13: {fileID: 0} + switchIcons_14: {fileID: 0} + switchSmallIcons_0: {fileID: 0} + switchSmallIcons_1: {fileID: 0} + switchSmallIcons_2: {fileID: 0} + switchSmallIcons_3: {fileID: 0} + switchSmallIcons_4: {fileID: 0} + switchSmallIcons_5: {fileID: 0} + switchSmallIcons_6: {fileID: 0} + switchSmallIcons_7: {fileID: 0} + switchSmallIcons_8: {fileID: 0} + switchSmallIcons_9: {fileID: 0} + switchSmallIcons_10: {fileID: 0} + switchSmallIcons_11: {fileID: 0} + switchSmallIcons_12: {fileID: 0} + switchSmallIcons_13: {fileID: 0} + switchSmallIcons_14: {fileID: 0} + switchManualHTML: + switchAccessibleURLs: + switchLegalInformation: + switchMainThreadStackSize: 1048576 + switchPresenceGroupId: + switchLogoHandling: 0 + switchReleaseVersion: 0 + switchDisplayVersion: 1.0.0 + switchStartupUserAccount: 0 + switchTouchScreenUsage: 0 + switchSupportedLanguagesMask: 0 + switchLogoType: 0 + switchApplicationErrorCodeCategory: + switchUserAccountSaveDataSize: 0 + switchUserAccountSaveDataJournalSize: 0 + switchApplicationAttribute: 0 + switchCardSpecSize: -1 + switchCardSpecClock: -1 + switchRatingsMask: 0 + switchRatingsInt_0: 0 + switchRatingsInt_1: 0 + switchRatingsInt_2: 0 + switchRatingsInt_3: 0 + switchRatingsInt_4: 0 + switchRatingsInt_5: 0 + switchRatingsInt_6: 0 + switchRatingsInt_7: 0 + switchRatingsInt_8: 0 + switchRatingsInt_9: 0 + switchRatingsInt_10: 0 + switchRatingsInt_11: 0 + switchLocalCommunicationIds_0: + switchLocalCommunicationIds_1: + switchLocalCommunicationIds_2: + switchLocalCommunicationIds_3: + switchLocalCommunicationIds_4: + switchLocalCommunicationIds_5: + switchLocalCommunicationIds_6: + switchLocalCommunicationIds_7: + switchParentalControl: 0 + switchAllowsScreenshot: 1 + switchAllowsVideoCapturing: 1 + switchAllowsRuntimeAddOnContentInstall: 0 + switchDataLossConfirmation: 0 + switchSupportedNpadStyles: 3 + switchNativeFsCacheSize: 32 + switchIsHoldTypeHorizontal: 0 + switchSupportedNpadCount: 8 + switchSocketConfigEnabled: 0 + switchTcpInitialSendBufferSize: 32 + switchTcpInitialReceiveBufferSize: 64 + switchTcpAutoSendBufferSizeMax: 256 + switchTcpAutoReceiveBufferSizeMax: 256 + switchUdpSendBufferSize: 9 + switchUdpReceiveBufferSize: 42 + switchSocketBufferEfficiency: 4 + switchSocketInitializeEnabled: 1 + switchNetworkInterfaceManagerInitializeEnabled: 1 + switchPlayerConnectionEnabled: 1 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -185,28 +435,62 @@ PlayerSettings: ps4AppType: 0 ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 - ps4VideoOutResolution: 4 + ps4VideoOutInitialWidth: 1920 + ps4VideoOutBaseModeInitialWidth: 1920 + ps4VideoOutReprojectionRate: 60 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: ps4StartupImagePath: + ps4StartupImagesFolder: + ps4IconImagesFolder: ps4SaveDataImagePath: + ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 + ps4RemotePlayKeyMappingDir: + ps4PlayTogetherPlayerCount: 0 ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 + ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 + ps4ProGarlicHeapSize: 2560 ps4Passcode: 2qmWqBlQ9wQj99nsQzldVI5ZuGXbEWRK ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + enableApplicationExit: 0 + restrictedAudioUsageRights: 0 + ps4UseResolutionFallback: 0 + ps4ReprojectionSupport: 0 + ps4UseAudio3dBackend: 0 + ps4SocialScreenEnabled: 0 + ps4ScriptOptimizationLevel: 2 + ps4Audio3dVirtualSpeakerCount: 14 + ps4attribCpuUsage: 0 + ps4PatchPkgPath: + ps4PatchLatestPkgPath: + ps4PatchChangeinfoPath: + ps4PatchDayOne: 0 + ps4attribUserManagement: 0 + ps4attribMoveSupport: 0 + ps4attrib3DSupport: 0 + ps4attribShareSupport: 0 + ps4attribExclusiveVR: 0 + ps4disableAutoHideSplash: 0 + ps4videoRecordingFeaturesUsed: 0 + ps4contentSearchFeaturesUsed: 0 + ps4attribEyeToEyeDistanceSettingVR: 0 + ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: @@ -254,14 +538,50 @@ PlayerSettings: psp2UseLibLocation: 0 psp2InfoBarOnStartup: 0 psp2InfoBarColor: 0 - psmSplashimage: {fileID: 0} + psp2ScriptOptimizationLevel: 2 + splashScreenBackgroundSourceLandscape: {fileID: 0} + splashScreenBackgroundSourcePortrait: {fileID: 0} spritePackerPolicy: - scriptingDefineSymbols: {} + webGLMemorySize: 256 + webGLExceptionSupport: 1 + webGLNameFilesAsHashes: 0 + webGLDataCaching: 0 + webGLDebugSymbols: 0 + webGLEmscriptenArgs: + webGLModulesDirectory: + webGLTemplate: APPLICATION:Default + webGLAnalyzeBuildSize: 0 + webGLUseEmbeddedResources: 0 + webGLCompressionFormat: 1 + webGLLinkerTarget: 1 + scriptingDefineSymbols: + 1: UNITY_POST_PROCESSING_STACK_V2 + 4: UNITY_POST_PROCESSING_STACK_V2 + 7: UNITY_POST_PROCESSING_STACK_V2 + 13: UNITY_POST_PROCESSING_STACK_V2 + 18: UNITY_POST_PROCESSING_STACK_V2 + 19: UNITY_POST_PROCESSING_STACK_V2 + 21: UNITY_POST_PROCESSING_STACK_V2 + 23: UNITY_POST_PROCESSING_STACK_V2 + 25: UNITY_POST_PROCESSING_STACK_V2 + 26: UNITY_POST_PROCESSING_STACK_V2 + 27: UNITY_POST_PROCESSING_STACK_V2 + platformArchitecture: + iOS: 2 + scriptingBackend: + Standalone: 0 + WebGL: 1 + WebPlayer: 0 + iOS: 1 + il2cppCompilerConfiguration: {} + incrementalIl2cppBuild: {} + allowUnsafeCode: 0 + additionalIl2CppArgs: + scriptingRuntimeVersion: 0 + apiCompatibilityLevelPerPlatform: {} + m_RenderingPath: 1 + m_MobileRenderingPath: 1 metroPackageName: KinoGlitch - metroPackageLogo: - metroPackageLogo140: - metroPackageLogo180: - metroPackageLogo240: metroPackageVersion: metroCertificatePath: metroCertificatePassword: @@ -269,46 +589,8 @@ PlayerSettings: metroCertificateIssuer: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: KinoGlitch - metroStoreTileLogo80: - metroStoreTileLogo: - metroStoreTileLogo140: - metroStoreTileLogo180: - metroStoreTileWideLogo80: - metroStoreTileWideLogo: - metroStoreTileWideLogo140: - metroStoreTileWideLogo180: - metroStoreTileSmallLogo80: - metroStoreTileSmallLogo: - metroStoreTileSmallLogo140: - metroStoreTileSmallLogo180: - metroStoreSmallTile80: - metroStoreSmallTile: - metroStoreSmallTile140: - metroStoreSmallTile180: - metroStoreLargeTile80: - metroStoreLargeTile: - metroStoreLargeTile140: - metroStoreLargeTile180: - metroStoreSplashScreenImage: - metroStoreSplashScreenImage140: - metroStoreSplashScreenImage180: - metroPhoneAppIcon: - metroPhoneAppIcon140: - metroPhoneAppIcon240: - metroPhoneSmallTile: - metroPhoneSmallTile140: - metroPhoneSmallTile240: - metroPhoneMediumTile: - metroPhoneMediumTile140: - metroPhoneMediumTile240: - metroPhoneWideTile: - metroPhoneWideTile140: - metroPhoneWideTile240: - metroPhoneSplashScreenImage: - metroPhoneSplashScreenImage140: - metroPhoneSplashScreenImage240: + wsaImages: {} metroTileShortName: - metroCommandLineArgsFile: metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -323,35 +605,17 @@ PlayerSettings: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - blackberryDeviceAddress: - blackberryDevicePassword: - blackberryTokenPath: - blackberryTokenExires: - blackberryTokenAuthor: - blackberryTokenAuthorId: - blackberryCskPassword: - blackberrySaveLogPath: - blackberrySharedPermissions: 0 - blackberryCameraPermissions: 0 - blackberryGPSPermissions: 0 - blackberryDeviceIDPermissions: 0 - blackberryMicrophonePermissions: 0 - blackberryGamepadSupport: 0 - blackberryBuildId: 0 - blackberryLandscapeSplashScreen: {fileID: 0} - blackberryPortraitSplashScreen: {fileID: 0} - blackberrySquareSplashScreen: {fileID: 0} - tizenProductDescription: - tizenProductURL: - tizenSigningProfileName: - tizenGPSPermissions: 0 - tizenMicrophonePermissions: 0 - stvDeviceAddress: - stvProductDescription: - stvProductAuthor: - stvProductAuthorEmail: - stvProductLink: - stvProductCategory: 0 + n3dsUseExtSaveData: 0 + n3dsCompressStaticMem: 1 + n3dsExtSaveDataNumber: 0x12345 + n3dsStackSize: 131072 + n3dsTargetPlatform: 2 + n3dsRegion: 7 + n3dsMediaSize: 0 + n3dsLogoStyle: 3 + n3dsTitle: GameName + n3dsProductCode: + n3dsApplicationId: 0xFF3FF XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -361,51 +625,32 @@ PlayerSettings: XboxOneGameOsOverridePath: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: + XboxOneVersion: 1.0.0.0 XboxOnePackageEncryption: 0 XboxOnePackageUpdateGranularity: 2 XboxOneDescription: + XboxOneLanguage: + - enus + XboxOneCapability: [] + XboxOneGameRating: {} XboxOneIsContentPackage: 0 XboxOneEnableGPUVariability: 0 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 - intPropertyNames: - - Standalone::ScriptingBackend - - WebGL::ScriptingBackend - - WebGL::audioCompressionFormat - - WebGL::exceptionSupport - - WebGL::memorySize - - WebPlayer::ScriptingBackend - - iOS::Architecture - - iOS::ScriptingBackend - Standalone::ScriptingBackend: 0 - WebGL::ScriptingBackend: 1 - WebGL::audioCompressionFormat: 4 - WebGL::exceptionSupport: 1 - WebGL::memorySize: 256 - WebPlayer::ScriptingBackend: 0 - iOS::Architecture: 2 - iOS::ScriptingBackend: 1 - boolPropertyNames: - - WebGL::analyzeBuildSize - - WebGL::dataCaching - - WebGL::useEmbeddedResources - - XboxOne::enus - WebGL::analyzeBuildSize: 0 - WebGL::dataCaching: 0 - WebGL::useEmbeddedResources: 0 - XboxOne::enus: 1 - stringPropertyNames: - - WebGL::emscriptenArgs - - WebGL::template - - additionalIl2CppArgs::additionalIl2CppArgs - WebGL::emscriptenArgs: - WebGL::template: APPLICATION:Default - additionalIl2CppArgs::additionalIl2CppArgs: - firstStreamedSceneWithResources: 0 + XboxOneXTitleMemory: 8 + xboxOneScriptCompiler: 0 + vrEditorSettings: + daydream: + daydreamIconForeground: {fileID: 0} + daydreamIconBackground: {fileID: 0} + cloudServicesEnabled: {} + facebookSdkVersion: 7.9.4 + apiCompatibilityLevel: 2 cloudProjectId: - projectId: projectName: organizationId: cloudEnabled: 0 + enableNativePlatformBackendsForNewInputSystem: 0 + disableOldInputManagerSupport: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 0a13764..9069a39 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1 @@ -m_EditorVersion: 5.1.1p2 -m_StandardAssetsVersion: 0 +m_EditorVersion: 2018.2.10f1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..17cb803 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - - - - + - PostProcessing - - - diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000..3da14d5 --- /dev/null +++ b/ProjectSettings/UnityConnectSettings.asset @@ -0,0 +1,34 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!310 &1 +UnityConnectSettings: + m_ObjectHideFlags: 0 + m_Enabled: 0 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + m_TestInitMode: 0 + CrashReportingSettings: + m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes + m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate + m_Enabled: 0 + m_CaptureEditorExceptions: 1 + UnityPurchasingSettings: + m_Enabled: 0 + m_TestMode: 0 + UnityAnalyticsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_TestEventUrl: + m_TestConfigUrl: + UnityAdsSettings: + m_Enabled: 0 + m_InitializeOnStartup: 1 + m_TestMode: 0 + m_IosGameId: + m_AndroidGameId: + m_GameIds: {} + m_GameId: + PerformanceReportingSettings: + m_Enabled: 0