From ff3449c39aea446ecabc08c4e8a407bacc1b8ee9 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sun, 12 Apr 2026 15:07:05 -0400 Subject: [PATCH] - Added a UI render texture material that has standard depth sorting. - On-set newspaper display in round 3 no longer renders over everything. --- Assembly-CSharp.csproj | 1 + Assets/Materials/Overlay/M_Counter.mat | 4 +- Assets/Materials/Overlay/M_Timer.mat | 4 +- Assets/Scenes/witwics.unity | 144 +++++++++--------- Assets/Shaders/Decal.shader | 81 +++++----- .../Render Texture UI ZTest Always.shader | 61 ++++++++ ...Render Texture UI ZTest Always.shader.meta | 9 ++ Assets/Shaders/Render Texture UI.shader | 17 +-- .../UtilityScripts/BoneFollower.asset | 2 +- .../UtilityScripts/InteractToggle.asset | 2 +- .../UtilityScripts/PlayerModSetter.asset | 2 +- .../Synced/GlobalToggleObject.asset | 2 +- .../Synced/MasterToggleObject.asset | 2 +- .../UtilityScripts/TrackingDataFollower.asset | 2 +- .../UtilityScripts/WorldAudioSettings.asset | 2 +- 15 files changed, 204 insertions(+), 131 deletions(-) create mode 100644 Assets/Shaders/Render Texture UI ZTest Always.shader create mode 100644 Assets/Shaders/Render Texture UI ZTest Always.shader.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ccd3cd8..4fb2a56 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -159,6 +159,7 @@ + diff --git a/Assets/Materials/Overlay/M_Counter.mat b/Assets/Materials/Overlay/M_Counter.mat index b58a5bb..17dce7d 100644 --- a/Assets/Materials/Overlay/M_Counter.mat +++ b/Assets/Materials/Overlay/M_Counter.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_Counter - m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3} + m_Shader: {fileID: 4800000, guid: 213afe80d5f1c374ea290e02120114e4, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -19,7 +19,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/Materials/Overlay/M_Timer.mat b/Assets/Materials/Overlay/M_Timer.mat index 758ce95..847e3ef 100644 --- a/Assets/Materials/Overlay/M_Timer.mat +++ b/Assets/Materials/Overlay/M_Timer.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: M_Timer - m_Shader: {fileID: 4800000, guid: bdbecd808900b3a49963019f31a76291, type: 3} + m_Shader: {fileID: 4800000, guid: 213afe80d5f1c374ea290e02120114e4, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,7 +17,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3001 + m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 9110c3c..d28cd48 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -106762,104 +106762,104 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} - - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} + - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} + - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} + - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/Shaders/Decal.shader b/Assets/Shaders/Decal.shader index a36f5ab..b6b35f8 100644 --- a/Assets/Shaders/Decal.shader +++ b/Assets/Shaders/Decal.shader @@ -1,51 +1,64 @@ -// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' - -// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' - -// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) - -// Simplified Diffuse shader. Differences from regular Diffuse one: -// - no Main Color -// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH. - - -Shader "Carmen/Decal" +Shader "Carmen/Decal" { - Properties - { + Properties + { _MainTex ("Decal", 2D) = "white" {} - _Colour ("Colour", Color) = (1.0, 1.0, 1.0, 1.0) - } - SubShader - { - Tags { "Queue"="Transparent" "RenderType"="Transparent" "CanUseSpriteAtlas"="True" } - LOD 200 + _Colour ("Colour", Color) = (1.0, 1.0, 1.0, 1.0) + _Metallic ("Metallic", Range(0.0, 1.0)) = 0.0 + _Smoothness ("Smoothness", Range(0.0, 1.0)) = 0.0 - Cull Back - Blend SrcAlpha OneMinusSrcAlpha + [NoScaleOffset] _DetailTex ("Detail Albedo", 2D) = "grey" {} + _DetailNormal ("Detail Normal", 2D) = "bump" {} + } + SubShader + { + Tags { "Queue"="Overlay" "RenderType"="Fade" "CanUseSpriteAtlas"="True" } + LOD 200 + + Cull Back + Blend SrcAlpha OneMinusSrcAlpha Offset -1, -1 - CGPROGRAM - #include "UnityCG.cginc" + CGPROGRAM + #include "UnityCG.cginc" #pragma target 4.5 - #pragma surface surf Standard - - UNITY_DECLARE_TEX2D(_MainTex); + #pragma surface surf Standard alpha:fade + struct Input { float2 uv_MainTex; + float2 uv_DetailTex; + float2 uv_DetailNormal; }; - half4 _Colour; + + + UNITY_DECLARE_TEX2D(_MainTex); + half4 _Colour; + half _Metallic; + half _Smoothness; + + UNITY_DECLARE_TEX2D(_DetailTex); + UNITY_DECLARE_TEX2D(_DetailNormal); + void surf (Input IN, inout SurfaceOutputStandard o) { - half4 TexSample = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex); - o.Albedo = TexSample.rgb * _Colour; - o.Alpha = TexSample.a; + half4 TexSample = UNITY_SAMPLE_TEX2D(_MainTex, IN.uv_MainTex); + + o.Albedo = TexSample.rgb; + //o.Albedo *= UNITY_SAMPLE_TEX2D(_DetailTex, IN.uv_DetailNormal).rgb * 2.0; + o.Albedo *= _Colour; + + o.Alpha = TexSample.a * _Colour.a; + + o.Metallic = _Metallic; + o.Smoothness = _Smoothness; + + o.Normal = UnpackNormal(UNITY_SAMPLE_TEX2D(_DetailNormal, IN.uv_DetailNormal)); } - ENDCG - } - FallBack "Diffuse" + ENDCG + } + FallBack "Diffuse" } diff --git a/Assets/Shaders/Render Texture UI ZTest Always.shader b/Assets/Shaders/Render Texture UI ZTest Always.shader new file mode 100644 index 0000000..75ab894 --- /dev/null +++ b/Assets/Shaders/Render Texture UI ZTest Always.shader @@ -0,0 +1,61 @@ +Shader "Carmen/Render Texture UI/Always On Top" +{ + Properties + { + _MainTex ("Logo Image", 2D) = "white" {} + _Color ("Colour", Color) = (1.0, 1.0, 1.0, 1.0) + } + SubShader + { + Tags { "Queue"="Overlay" "RenderType"="Transparent" "CanUseSpriteAtlas"="True" } + LOD 200 + + Pass { + Cull Back + Lighting Off + Blend SrcAlpha OneMinusSrcAlpha + ZWrite Off + ZTest Always + + CGPROGRAM + #include "UnityCG.cginc" + #pragma target 4.5 + #pragma vertex vert + #pragma fragment frag + + UNITY_DECLARE_TEX2D(_MainTex); + float4 _MainTex_ST; + half4 _Color; + + + struct Data + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct V2F + { + float4 position : SV_POSITION; + float2 uv : TEXCOORD0; + }; + + + V2F vert(Data v) + { + V2F o; + o.position = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag(V2F i) : SV_TARGET + { + return UNITY_SAMPLE_TEX2D(_MainTex, i.uv) * _Color; + } + ENDCG + } + } + FallBack "Diffuse" +} + diff --git a/Assets/Shaders/Render Texture UI ZTest Always.shader.meta b/Assets/Shaders/Render Texture UI ZTest Always.shader.meta new file mode 100644 index 0000000..a4341d0 --- /dev/null +++ b/Assets/Shaders/Render Texture UI ZTest Always.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 213afe80d5f1c374ea290e02120114e4 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Shaders/Render Texture UI.shader b/Assets/Shaders/Render Texture UI.shader index c554368..23e7450 100644 --- a/Assets/Shaders/Render Texture UI.shader +++ b/Assets/Shaders/Render Texture UI.shader @@ -1,15 +1,4 @@ -// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' - -// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' - -// Unity built-in shader source. Copyright (c) 2016 Unity Technologies. MIT license (see license.txt) - -// Simplified Diffuse shader. Differences from regular Diffuse one: -// - no Main Color -// - fully supports only 1 directional light. Other lights can affect it, but it will be per-vertex/SH. - - -Shader "Carmen/Render Texture UI" +Shader "Carmen/Render Texture UI/Standard" { Properties { @@ -25,8 +14,6 @@ Shader "Carmen/Render Texture UI" Cull Back Lighting Off Blend SrcAlpha OneMinusSrcAlpha - ZWrite Off - ZTest Always CGPROGRAM #include "UnityCG.cginc" @@ -38,6 +25,7 @@ Shader "Carmen/Render Texture UI" float4 _MainTex_ST; half4 _Color; + struct Data { float4 vertex : POSITION; @@ -50,6 +38,7 @@ Shader "Carmen/Render Texture UI" float2 uv : TEXCOORD0; }; + V2F vert(Data v) { V2F o; diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: