fixing texture loading

jrodrigv · Apr 27, 2020 · e0af96b · e0af96b
1 parent 9ae6685
commit e0af96b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 22 deletions.
diff --git a/.gitignore 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
diff --git a/GameData/TUFX/Plugins/TUFX.pdb b/GameData/TUFX/Plugins/TUFX.pdb
diff --git 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
@@ -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
@@ -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
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">
-      <HintPath>libs\Assembly-CSharp.dll</HintPath>
+      <HintPath>G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -43,19 +43,19 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>libs\UnityEngine.AnimationModule.dll</HintPath>
+      <HintPath>G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.AssetBundleModule">
-      <HintPath>libs\UnityEngine.AssetBundleModule.dll</HintPath>
+      <HintPath>G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.CoreModule">
-      <HintPath>libs\UnityEngine.CoreModule.dll</HintPath>
+      <HintPath>G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>libs\UnityEngine.IMGUIModule.dll</HintPath>
+      <HintPath>G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.PhysicsModule">
-      <HintPath>libs\UnityEngine.PhysicsModule.dll</HintPath>
+      <HintPath>G:\GAMES\KERBAL\Kerbal Space Program_191_RSS\KSP_x64_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>