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 0000000..4db7ff1 Binary files /dev/null and b/Distribution/GameData/ConformalDecals/Agencies/Peel-N-Stik-scaled.truecolor differ 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