Skip to content

Commit 60217aa

Browse files
shadowmage45shadowmage45
committed
# Conflicts: # GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll # GameData/TexturesUnlimitedFX/Plugins/TexturesUnlimitedFX.dll
2 parents c9fb571 + 7206dda commit 60217aa

35 files changed

+2302
-554
lines changed

‎CustomShaders/Scatter/TU-ScatterExternal.shader

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
Shader "Custom/TU-ScatterExternal" {
1+
// Upgrade NOTE: upgraded instancing buffer 'Props' to new syntax.
2+
3+
Shader "Custom/TU-ScatterExternal" {
24
Properties {
35
_Color ("Color", Color) = (1,1,1,1)
46
_MainTex ("Albedo (RGB)", 2D) = "white" {}
@@ -30,9 +32,9 @@
3032
// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
3133
// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
3234
// #pragma instancing_options assumeuniformscaling
33-
UNITY_INSTANCING_CBUFFER_START(Props)
35+
UNITY_INSTANCING_BUFFER_START(Props)
3436
// put more per-instance properties here
35-
UNITY_INSTANCING_CBUFFER_END
37+
UNITY_INSTANCING_BUFFER_END(Props)
3638

3739
void surf (Input IN, inout SurfaceOutputStandard o) {
3840
// Albedo comes from a texture tinted by color

‎GameData/000_TexturesUnlimited/Shaders/TUShaders.cfg

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -64,80 +64,80 @@ KSP_SHADER_DATA
6464
}
6565

6666
//pbr ksp shaders -- use the 'special' icon shader to deal with that mess
67-
KSP_SHADER_DATA
68-
{
69-
name = KSP/Bumped Specular (Mapped)
70-
shader = KSP/Bumped Specular (Mapped)
71-
iconShader = TU/Icon/StockSpecular
72-
}
67+
// KSP_SHADER_DATA
68+
// {
69+
// name = KSP/Bumped Specular (Mapped)
70+
// shader = KSP/Bumped Specular (Mapped)
71+
// iconShader = TU/Icon/StockSpecular
72+
// }
7373

7474
//legacy ksp diffuse shaders -- use the legacy icon shader
75-
KSP_SHADER_DATA
76-
{
77-
name = KSP/Diffuse
78-
shader = KSP/Diffuse
79-
iconShader = TU/Icon/Legacy
80-
}
81-
KSP_SHADER_DATA
82-
{
83-
name = KSP/Specular
84-
shader = KSP/Specular
85-
iconShader = TU/Icon/Legacy
86-
}
75+
// KSP_SHADER_DATA
76+
// {
77+
// name = KSP/Diffuse
78+
// shader = KSP/Diffuse
79+
// iconShader = TU/Icon/Legacy
80+
// }
81+
// KSP_SHADER_DATA
82+
// {
83+
// name = KSP/Specular
84+
// shader = KSP/Specular
85+
// iconShader = TU/Icon/Legacy
86+
// }
8787
//legacy ksp bumped shaders
88-
KSP_SHADER_DATA
89-
{
90-
name = KSP/Bumped
91-
shader = KSP/Bumped
92-
iconShader = TU/Icon/Legacy
93-
}
94-
KSP_SHADER_DATA
95-
{
96-
name = KSP/Bumped Specular
97-
shader = KSP/Bumped Specular
98-
iconShader = TU/Icon/Legacy
99-
}
88+
// KSP_SHADER_DATA
89+
// {
90+
// name = KSP/Bumped
91+
// shader = KSP/Bumped
92+
// iconShader = TU/Icon/Legacy
93+
// }
94+
// KSP_SHADER_DATA
95+
// {
96+
// name = KSP/Bumped Specular
97+
// shader = KSP/Bumped Specular
98+
// iconShader = TU/Icon/Legacy
99+
// }
100100
//legacy ksp emissive shaders
101-
KSP_SHADER_DATA
102-
{
103-
name = KSP/Emissive/Diffuse
104-
shader = KSP/Emissive/Diffuse
105-
iconShader = TU/Icon/Legacy
106-
}
107-
KSP_SHADER_DATA
108-
{
109-
name = KSP/Emissive/Specular
110-
shader = KSP/Emissive/Specular
111-
iconShader = TU/Icon/Legacy
112-
}
113-
KSP_SHADER_DATA
114-
{
115-
name = KSP/Emissive/Bumped Specular
116-
shader = KSP/Emissive/Bumped Specular
117-
iconShader = TU/Icon/Legacy
118-
}
101+
// KSP_SHADER_DATA
102+
// {
103+
// name = KSP/Emissive/Diffuse
104+
// shader = KSP/Emissive/Diffuse
105+
// iconShader = TU/Icon/Legacy
106+
// }
107+
// KSP_SHADER_DATA
108+
// {
109+
// name = KSP/Emissive/Specular
110+
// shader = KSP/Emissive/Specular
111+
// iconShader = TU/Icon/Legacy
112+
// }
113+
// KSP_SHADER_DATA
114+
// {
115+
// name = KSP/Emissive/Bumped Specular
116+
// shader = KSP/Emissive/Bumped Specular
117+
// iconShader = TU/Icon/Legacy
118+
// }
119119
//legacy ksp random shaders
120-
KSP_SHADER_DATA
121-
{
122-
name = KSP/Alpha/Cutoff
123-
shader = KSP/Alpha/Cutoff
124-
iconShader = TU/Icon/Legacy
125-
}
126-
KSP_SHADER_DATA
127-
{
128-
name = KSP/Alpha/Translucent
129-
shader = KSP/Alpha/Translucent
130-
iconShader = TU/Icon/Legacy
131-
}
132-
KSP_SHADER_DATA
133-
{
134-
name = KSP/Alpha/Cutoff Bumped
135-
shader = KSP/Alpha/Cutoff Bumped
136-
iconShader = TU/Icon/Legacy
137-
}
138-
KSP_SHADER_DATA
139-
{
140-
name = KSP/Bumped Specular (Cutoff)
141-
shader = KSP/Bumped Specular (Cutoff)
142-
iconShader = TU/Icon/Legacy
143-
}
120+
// KSP_SHADER_DATA
121+
// {
122+
// name = KSP/Alpha/Cutoff
123+
// shader = KSP/Alpha/Cutoff
124+
// iconShader = TU/Icon/Legacy
125+
// }
126+
// KSP_SHADER_DATA
127+
// {
128+
// name = KSP/Alpha/Translucent
129+
// shader = KSP/Alpha/Translucent
130+
// iconShader = TU/Icon/Legacy
131+
// }
132+
// KSP_SHADER_DATA
133+
// {
134+
// name = KSP/Alpha/Cutoff Bumped
135+
// shader = KSP/Alpha/Cutoff Bumped
136+
// iconShader = TU/Icon/Legacy
137+
// }
138+
// KSP_SHADER_DATA
139+
// {
140+
// name = KSP/Bumped Specular (Cutoff)
141+
// shader = KSP/Bumped Specular (Cutoff)
142+
// iconShader = TU/Icon/Legacy
143+
// }

‎Plugin/BaseMapCreation/obj/Debug/BaseMapCreation.csproj.FileListAbsolute.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ C:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\UnityScript
1212
C:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.csprojResolveAssemblyReference.cache
1313
C:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.exe
1414
C:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.pdb
15-
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.exe.config
16-
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.exe
17-
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.pdb
18-
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.csproj.CoreCompileInputs.cache
19-
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.exe
20-
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.pdb
21-
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.csprojAssemblyReference.cache
2215
F:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.exe.config
2316
F:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.exe
2417
F:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.pdb
2518
F:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.csprojAssemblyReference.cache
2619
F:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.csproj.CoreCompileInputs.cache
2720
F:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.exe
2821
F:\git_source\git\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.pdb
22+
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.exe.config
23+
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.exe
24+
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\bin\Debug\BaseMapCreation.pdb
25+
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.csprojAssemblyReference.cache
26+
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.csproj.CoreCompileInputs.cache
27+
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.exe
28+
C:\git_source\TexturesUnlimited\Plugin\BaseMapCreation\obj\Debug\BaseMapCreation.pdb

‎Plugin/SSTUTools/KSPShaderTools/GUI/CraftRecolorGUI.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System;
33
using System.Collections.Generic;
44
using UnityEngine;
5+
using UnityEditor;
56

67
namespace KSPShaderTools
78
{
@@ -222,7 +223,7 @@ private void drawWindow(int id)
222223
scrollLock = true;
223224
InputLockManager.SetControlLock(ControlTypes.CAMERACONTROLS, "SSTURecolorGUILock2");
224225
}
225-
GUILayout.BeginVertical();
226+
UnityEngine.GUILayout.BeginVertical();
226227
drawSectionSelectionArea();
227228
drawSectionRecoloringArea();
228229
drawPresetColorArea();

‎Plugin/SSTUTools/KSPShaderTools/GUI/DebugGUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private void updateWindow(int id)
3636
{
3737
GUILayout.BeginVertical();
3838
if (addButtonRow("Dump ReflectionData")) { Utils.dumpReflectionData(); }
39-
39+
if (addButtonRow("Export UV and Model Data")) { TexturesUnlimitedLoader.dumpUVMaps(true); }
4040
GUILayout.EndVertical();
4141
}
4242

0 commit comments

Comments
 (0)