From b28e5ee7d15fe7552faf738943ffc654cb90743d Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Fri, 5 Jun 2020 00:30:46 -0700 Subject: [PATCH] Rework back shader and textures, add flag --- Assets/Shaders/DecalBack.shader | 18 +++++++--- Assets/Textures/Decal-Back-spec.png | 4 +-- Assets/Textures/Decal-Back.afdesign | 4 +-- Assets/Textures/Decal-Back.png | 4 +-- Assets/Textures/Peel-N-Stik Flag.png | 4 +-- Assets/Textures/Peel-N-Stik Flag.svg | 34 ++++++++++-------- Assets/Textures/Peel-N-Stik Flag@2x.png | 4 +-- Assets/Textures/Peel-N-Stik Scaled.png | 3 ++ Assets/Textures/blank.png | 3 ++ .../Agencies/Peel-N-Stik-scaled.truecolor | Bin 0 -> 5479 bytes .../GameData/ConformalDecals/Assets/blank.dds | 3 ++ .../ConformalDecals/Assets/decal-blank.mu | 4 +-- .../ConformalDecals/Assets/decal-flag.mu | 3 ++ .../ConformalDecals/Flags/Peel-N-Stik.dds | 3 ++ .../ConformalDecals/Parts/decal-flag.cfg | 3 +- .../Plugins/ConformalDecals.dll | 4 +-- .../Resources/conformaldecals.shab | 4 +-- 17 files changed, 66 insertions(+), 36 deletions(-) create mode 100644 Assets/Textures/Peel-N-Stik Scaled.png create mode 100644 Assets/Textures/blank.png create mode 100644 Distribution/GameData/ConformalDecals/Agencies/Peel-N-Stik-scaled.truecolor create mode 100644 Distribution/GameData/ConformalDecals/Assets/blank.dds create mode 100644 Distribution/GameData/ConformalDecals/Assets/decal-flag.mu create mode 100644 Distribution/GameData/ConformalDecals/Flags/Peel-N-Stik.dds diff --git a/Assets/Shaders/DecalBack.shader b/Assets/Shaders/DecalBack.shader index 11a4358..3d5a11e 100644 --- a/Assets/Shaders/DecalBack.shader +++ b/Assets/Shaders/DecalBack.shader @@ -14,7 +14,7 @@ Shader "ConformalDecals/Decal Back" _Shininess ("Shininess", Range (0.03, 10)) = 0.4 [Header(Effects)] - [PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1 + [PerRendererData]_Opacity("_Opacity", Range(0,1) ) = 1 [PerRendererData]_RimFalloff("_RimFalloff", Range(0.01,5) ) = 0.1 [PerRendererData]_RimColor("_RimColor", Color) = (0,0,0,0) [PerRendererData]_UnderwaterFogFactor ("Underwater Fog Factor", Range(0,1)) = 0 @@ -29,7 +29,7 @@ Shader "ConformalDecals/Decal Back" CGPROGRAM #include "LightingKSP.cginc" - #pragma surface surf BlinnPhongSmooth + #pragma surface surf BlinnPhongSmooth vertex:vert #pragma target 3.0 sampler2D _MainTex; @@ -50,14 +50,24 @@ Shader "ConformalDecals/Decal Back" float3 viewDir; float3 worldPos; }; + + void vert (inout appdata_full v) { + } + void surf (Input IN, inout SurfaceOutput o) { - float2 uv_MainTex = IN.uv_MainTex; float2 uv_BumpMap = IN.uv_BumpMap; + float2 uv_MainTex = 0; + + // 45° rotation + uv_MainTex.x = IN.uv_MainTex.x - IN.uv_MainTex.y; + uv_MainTex.y = IN.uv_MainTex.x + IN.uv_MainTex.y; - fixed row = floor(uv_MainTex.y); + // stagger every other row + int row = floor(uv_MainTex.y); uv_MainTex.x += row * _RowOffset; + uv_MainTex.y *= 2; float4 color = _Color * tex2D(_MainTex,(uv_MainTex)); float3 normal = UnpackNormal(tex2D(_BumpMap, uv_BumpMap)); diff --git a/Assets/Textures/Decal-Back-spec.png b/Assets/Textures/Decal-Back-spec.png index 22617bc..e039494 100644 --- a/Assets/Textures/Decal-Back-spec.png +++ b/Assets/Textures/Decal-Back-spec.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aea74742516e62798b622d87bdd5dfcd1af25d077a97cd8d46cd35a1e891d1e -size 40829 +oid sha256:ea7a4b0ac2c4b66e45f5b7d568e58da43e8066a11fc7e903e1b7503979564bb0 +size 41004 diff --git a/Assets/Textures/Decal-Back.afdesign b/Assets/Textures/Decal-Back.afdesign index ced07e9..95a1fd7 100644 --- a/Assets/Textures/Decal-Back.afdesign +++ b/Assets/Textures/Decal-Back.afdesign @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45b1285dc9522a218a2d0630e41c363a3c43c5e95d358c0c24c6bd46a936769a -size 38088642 +oid sha256:27d651a8a11a621a3fe761e866e758e1f8d1fe4251d3d44c5866efcf1a71c4dd +size 38184729 diff --git a/Assets/Textures/Decal-Back.png b/Assets/Textures/Decal-Back.png index 7eefe9e..9ad495d 100644 --- a/Assets/Textures/Decal-Back.png +++ b/Assets/Textures/Decal-Back.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25b8f42986997c61830567df7194b1a8ef6c7b724c2b87a6fb6449b5151996e5 -size 32371 +oid sha256:5014ac81d2c45d8e408977346c5c1b66bef8ae5e28892b7d3daf8a4a58fb136f +size 31961 diff --git a/Assets/Textures/Peel-N-Stik Flag.png b/Assets/Textures/Peel-N-Stik Flag.png index d8d7e3b..2e7ad10 100644 --- a/Assets/Textures/Peel-N-Stik Flag.png +++ b/Assets/Textures/Peel-N-Stik Flag.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c79d8aaecd5d75eb401b53fa8ff754d96c07e90234764844fd12208a2f7215c -size 11360 +oid sha256:689dcbd55b8e3cf3c2bdf045e9198b208a8195ff01aabc1352f810335370286b +size 10669 diff --git a/Assets/Textures/Peel-N-Stik Flag.svg b/Assets/Textures/Peel-N-Stik Flag.svg index 5813f96..a35615c 100644 --- a/Assets/Textures/Peel-N-Stik Flag.svg +++ b/Assets/Textures/Peel-N-Stik Flag.svg @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Assets/Textures/Peel-N-Stik Flag@2x.png b/Assets/Textures/Peel-N-Stik Flag@2x.png index 1c2c020..5b02381 100644 --- a/Assets/Textures/Peel-N-Stik Flag@2x.png +++ b/Assets/Textures/Peel-N-Stik Flag@2x.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdeaac7bb69a7f433a1f4caf3f33c132c9b4aace52adfda0533f6ce5b85708e9 -size 19673 +oid sha256:6097c05cbd3b697991e72f192dc810b02b7cb37692cd0a3f9a44d9741f563a98 +size 18529 diff --git a/Assets/Textures/Peel-N-Stik Scaled.png b/Assets/Textures/Peel-N-Stik Scaled.png new file mode 100644 index 0000000..f98247f --- /dev/null +++ b/Assets/Textures/Peel-N-Stik Scaled.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cad20960869e2258415b915554d071fe1dbfca53de7517528173b1bc23ca64c +size 5479 diff --git a/Assets/Textures/blank.png b/Assets/Textures/blank.png new file mode 100644 index 0000000..6db2d29 --- /dev/null +++ b/Assets/Textures/blank.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c731db8d04a135a4cf60e265151e9dee7447564eca7691e7cf4e9d80c6b77092 +size 260 diff --git a/Distribution/GameData/ConformalDecals/Agencies/Peel-N-Stik-scaled.truecolor b/Distribution/GameData/ConformalDecals/Agencies/Peel-N-Stik-scaled.truecolor new file mode 100644 index 0000000000000000000000000000000000000000..4db7ff1d8367b2b57946068b281f69560924e0c2 GIT binary patch literal 5479 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 literal 0 HcmV?d00001 diff --git a/Distribution/GameData/ConformalDecals/Assets/blank.dds b/Distribution/GameData/ConformalDecals/Assets/blank.dds new file mode 100644 index 0000000..7fa5792 --- /dev/null +++ b/Distribution/GameData/ConformalDecals/Assets/blank.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10b941f7fc6fa98fd01341848bccfcfdfcab857fdd4a3217ea56120a73888b68 +size 176 diff --git a/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu b/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu index c1e7fff..9b4c06e 100644 --- a/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu +++ b/Distribution/GameData/ConformalDecals/Assets/decal-blank.mu @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff2aa629b4f34a2c1f7d7fb25a40c0e4fc16c749d9178378c999e4a01c458726 -size 4294 +oid sha256:dd0c27279354496f09915ae73655f877a2114014aa9641eda1f22eccfd618f4d +size 3346 diff --git a/Distribution/GameData/ConformalDecals/Assets/decal-flag.mu b/Distribution/GameData/ConformalDecals/Assets/decal-flag.mu new file mode 100644 index 0000000..198b21d --- /dev/null +++ b/Distribution/GameData/ConformalDecals/Assets/decal-flag.mu @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02ad4623c9953f167e09c1f4a4724d105d6e374c946487f704d20cce6b29bb33 +size 3205 diff --git a/Distribution/GameData/ConformalDecals/Flags/Peel-N-Stik.dds b/Distribution/GameData/ConformalDecals/Flags/Peel-N-Stik.dds new file mode 100644 index 0000000..8752261 --- /dev/null +++ b/Distribution/GameData/ConformalDecals/Flags/Peel-N-Stik.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cb2ec5d5310954272b37697ea6aa36eef7c1472cb02aae2f0e59b90275d9aaf +size 41088 diff --git a/Distribution/GameData/ConformalDecals/Parts/decal-flag.cfg b/Distribution/GameData/ConformalDecals/Parts/decal-flag.cfg index aff1d20..89d117c 100644 --- a/Distribution/GameData/ConformalDecals/Parts/decal-flag.cfg +++ b/Distribution/GameData/ConformalDecals/Parts/decal-flag.cfg @@ -7,8 +7,9 @@ PART author = Andrew Cassidy MODEL { - model = ConformalDecals/Assets/decal-blank + model = ConformalDecals/Assets/decal-flag scale = 1.0, 1.0, 1.0 + texture = blank, ConformalDecals/Flags/Peel-N-Stik } scale = 1 rescaleFactor = 1 diff --git a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll index f888974..c8b9335 100644 --- a/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll +++ b/Distribution/GameData/ConformalDecals/Plugins/ConformalDecals.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9084392fcd8e39a0546b5294d6ffe28119ad869c0421089ccd0ed5d634a034e3 -size 31232 +oid sha256:42f45fb15fed4898f02296262f32f1a1aaad38a8bee3ae538002b488a1420064 +size 34304 diff --git a/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab b/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab index da8cdcb..814e2ea 100644 --- a/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab +++ b/Distribution/GameData/ConformalDecals/Resources/conformaldecals.shab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e51f32dadab8cb24dbd6b1c43aefc6648dc7babf261f33c9ed41ee727cdeb97 -size 125863 +oid sha256:af0e53faac7d4aa6d62e88f5514c9d04fd0e21fcec6f32ad27b30a3ad5153914 +size 125182