diff --git a/Assets/Scripts/Shaders/Blit.cs b/Assets/Scripts/Shaders/Blit.cs deleted file mode 100644 index ef2b7bc..0000000 --- a/Assets/Scripts/Shaders/Blit.cs +++ /dev/null @@ -1,135 +0,0 @@ -using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; - -/* - * https://cyangamedev.wordpress.com/2020/06/22/urp-post-processing/ - * - * FIRST TRY NOT USING - * 29 octobre - */ - -namespace Shaders -{ - public class Blit : ScriptableRendererFeature - { - private class BlitPass : ScriptableRenderPass - { - public enum RenderTarget - { - Color, - RenderTexture, - } - - public Material blitMaterial = null; - public int blitShaderPassIndex = 0; - public FilterMode filterMode { get; set; } - - private RenderTargetIdentifier source { get; set; } - private RenderTargetHandle destination { get; set; } - - RenderTargetHandle m_TemporaryColorTexture; - string m_ProfilerTag; - - public BlitPass(RenderPassEvent renderPassEvent, Material blitMaterial, int blitShaderPassIndex, string tag) - { - this.renderPassEvent = renderPassEvent; - this.blitMaterial = blitMaterial; - this.blitShaderPassIndex = blitShaderPassIndex; - m_ProfilerTag = tag; - m_TemporaryColorTexture.Init("_TemporaryColorTexture"); - } - - public void Setup(RenderTargetIdentifier source, RenderTargetHandle destination) - { - this.source = source; - this.destination = destination; - } - - public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) - { - CommandBuffer cmd = CommandBufferPool.Get(m_ProfilerTag); - - RenderTextureDescriptor opaqueDesc = renderingData.cameraData.cameraTargetDescriptor; - opaqueDesc.depthBufferBits = 0; - - // Can't read and write to same color target, use a TemporaryRT - if (destination == RenderTargetHandle.CameraTarget) - { - cmd.GetTemporaryRT(m_TemporaryColorTexture.id, opaqueDesc, filterMode); - Blit(cmd, source, m_TemporaryColorTexture.Identifier(), blitMaterial, blitShaderPassIndex); - Blit(cmd, m_TemporaryColorTexture.Identifier(), source); - } - else - { - Blit(cmd, source, destination.Identifier(), blitMaterial, blitShaderPassIndex); - } - - context.ExecuteCommandBuffer(cmd); - CommandBufferPool.Release(cmd); - } - - public override void FrameCleanup(CommandBuffer cmd) - { - if (destination == RenderTargetHandle.CameraTarget) - cmd.ReleaseTemporaryRT(m_TemporaryColorTexture.id); - } - } - - [System.Serializable] - public class BlitSettings - { - public RenderPassEvent Event = RenderPassEvent.AfterRenderingOpaques; - - public Material blitMaterial = null; - public int blitMaterialPassIndex = -1; - public Target destination = Target.Color; - public string textureId = "_BlitPassTexture"; - public bool alwaysRender = false; - } - - public enum Target - { - Color, - Texture - } - - public BlitSettings settings = new BlitSettings(); - RenderTargetHandle m_RenderTextureHandle; - - BlitPass blitPass; - - public override void Create() - { - var passIndex = settings.blitMaterial != null ? settings.blitMaterial.passCount - 1 : 1; - settings.blitMaterialPassIndex = Mathf.Clamp(settings.blitMaterialPassIndex, -1, passIndex); - blitPass = new BlitPass(settings.Event, settings.blitMaterial, settings.blitMaterialPassIndex, name); - m_RenderTextureHandle.Init(settings.textureId); - } - - public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) - { - var src = renderer.cameraColorTarget; - var dest = (settings.destination == Target.Color) ? RenderTargetHandle.CameraTarget : m_RenderTextureHandle; - - if (settings.blitMaterial == null) - { - Debug.LogWarningFormat( - "Missing Blit Material. {0} blit pass will not execute. Check for missing reference in the assigned renderer.", - GetType().Name); - return; - } -#if UNITY_WEBGL - blitPass.Setup(src, dest); - renderer.EnqueuePass(blitPass); -#endif -#if UNITY_EDITOR - if (Application.isPlaying || settings.alwaysRender) - { - blitPass.Setup(src, dest); - renderer.EnqueuePass(blitPass); - } -#endif - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Shaders/Blit.cs.meta b/Assets/Scripts/Shaders/Blit.cs.meta deleted file mode 100644 index 900b255..0000000 --- a/Assets/Scripts/Shaders/Blit.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: d2d5de177d814a8d8c64638ad49b1b1d -timeCreated: 1666983505 \ No newline at end of file diff --git a/Assets/Shaders/CRTMaterialShader.mat b/Assets/Shaders/CRTMaterialShader.mat index 25bdf29..2fb5137 100644 --- a/Assets/Shaders/CRTMaterialShader.mat +++ b/Assets/Shaders/CRTMaterialShader.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CRTMaterialShader - m_Shader: {fileID: 4800000, guid: 7d830e9754227db4b89bacfdc753e135, type: 3} + m_Shader: {fileID: 4800000, guid: d4c49b1ac4f8dd44d98d7885681c6d4d, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -105,7 +105,7 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Intensity: 1 + - _Intensity: 0.96 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 @@ -118,24 +118,24 @@ Material: - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 - - u_bend: 4.84 + - u_bend: 4.03 - u_blue_offset_y: 0.0021 - u_green_offset_y: 0 - - u_noise_amount: 0.015 + - u_noise_amount: 0.0154 - u_noise_size: 417 - - u_red_offset_y: -0.0021 - - u_scanlin_transparence1: 0.024 - - u_scanlin_transparence2: 0.024 - - u_scanline_amount: 0.047 + - u_red_offset_y: -0.0024 + - u_scanlin_transparence1: 0.005 + - u_scanlin_transparence2: 0.005 + - u_scanline_amount: 0.143 - u_scanline_size_1: 277 - u_scanline_size_2: 521 - - u_scanline_speed_1: 94.13 - - u_scanline_speed_2: 30 - - u_space_bend: 2 - - u_time: 15.95 - - u_vignette_edge_round: 6 - - u_vignette_size: 1.81 - - u_vignette_smoothness: 0.51 + - u_scanline_speed_1: 1569.4 + - u_scanline_speed_2: 76.6 + - u_space_bend: 1.993 + - u_time: 5.1 + - u_vignette_edge_round: 11.6 + - u_vignette_size: 1.95 + - u_vignette_smoothness: 0.82 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Shaders/CRTMaterialShaderFixed.mat b/Assets/Shaders/CRTMaterialShaderFixed.mat deleted file mode 100644 index 72b3b79..0000000 --- a/Assets/Shaders/CRTMaterialShaderFixed.mat +++ /dev/null @@ -1,150 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-937696407428621231 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CRTMaterialShaderFixed - m_Shader: {fileID: 4800000, guid: d4c49b1ac4f8dd44d98d7885681c6d4d, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - 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: 0, 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} - - _ParallaxMap: - 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} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - 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 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Intensity: 0.96 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - - u_bend: 4.03 - - u_blue_offset_y: 0.0021 - - u_green_offset_y: 0 - - u_noise_amount: 0.0154 - - u_noise_size: 417 - - u_red_offset_y: -0.0024 - - u_scanlin_transparence1: 0.005 - - u_scanlin_transparence2: 0.005 - - u_scanline_amount: 0.143 - - u_scanline_size_1: 277 - - u_scanline_size_2: 521 - - u_scanline_speed_1: 1569.4 - - u_scanline_speed_2: 76.6 - - u_space_bend: 1.993 - - u_time: 5.1 - - u_vignette_edge_round: 11.6 - - u_vignette_size: 1.95 - - u_vignette_smoothness: 0.82 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - - u_blue_offset: {r: 0, g: 0.002, b: 0, a: 0} - - u_blue_offset_y: {r: 0.25, g: 0.5, b: 0.5, a: 0} - - u_green_offset: {r: 0, g: 0, b: 0, a: 0} - - u_green_offset_y: {r: 0.25, g: 0.5, b: 0.5, a: 0} - - u_red_offset: {r: 0, g: -0.002, b: 0, a: 0} - - u_red_offset_y: {r: 0.25, g: 0.5, b: 0.5, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Shaders/CRTMaterialShaderFixed.mat.meta b/Assets/Shaders/CRTMaterialShaderFixed.mat.meta deleted file mode 100644 index 410abc0..0000000 --- a/Assets/Shaders/CRTMaterialShaderFixed.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eee0d494252ff8b49a69d3b8e1b74894 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Shaders/CRTShader.shader b/Assets/Shaders/CRTShader.shader index 9ae6736..791aab6 100644 --- a/Assets/Shaders/CRTShader.shader +++ b/Assets/Shaders/CRTShader.shader @@ -1,4 +1,4 @@ -Shader "CRTShader" +Shader "CRTShaderFixed" { Properties { @@ -28,35 +28,49 @@ Shader "CRTShader" // No culling or depth Cull Off ZWrite Off ZTest Always + Tags + { + "RenderType"="Opaque" "RenderPipeline" = "UniversalPipeline" + } + Pass { - CGPROGRAM + HLSLPROGRAM + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" + #pragma vertex vert #pragma fragment frag - #include "UnityCG.cginc" + TEXTURE2D(_MainTex); + SAMPLER(sampler_MainTex); - struct appdata + float _Intensity; + + struct Attributes { - float4 vertex : POSITION; + float4 positionOS : POSITION; float2 uv : TEXCOORD0; }; - struct v2f + struct Varyings { float2 uv : TEXCOORD0; float4 vertex : SV_POSITION; + UNITY_VERTEX_OUTPUT_STEREO }; - v2f vert(appdata v) - { - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.uv = v.uv; - return o; - } - sampler2D _MainTex; + Varyings vert(Attributes input) + { + Varyings output = (Varyings)0; + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); + + VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); + output.vertex = vertexInput.positionCS; + output.uv = input.uv; + + return output; + } uniform float u_time; uniform float u_bend; @@ -128,26 +142,29 @@ Shader "CRTShader" return (lerp(a, b, u.x) + (c - a) * u.y * (1. - u.x) + (d - b) * u.x * u.y); } - fixed4 frag(v2f i) : SV_Target + float4 frag(Varyings i) : SV_Target { + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); u_time = _Time; - half2 crt_uv = crt_coords(i.uv, u_bend); - fixed4 col; - col.r = tex2D(_MainTex, crt_uv + u_color_offset(u_red_offset_y)).r; - col.g = tex2D(_MainTex, crt_uv + u_color_offset(u_green_offset_y)).g; - col.b = tex2D(_MainTex, crt_uv + u_color_offset(u_blue_offset_y)).b; - col.a = tex2D(_MainTex, crt_uv).a; - + float4 color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, i.uv); + + color.r = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, crt_uv + u_color_offset(u_red_offset_y)).r; + color.g = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, crt_uv + u_color_offset(u_green_offset_y)).g; + color.b = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, crt_uv + u_color_offset(u_blue_offset_y)).b; + color.a = SAMPLE_TEXTURE2D(_MainTex,sampler_MainTex, crt_uv).a; + float s1 = scanline(i.uv, u_scanline_size_1, u_scanline_speed_1, u_scanlin_transparence1); float s2 = scanline(i.uv, u_scanline_size_2, u_scanline_speed_2, u_scanlin_transparence2); + + color = lerp(color, (s1 + s2), u_scanline_amount); + color = lerp(color, noise(i.uv * u_noise_size), u_noise_amount); + color *= vignette(i.uv, u_vignette_size, u_vignette_smoothness, u_vignette_edge_round); - col = lerp(col, fixed(s1 + s2), u_scanline_amount); - - return lerp(col, fixed(noise(i.uv * u_noise_size)), u_noise_amount) * vignette( - i.uv, u_vignette_size, u_vignette_smoothness, u_vignette_edge_round); + return color; } - ENDCG + ENDHLSL } } + FallBack "Diffuse" } \ No newline at end of file diff --git a/Assets/Shaders/CRTShaderFixed.shader b/Assets/Shaders/CRTShaderFixed.shader deleted file mode 100644 index 791aab6..0000000 --- a/Assets/Shaders/CRTShaderFixed.shader +++ /dev/null @@ -1,170 +0,0 @@ -Shader "CRTShaderFixed" -{ - Properties - { - _MainTex("Texture", 2D) = "Transparent" {} - u_time("Time",float) = 0.5 - u_bend("Bend",range(0.5, 10.0)) = 0.5 - u_space_bend("Space Bend",range(1.5, 2.5)) = 2.5 - u_scanlin_transparence1("Scanline 1 Transparence",range(0, 0.5)) = 0.5 - u_scanline_size_1("Scanline Size 1",range(0, 750)) = 0.5 - u_scanline_speed_1("Scanline Speed 1",float) = 0.5 - u_scanlin_transparence2("Scanline 2 Transparence",range(0, 0.5)) = 0.5 - u_scanline_size_2("Scanline Size 2",range(0, 750)) = 0.5 - u_scanline_speed_2("Scanline Speed 2",float) = 0.5 - u_scanline_amount("Scanline Amount",range(0, 1)) = 0.5 - u_vignette_size("Vignette Size",range(0, 10)) = 0.5 - u_vignette_smoothness("Vignette Smoothness",range(0, 2)) = 0.5 - u_vignette_edge_round("Vignette Edge Round",range(0, 100)) = 0.5 - u_noise_size("Noise Size",range(0, 500 )) = 0.5 - u_noise_amount("Noise Amount",range(0, 0.15)) = 0.5 - u_red_offset_y("Red Offset",range(-0.01,0.01)) = 0 - u_green_offset_y("Green Offset",range(-0.01,0.01)) = 0 - u_blue_offset_y("Blue Offset",range(-0.01,0.01)) = 0 - } - - SubShader - { - // No culling or depth - Cull Off ZWrite Off ZTest Always - - Tags - { - "RenderType"="Opaque" "RenderPipeline" = "UniversalPipeline" - } - - Pass - { - HLSLPROGRAM - #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/SurfaceInput.hlsl" - - #pragma vertex vert - #pragma fragment frag - - TEXTURE2D(_MainTex); - SAMPLER(sampler_MainTex); - - float _Intensity; - - struct Attributes - { - float4 positionOS : POSITION; - float2 uv : TEXCOORD0; - }; - - struct Varyings - { - float2 uv : TEXCOORD0; - float4 vertex : SV_POSITION; - UNITY_VERTEX_OUTPUT_STEREO - }; - - - Varyings vert(Attributes input) - { - Varyings output = (Varyings)0; - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); - - VertexPositionInputs vertexInput = GetVertexPositionInputs(input.positionOS.xyz); - output.vertex = vertexInput.positionCS; - output.uv = input.uv; - - return output; - } - - uniform float u_time; - uniform float u_bend; - uniform float u_space_bend; - uniform float u_scanlin_transparence1; - uniform float u_scanline_size_1; - uniform float u_scanline_speed_1; - uniform float u_scanlin_transparence2; - uniform float u_scanline_size_2; - uniform float u_scanline_speed_2; - uniform float u_scanline_amount; - uniform float u_vignette_size; - uniform float u_vignette_smoothness; - uniform float u_vignette_edge_round; - uniform float u_noise_size; - uniform float u_noise_amount; - uniform float u_red_offset_y; - uniform float u_green_offset_y; - uniform float u_blue_offset_y; - - half2 u_color_offset(float offset) - { - return half2(0, offset); - } - - half2 crt_coords(half2 uv, float bend) - { - uv -= 0.5; - uv *= 2.; - - uv.x *= 1. + pow(abs(uv.y) / bend, 2.); - uv.y *= 1. + pow(abs(uv.x) / bend, 2.); - - uv /= u_space_bend; - return (uv + .5); - } - - float vignette(half2 uv, float size, float smoothness, float edgeRounding) - { - uv -= .5; - uv *= size; - float amount = sqrt(pow(abs(uv.x), edgeRounding) + pow(abs(uv.y), edgeRounding)); - amount = 1. - amount; - return smoothstep(0, smoothness, amount); - } - - float scanline(half2 uv, float lines, float speed, float transparence) - { - return sin(uv.y * lines + u_time * speed) * transparence; - } - - float random(half2 uv) - { - return frac(sin(dot(uv, half2(15.1511, 42.5225))) * 12341.51611 * sin(u_time * 0.03)); - } - - float noise(half2 uv) - { - half2 i = floor(uv); - half2 f = frac(uv); - - float a = random(i); - float b = random(i + half2(1., 0.)); - float c = random(i + half2(0, 1.)); - float d = random(i + half2(1., 1.)); - - half2 u = smoothstep(0., 1., f); - - return (lerp(a, b, u.x) + (c - a) * u.y * (1. - u.x) + (d - b) * u.x * u.y); - } - - float4 frag(Varyings i) : SV_Target - { - UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(input); - u_time = _Time; - half2 crt_uv = crt_coords(i.uv, u_bend); - float4 color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, i.uv); - - color.r = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, crt_uv + u_color_offset(u_red_offset_y)).r; - color.g = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, crt_uv + u_color_offset(u_green_offset_y)).g; - color.b = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, crt_uv + u_color_offset(u_blue_offset_y)).b; - color.a = SAMPLE_TEXTURE2D(_MainTex,sampler_MainTex, crt_uv).a; - - float s1 = scanline(i.uv, u_scanline_size_1, u_scanline_speed_1, u_scanlin_transparence1); - float s2 = scanline(i.uv, u_scanline_size_2, u_scanline_speed_2, u_scanlin_transparence2); - - color = lerp(color, (s1 + s2), u_scanline_amount); - color = lerp(color, noise(i.uv * u_noise_size), u_noise_amount); - color *= vignette(i.uv, u_vignette_size, u_vignette_smoothness, u_vignette_edge_round); - - return color; - } - ENDHLSL - } - } - FallBack "Diffuse" -} \ No newline at end of file diff --git a/Assets/Shaders/CRTShaderFixed.shader.meta b/Assets/Shaders/CRTShaderFixed.shader.meta deleted file mode 100644 index 1ddc3eb..0000000 --- a/Assets/Shaders/CRTShaderFixed.shader.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d4c49b1ac4f8dd44d98d7885681c6d4d -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - preprocessorOverride: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/MenuMock.png b/Assets/Sprites/MenuMock.png deleted file mode 100644 index 5c75fda..0000000 Binary files a/Assets/Sprites/MenuMock.png and /dev/null differ diff --git a/Assets/Sprites/MenuMock.png.meta b/Assets/Sprites/MenuMock.png.meta deleted file mode 100644 index 71a5426..0000000 --- a/Assets/Sprites/MenuMock.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: a3d2adcf02321764bbed50778e5a09ef -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/photo_facebook HI-DEF.png b/Assets/Sprites/photo_facebook HI-DEF.png deleted file mode 100644 index 3da1b43..0000000 Binary files a/Assets/Sprites/photo_facebook HI-DEF.png and /dev/null differ diff --git a/Assets/Sprites/photo_facebook HI-DEF.png.meta b/Assets/Sprites/photo_facebook HI-DEF.png.meta deleted file mode 100644 index f5bc655..0000000 --- a/Assets/Sprites/photo_facebook HI-DEF.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: f265712924b655643babe97080c39509 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/testAsesprite.png b/Assets/Sprites/testAsesprite.png deleted file mode 100644 index 48d5f11..0000000 Binary files a/Assets/Sprites/testAsesprite.png and /dev/null differ diff --git a/Assets/Sprites/testAsesprite.png.meta b/Assets/Sprites/testAsesprite.png.meta deleted file mode 100644 index 00c6c1a..0000000 --- a/Assets/Sprites/testAsesprite.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: 116e65d2b34493c439f545f71aa487b5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 0 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 32 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/transparence.png b/Assets/Sprites/transparence.png deleted file mode 100644 index 20938b8..0000000 Binary files a/Assets/Sprites/transparence.png and /dev/null differ diff --git a/Assets/Sprites/transparence.png.meta b/Assets/Sprites/transparence.png.meta deleted file mode 100644 index e7ea28c..0000000 --- a/Assets/Sprites/transparence.png.meta +++ /dev/null @@ -1,147 +0,0 @@ -fileFormatVersion: 2 -guid: d1ac00be1def81845b41bef35d80621c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 750 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Windows Store Apps - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5bb20f7..31cf2c2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -801,7 +801,7 @@ PlayerSettings: ps4IncludedModules: [] ps4attribVROutputEnabled: 0 monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: a3d2adcf02321764bbed50778e5a09ef, + splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: f101856c7df715742a264dc02c835fb4, type: 3} splashScreenBackgroundSourcePortrait: {fileID: 0} blurSplashScreenBackground: 1