Skip to content

Commit 4abeefb

Browse files
shadowmage45shadowmage45
committed
* recompile and update for KSP 1.8
* update Unity editor and project to 2019.2.2f1; match KSP version * fix icon-shader clipping; incorrect default coords specified in the shader itself * add basic albedo color multiplication to the icon shaders, and update the default _Multiplier parameter to 2.25 * recompile icon shader bundle, include .manifest file for info on what it contains
1 parent 60217aa commit 4abeefb

24 files changed

+133
-85
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@ TexturesUnlimited/Library
5757
TexturesUnlimited/Shaders
5858
TexturesUnlimited/Assets/Shaders*
5959
TexturesUnlimited/Assets/Build
60+
TexturesUnlimited/.vs

‎CustomShaders/Effects.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CustomShaders/Surface/TU-Icon-Legacy.shader

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ Shader "TU/Icon/Legacy"
4848
_TemperatureColor("Temperature Color", Color) = (0,0,0,0)
4949
_BurnColor ("Burn Color", Color) = (1,1,1,1)
5050

51-
_MinX ("MinX", Range(0.000000,1.000000)) = 0.500000
52-
_MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000
53-
_MinY ("MinY", Range(0.000000,1.000000)) = 0.500000
54-
_MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000
55-
_Multiplier("Multiplier", Float) = 2
51+
_MinX ("MinX", Range(0.000000,1.000000)) = 0.000000
52+
_MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000
53+
_MinY ("MinY", Range(0.000000,1.000000)) = 0.000000
54+
_MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000
55+
_Multiplier("Multiplier", Float) = 2.25
5656
}
5757

5858
SubShader

‎CustomShaders/Surface/TU-Icon-Metallic.shader

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ Shader "TU/Icon/Metallic"
4949
_TemperatureColor("Temperature Color", Color) = (0,0,0,0)
5050
_BurnColor ("Burn Color", Color) = (1,1,1,1)
5151

52-
_MinX ("MinX", Range(0.000000,1.000000)) = 0.500000
53-
_MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000
54-
_MinY ("MinY", Range(0.000000,1.000000)) = 0.500000
55-
_MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000
56-
_Multiplier("Multiplier", Float) = 2
52+
_MinX ("MinX", Range(0.000000,1.000000)) = 0.000000
53+
_MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000
54+
_MinY ("MinY", Range(0.000000,1.000000)) = 0.000000
55+
_MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000
56+
_Multiplier("Multiplier", Float) = 2.25
5757
}
5858

5959
SubShader

‎CustomShaders/Surface/TU-Icon-Specular.shader

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ Shader "TU/Icon/Specular"
4646
_TemperatureColor("Temperature Color", Color) = (0,0,0,0)
4747
_BurnColor ("Burn Color", Color) = (1,1,1,1)
4848

49-
_MinX ("MinX", Range(0.000000,1.000000)) = 0.500000
50-
_MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000
51-
_MinY ("MinY", Range(0.000000,1.000000)) = 0.500000
52-
_MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000
53-
_Multiplier("Multiplier", Float) = 2
49+
_MinX ("MinX", Range(0.000000,1.000000)) = 0.000000
50+
_MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000
51+
_MinY ("MinY", Range(0.000000,1.000000)) = 0.000000
52+
_MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000
53+
_Multiplier("Multiplier", Float) = 2.25
5454
}
5555

5656
SubShader

‎CustomShaders/Surface/TU-Icon-StockSpecular.shader

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Shader "TU/Icon/StockSpecular"
2020
_TemperatureColor("Temperature Color", Color) = (0,0,0,0)
2121
_BurnColor ("Burn Color", Color) = (1,1,1,1)
2222

23-
_MinX ("MinX", Range(0.000000,1.000000)) = 0.500000
24-
_MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000
25-
_MinY ("MinY", Range(0.000000,1.000000)) = 0.500000
26-
_MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000
27-
_Multiplier("Multiplier", Float) = 2
23+
_MinX ("MinX", Range(0.000000,1.000000)) = 0.000000
24+
_MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000
25+
_MinY ("MinY", Range(0.000000,1.000000)) = 0.000000
26+
_MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000
27+
_Multiplier("Multiplier", Float) = 2.25
2828
}
2929

3030
SubShader

‎CustomShaders/Surface/TU-Include-Lighting.cginc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
#if TU_SUBSURF
2727
c.rgb += subsurf(_SubSurfScale, _SubSurfPower, _SubSurfDistort, _SubSurfAtten, s.Backlight.a, s.Albedo, s.Backlight.rgb, s.Normal, viewDir, gi.light.color, gi.light.dir);
2828
#endif
29+
#if TU_ICON
30+
//c.rgb *= _Multiplier.rrr;
31+
#endif
2932

3033
return c;
3134
}
@@ -75,6 +78,9 @@
7578
#if TU_SUBSURF
7679
c.rgb += subsurf(_SubSurfScale, _SubSurfPower, _SubSurfDistort, _SubSurfAtten, s.Backlight.a, s.Albedo, s.Backlight.rgb, s.Normal, viewDir, gi.light.color, gi.light.dir);
7780
#endif
81+
#if TU_ICON
82+
//c.rgb *= _Multiplier.rrr;
83+
#endif
7884

7985
return c;
8086
}
@@ -130,7 +136,10 @@
130136

131137
#if TU_SUBSURF
132138
c.rgb += subsurf(_SubSurfScale, _SubSurfPower, _SubSurfDistort, _SubSurfAtten, s.Backlight.a, s.Albedo, s.Backlight.rgb, s.Normal, viewDir, _LightColor0.rgb, lightDir);
133-
#endif
139+
#endif
140+
#if TU_ICON
141+
//c.rgb *= _Multiplier.rrr;
142+
#endif
134143

135144
return c;
136145
}

‎CustomShaders/Surface/TU-Include-Surfaces.cginc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100

101101
//apply the standard shader param multipliers to the sampled/computed values.
102102
o.Albedo *= _Color.rgb;
103+
#if TU_ICON
104+
o.Albedo *= _Multiplier.rrr;
105+
#endif
103106
fixed4 fog = UnderwaterFog(IN.worldPos, o.Albedo);
104107
o.Albedo = fog.rgb;
105108
o.Emission *= fog.a;
@@ -207,6 +210,9 @@
207210

208211
//apply the standard shader param multipliers to the sampled/computed values.
209212
o.Albedo *= _Color.rgb;
213+
#if TU_ICON
214+
o.Albedo *= _Multiplier.rrr;
215+
#endif
210216
fixed4 fog = UnderwaterFog(IN.worldPos, o.Albedo);
211217
o.Albedo = fog.rgb;
212218
o.Emission *= fog.a;

‎GameData/000_TexturesUnlimited/EVECompat.cfg

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll

2 KB
Binary file not shown.

0 commit comments

Comments
 (0)