Merge pull request #93 from post-kerbin-mining-corporation/dev

Dev

GameData/Waterfall/Versioning/Waterfall.version

@@ -6,7 +6,7 @@
     {
         "MAJOR":0,
         "MINOR":7,
-        "PATCH":0,
+        "PATCH":1,
         "BUILD":0
     },
     "KSP_VERSION":

GameData/Waterfall/WaterfallSettings.cfg

@@ -1,7 +1,7 @@
 WATERFALL_SETTINGS
 {
   // show the ingame effect editor or not
-  ShowEffectEditor = true
+  ShowEffectEditor = false
 
   // Various debug levels
   // Emit module debug messages
@@ -29,5 +29,8 @@ WATERFALL_SETTINGS
   MinimumEffectIntensity = 0.005
   // Minimum light intensity before lights are culled
   MinimumLightIntensity = 0.05
+
+  // If this is false, all additive-type shader will be forced to true additive (one:one) blend mode
+  EnableLegacyBlendModes = false
 }
 

GameData/Waterfall/WaterfallTextures.cfg

@@ -127,7 +127,7 @@ WATERFALL_TEXTURE
 }
 WATERFALL_TEXTURE
 {
-  name = Flare Cross
+  name = Cross Flare
   path = Waterfall/FX/fx_flaresimple01
   description = fx_flaresimple01
 }
@@ -145,13 +145,13 @@ WATERFALL_TEXTURE
 }
 WATERFALL_TEXTURE
 {
-  name = Round Flare
-  path = Waterfall/FX/fx_flaresimple-2
-  description = fx_flaresimple-2
+  name = Round Flare 1
+  path = Waterfall/FX/fx_flaresimple02
+  description = fx_flaresimple02
 }
 WATERFALL_TEXTURE
 {
-  name = Round Flare
+  name = Round Flare 2
   path = Waterfall/FX/fx_flareglow-1
   description = fx_flareglow-1
 }

Source/ShaderLab/Additive Echo.shader

@@ -34,8 +34,6 @@
 
     _TileX("Tiling X", Float) = 1
     _TileY("Tiling Y", Float) = 1
-    _SrcMode("SrcMode", Float) = 1
-    _DestMode("DestMode", Float) = 6
 
     [Space]
 
@@ -50,7 +48,7 @@
     Tags { "Queue" = "Transparent" "IgnoreProjector" = "True"  }
 
 
-    Blend[_SrcMode][_DestMode]
+    Blend one one
 
     ZWrite Off
     ZTest LEqual

Source/Waterfall/EffectControllers/ThrustController.cs

@@ -64,7 +64,7 @@ public override List<float> Get()
       {
         // Thanks to NathanKell for the formula.
         currentThrustFraction = engineController.fuelFlowGui
-          / (engineController.maxFuelFlow * 1000f)
+          / engineController.maxFuelFlow
           / (float)engineController.ratioSum
           * engineController.mixtureDensity
           * engineController.multIsp;

Source/Waterfall/Effects/WaterfallEffect.cs

@@ -833,6 +833,10 @@ public void Update()
 
     public void SetHDR(bool isHDR)
     {
+      float destMode = 1f;
+      if (Settings.EnableLegacyBlendModes)
+        destMode = 6f;
+
       for (int i = 0; i < effectRendererMaterials.Count; i++)
       {
         if (effectRendererMaterials[i].HasProperty("_DestMode"))
@@ -843,7 +847,7 @@ public void SetHDR(bool isHDR)
           }
           else
           {
-            effectRendererMaterials[i].SetFloat("_DestMode", 6f);
+            effectRendererMaterials[i].SetFloat("_DestMode", destMode);
             effectRendererMaterials[i].SetFloat("_ClipBrightness", 1f);
           }
       }

Source/Waterfall/Settings.cs

@@ -44,6 +44,7 @@ public static class Settings
     public static float MinimumLightIntensity = 0.05f;
     public static bool EnableLights = true;
     public static bool EnableDistortion = true;
+    public static bool EnableLegacyBlendModes = true;
 
     /// <summary>
     /// Load data from configuration
@@ -70,6 +71,7 @@ public static void Load()
         settingsNode.TryGetValue("MinimumLightIntensity", ref MinimumLightIntensity);
         settingsNode.TryGetValue("EnableLights", ref EnableLights);
         settingsNode.TryGetValue("EnableDistortion", ref EnableDistortion);
+        settingsNode.TryGetValue("EnableLegacyBlendModes", ref EnableLegacyBlendModes);
       }
       else
       {

Source/Waterfall/UI/UIColorPickerWindow.cs

@@ -70,7 +70,7 @@ public UIColorPickerWindow(Color colorToEdit, bool show) : base(show)
       rainbow = MaterialUtils.GenerateRainbowGradient(120, 20);
       aTexture = MaterialUtils.GenerateGradientTexture(100, 20, Color.black, Color.white);
       colorField = MaterialUtils.GenerateColorField(colorFieldSize, colorFieldSize, currentHSVColor.ToColor());
-      if (!showWindow)
+
         WindowPosition = new Rect(Screen.width / 2 - 100, Screen.height / 2f, 210, 100);
     }
 
@@ -109,7 +109,10 @@ public void ChangeColor(Color colorToEdit)
       rainbow = MaterialUtils.GenerateRainbowGradient(120, 20);
       aTexture = MaterialUtils.GenerateGradientTexture(100, 20, Color.black, Color.white);
       colorField = MaterialUtils.GenerateColorField(colorFieldSize, colorFieldSize, currentHSVColor.ToColor());
-      showWindow = true;
+
+      if (!showWindow)
+        WindowPosition = new Rect(Screen.width / 2 - 100, Screen.height / 2f, 210, 100);
+
       GUI.BringWindowToFront(windowID);
     }
 

changelog.txt

@@ -1,3 +1,10 @@
+v0.7.1
+------
+- Changed the default blend mode of all additive-type effects to One One, this is controlled by a new Settings item called EnableLegacyBlendModes
+- Fixed the Thrust controller which was not working right (al2me6)
+- Fixed material picker texture name throwing an error (al2me6)
+- Fixed color editor window being too wide
+
 v0.7.0
 ------
 - New shaders: Waterfall/Additive (Volumetric), Waterfall/Additive Cones (Volumetric),  Waterfall/Additive Echo (Dynamic) by KnightOfStJohn 

readme.txt

@@ -1,5 +1,5 @@
 ===============
-Waterfall 0.7.0
+Waterfall 0.7.1
 ===============
 
 Waterfall is a mod for Kerbal Space Program that provides a cool new way to create and drive engine effects for smooth rocket plumes. It has