diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7fd867d --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +################################################################################ +# This .gitignore file was automatically created by Microsoft(R) Visual Studio. +################################################################################ + +/.vs +/_ReSharper.Caches/ReSharperPlatformVs16193_4011600b.00 diff --git a/GameData/TUFX/Plugins/TUFX.dll b/GameData/TUFX/Plugins/TUFX.dll index 54e43fc..1501452 100644 Binary files a/GameData/TUFX/Plugins/TUFX.dll and b/GameData/TUFX/Plugins/TUFX.dll differ diff --git a/GameData/TUFX/Plugins/TUFX.pdb b/GameData/TUFX/Plugins/TUFX.pdb index ee96e38..79d7c5c 100644 Binary files a/GameData/TUFX/Plugins/TUFX.pdb and b/GameData/TUFX/Plugins/TUFX.pdb differ diff --git a/Plugin/TUFX/GUI/ConfigurationGUI.cs b/Plugin/TUFX/GUI/ConfigurationGUI.cs index 480680e..4e978ed 100644 --- a/Plugin/TUFX/GUI/ConfigurationGUI.cs +++ b/Plugin/TUFX/GUI/ConfigurationGUI.cs @@ -400,7 +400,7 @@ private void renderColorGradingSettings() } else if (cg.gradingMode == GradingMode.LowDefinitionRange) { - AddTextureParameter("LDR LUT", cg.ldrLut, BuiltinEffect.ColorGrading.ToString(), "ldrLut"); + AddTextureParameter("LDR LUT", cg.ldrLut, BuiltinEffect.ColorGrading.ToString(), "LdrLut"); AddFloatParameter("LDR LUT Contrib.", cg.ldrLutContribution, 0, 1); } else if (cg.gradingMode == GradingMode.HighDefinitionRange) diff --git a/Plugin/TUFX/PostProcessing/Effects/ColorGrading.cs b/Plugin/TUFX/PostProcessing/Effects/ColorGrading.cs index 426e292..63ec252 100644 --- a/Plugin/TUFX/PostProcessing/Effects/ColorGrading.cs +++ b/Plugin/TUFX/PostProcessing/Effects/ColorGrading.cs @@ -397,8 +397,8 @@ public override void Load(ConfigNode config) loadFloatParameter(config, "ToneCurveShoulderLength", toneCurveShoulderLength); loadFloatParameter(config, "ToneCurveShoulderAngle", toneCurveShoulderAngle); loadFloatParameter(config, "ToneCurveGamma", toneCurveGamma); - loadTextureParameter(config, "LDRLut", ldrLut); - loadFloatParameter(config, "LDRLutContribution", ldrLutContribution); + loadTextureParameter(config, "LdrLut", ldrLut); + loadFloatParameter(config, "LdrLutContribution", ldrLutContribution); loadFloatParameter(config, "Temperature", temperature); loadFloatParameter(config, "Tint", tint); loadColorParameter(config, "ColorFilter", colorFilter); @@ -439,8 +439,8 @@ public override void Save(ConfigNode config) saveFloatParameter(config, "ToneCurveShoulderLength", toneCurveShoulderLength); saveFloatParameter(config, "ToneCurveShoulderAngle", toneCurveShoulderAngle); saveFloatParameter(config, "ToneCurveGamma", toneCurveGamma); - saveTextureParameter(config, "LDRLut", ldrLut); - saveFloatParameter(config, "LDRLutContribution", ldrLutContribution); + saveTextureParameter(config, "LdrLut", ldrLut); + saveFloatParameter(config, "LdrLutContribution", ldrLutContribution); saveFloatParameter(config, "Temperature", temperature); saveFloatParameter(config, "Tint", tint); saveColorParameter(config, "ColorFilter", colorFilter); diff --git a/Plugin/TUFX/PostProcessing/PostProcessEffectSettings.cs b/Plugin/TUFX/PostProcessing/PostProcessEffectSettings.cs index 6391dfc..858d36f 100644 --- a/Plugin/TUFX/PostProcessing/PostProcessEffectSettings.cs +++ b/Plugin/TUFX/PostProcessing/PostProcessEffectSettings.cs @@ -156,18 +156,12 @@ internal void loadTextureParameter(ConfigNode node, string name, ParameterOverri { return; } - string texName = node.GetValue(name); + string texName = node.GetStringValue(name); + Texture2D texture = null; - if (texName.StartsWith("BUILTIN:")) - { - texName = texName.Substring(8); - texture = TexturesUnlimitedFXLoader.INSTANCE.getTexture(texName); - } - else - { - texName = texName.Substring(7); - texture = GameDatabase.Instance.GetTexture(texName, false); - } + + texture = GameDatabase.Instance.GetTexture(texName, false); + if (texture != null) { param.Override(texture); diff --git a/Plugin/TUFX/TUFX.csproj b/Plugin/TUFX/TUFX.csproj index 0687f29..4b66d60 100644 --- a/Plugin/TUFX/TUFX.csproj +++ b/Plugin/TUFX/TUFX.csproj @@ -32,7 +32,7 @@ - libs\Assembly-CSharp.dll + G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\Assembly-CSharp.dll @@ -43,19 +43,19 @@ - libs\UnityEngine.AnimationModule.dll + G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.AnimationModule.dll - libs\UnityEngine.AssetBundleModule.dll + G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.AssetBundleModule.dll - libs\UnityEngine.CoreModule.dll + G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.CoreModule.dll - libs\UnityEngine.IMGUIModule.dll + G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.IMGUIModule.dll - libs\UnityEngine.PhysicsModule.dll + G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.PhysicsModule.dll