Skip to content

Commit

Permalink
fixes and cleanups; most of the conversions seemed to work just fine
Browse files Browse the repository at this point in the history
  • Loading branch information
@shadowmage45
shadowmage45 committed Nov 6, 2018
1 parent 2f81c1f commit 38b08fe
Show file tree
Hide file tree
Showing 20 changed files with 25 additions and 55 deletions.
19 changes: 0 additions & 19 deletions GameData/SSTU-PBR/PBRConversions/DefaultShaderAssignments-Misc.cfg
View file

This file was deleted.

0 ...PBR/PBRConversions/TextureSets-MFT-LV.cfg → ...PBRConversions/TextureSets-MFT-LV.cfg.dis
View file
File renamed without changes.
0 ...nversion/TextureSets-General-Fairings.cfg → ...sion/TextureSets-General-Fairings.cfg.dis
View file
File renamed without changes.
0 ...xtureSets-General-ProceduralDecoupler.cfg → ...eSets-General-ProceduralDecoupler.cfg.dis
View file
File renamed without changes.
0 ...RecoloringConversion/TextureSets-ISDC.cfg → ...loringConversion/TextureSets-ISDC.cfg.dis
View file
File renamed without changes.
0 ...coloringConversion/TextureSets-MFT-LV.cfg → ...ringConversion/TextureSets-MFT-LV.cfg.dis
View file
File renamed without changes.
0 ...ringConversion/TextureSets-MFT-Mounts.cfg → ...Conversion/TextureSets-MFT-Mounts.cfg.dis
View file
File renamed without changes.
0 ...ingConversion/TextureSets-MSRB-Bodies.cfg → ...onversion/TextureSets-MSRB-Bodies.cfg.dis
View file
File renamed without changes.
0 ...ngConversion/TextureSets-MSRB-Nozzles.cfg → ...nversion/TextureSets-MSRB-Nozzles.cfg.dis
View file
File renamed without changes.
0 .../RecoloringConversion/TextureSets-MUS.cfg → ...oloringConversion/TextureSets-MUS.cfg.dis
View file
File renamed without changes.
0 ...coloringConversion/TextureSets-ST-MST.cfg → ...ringConversion/TextureSets-ST-MST.cfg.dis
View file
File renamed without changes.
0 ...R/RecoloringConversion/TextureSets-ST.cfg → ...coloringConversion/TextureSets-ST.cfg.dis
View file
File renamed without changes.
4 changes: 0 additions & 4 deletions GameData/SSTU-PBR/Reflection-Enabler.cfg
View file

This file was deleted.

0 ...efaultShaderAssignments-Engines - PBR.cfg → ...efaultShaderAssignments-Engines - PBR.cfg
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions GameData/SSTU/Data/TextureSets/wip/TextureSets-Modular-SRB-Nozzles.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/SC-ENG-SRB-NOZZLES-DIFF
texture = _BumpMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-NRM
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-SPEC
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-AO
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-MET
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-MET
texture = _MaskTex, SSTU/Assets/SC-ENG-SRB-NOZZLES-MASK-A
keyword = TU_RECOLOR
vector = _DiffuseNorm,0.5,0.5,0.5
Expand All @@ -35,8 +35,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/SC-ENG-SRB-NOZZLES-DIFF
texture = _BumpMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-NRM
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-SPEC
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-AO
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-MET
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-MET
texture = _MaskTex, SSTU/Assets/SC-ENG-SRB-NOZZLES-MASK-B
keyword = TU_RECOLOR
vector = _DiffuseNorm,0.5,0.5,0.5
Expand All @@ -60,8 +60,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/SC-ENG-SRB-NOZZLES-DIFF
texture = _BumpMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-NRM
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-SPEC
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-AO
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-MET
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES-MET
texture = _MaskTex, SSTU/Assets/SC-ENG-SRB-NOZZLES-MASK-C
keyword = TU_RECOLOR
vector = _DiffuseNorm,0.5,0.5,0.5
Expand Down Expand Up @@ -89,8 +89,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/SC-ENG-SRB-NOZZLES2-DIFF
texture = _BumpMap, SSTU/Assets/SC-ENG-SRB-NOZZLES2-NRM
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES2-SPEC
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES2-AO
texture = _MetallicGlossMap, SSTU/Assets/SC-ENG-SRB-NOZZLES2-MET
texture = _AOMap, SSTU/Assets/SC-ENG-SRB-NOZZLES2-MET
texture = _MaskTex, SSTU/Assets/SC-ENG-SRB-NOZZLES2-MASK
keyword = TU_RECOLOR
vector = _DiffuseNorm,0.5,0.5,0.5
Expand Down
7 changes: 0 additions & 7 deletions GameData/SSTU/Data/TextureSets/wip/TextureSets-ShipCore-E-Enterprise.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,4 @@ KSP_TEXTURE_SET
{
name = SSTURecolorGUI
}
}
@KSP_TEXTURE_SET[SSTU-SC-E-A|SSTU-SC-E-B]:NEEDS[SSTU-PBR]:FOR[SSTU-PBR]
{
@MATERIAL,*
{
@shader = SSTU/PBR/Masked
}
}
2 changes: 1 addition & 1 deletion GameData/SSTU/Data/TextureSets/wip/TextureSets-StationCore-CFG.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
texture = _MainTex, SSTU/Assets/ST-CFG-DIFF
texture = _BumpMap, SSTU/Assets/ST-CFG-NRM
texture = _MetallicGlossMap, SSTU/Assets/ST-CFG-MET
texture = _AOMap, SSTU/Assets/ST-CFG-AO
texture = _AOMap, SSTU/Assets/ST-CFG-MET
texture = _MaskTex, SSTU/Assets/ST-CFG-MASK-A
keyword = TU_RECOLOR
vector = _DiffuseNorm,0.5,0.5,0.5
Expand Down
16 changes: 8 additions & 8 deletions GameData/SSTU/Data/TextureSets/wip/TextureSets-StationCore-COS.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ KSP_TEXTURE_SET
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-COS-DIFF-F
texture = _BumpMap, SSTU/Assets/ST-COS-NRM-F
texture = _SpecMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-MET
texture = _MaskTex, SSTU/Assets/ST-COS-MASK-A
excludeMesh = Decal-Bottom
keyword = TU_RECOLOR
Expand All @@ -34,8 +34,8 @@ KSP_TEXTURE_SET
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-COS-DIFF-X
texture = _BumpMap, SSTU/Assets/ST-COS-NRM-X
texture = _SpecMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-MET
texture = _MaskTex, SSTU/Assets/ST-COS-MASK-B
excludeMesh = Decal-Bottom
keyword = TU_RECOLOR
Expand All @@ -60,8 +60,8 @@ KSP_TEXTURE_SET
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-COS-DIFF-S
texture = _BumpMap, SSTU/Assets/ST-COS-NRM-S
texture = _SpecMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-MET
texture = _MaskTex, SSTU/Assets/ST-COS-MASK-C
excludeMesh = Decal-Bottom
keyword = TU_RECOLOR
Expand All @@ -86,8 +86,8 @@ KSP_TEXTURE_SET
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-COS-DIFF-P
texture = _BumpMap, SSTU/Assets/ST-COS-NRM-P
texture = _SpecMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-COS-MET
texture = _AOMap, SSTU/Assets/ST-COS-MET
texture = _MaskTex, SSTU/Assets/ST-COS-MASK-C
excludeMesh = Decal-Bottom
keyword = TU_RECOLOR
Expand Down
8 changes: 4 additions & 4 deletions GameData/SSTU/Data/TextureSets/wip/TextureSets-StationCore-DOS.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-DOS-DIFF-CLOTH
texture = _BumpMap, SSTU/Assets/ST-DOS-NRM-CLOTH
texture = _SpecMap, SSTU/Assets/ST-DOS-MET
texture = _AOMap, SSTU/Assets/ST-DOS-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-DOS-MET
texture = _AOMap, SSTU/Assets/ST-DOS-MET
texture = _MaskTex, SSTU/Assets/ST-DOS-MASK-A
mesh = ST-DOS-COM
mesh = ST-DOS-HAB
Expand Down Expand Up @@ -41,8 +41,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-DOS-DIFF-PLAIN
texture = _BumpMap, SSTU/Assets/ST-DOS-NRM-PLAIN
texture = _SpecMap, SSTU/Assets/ST-DOS-MET
texture = _AOMap, SSTU/Assets/ST-DOS-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-DOS-MET
texture = _AOMap, SSTU/Assets/ST-DOS-MET
texture = _MaskTex, SSTU/Assets/ST-DOS-MASK-A
mesh = ST-DOS-COM
mesh = ST-DOS-HAB
Expand Down
8 changes: 4 additions & 4 deletions GameData/SSTU/Data/TextureSets/wip/TextureSets-StationCore-HAB.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-HAB-DIFF
texture = _BumpMap, SSTU/Assets/ST-HAB-NRM
texture = _SpecMap, SSTU/Assets/ST-HAB-MET
texture = _AOMap, SSTU/Assets/ST-HAB-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-HAB-MET
texture = _AOMap, SSTU/Assets/ST-HAB-MET
texture = _MaskTex, SSTU/Assets/ST-HAB-MASK-A
mesh = ST-HAB-INF-S
mesh = ST-HAB-INF-M
Expand Down Expand Up @@ -45,8 +45,8 @@
shader = TU/Metallic
texture = _MainTex, SSTU/Assets/ST-HAB-DIFF
texture = _BumpMap, SSTU/Assets/ST-HAB-NRM
texture = _SpecMap, SSTU/Assets/ST-HAB-MET
texture = _AOMap, SSTU/Assets/ST-HAB-AO
texture = _MetallicGlossMap, SSTU/Assets/ST-HAB-MET
texture = _AOMap, SSTU/Assets/ST-HAB-MET
texture = _MaskTex, SSTU/Assets/ST-HAB-MASK-B
mesh = ST-HAB-INF-S
mesh = ST-HAB-INF-M
Expand Down

0 comments on commit 38b08fe

Please sign in to comment.