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

Dev

GameData/Waterfall/Versioning/Waterfall.version

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

GameData/Waterfall/WaterfallModels.cfg

@@ -56,3 +56,32 @@ WATERFALL_MODEL
   path = Waterfall/FX/fx-sharp-plane
   description = Simple plane with sharp edges
 }
+WATERFALL_MODEL
+{
+  name = Volumetric Cones
+  workflow = Volumetric
+  path = Waterfall/FX/fx-volumetric-cones
+  description = Volumetric shock cones
+}
+WATERFALL_MODEL
+{
+  name = Volumetric
+  workflow = Volumetric
+  path = Waterfall/FX/fx-volumetric-simple
+  description = Volumetric simple plume
+}
+WATERFALL_MODEL
+{
+  name = Particles
+  workflow = Particles
+  path = Waterfall/FX/fx-stack
+  description = Fixed set of 20 particles
+}
+
+WATERFALL_MODEL
+{
+  name = Particles 2
+  workflow = Particles
+  path = Waterfall/FX/fx-stack-2
+  description = Fixed set of 40 particles
+}

GameData/Waterfall/WaterfallShaders.cfg

@@ -50,6 +50,30 @@ WATERFALL_SHADER
   workflow = Billboards
   description = Additive billboard shader.
 }
+WATERFALL_SHADER
+{
+  name = Waterfall/Additive Cones (Volumetric)
+  workflow = Volumetric
+  description = Additive volumetric shock cone deformation material
+}
+WATERFALL_SHADER
+{
+  name = Waterfall/Additive (Volumetric)
+  workflow = Volumetric
+  description = Additive volumetric deformation material
+}
+WATERFALL_SHADER
+{
+  name = Waterfall/Additive Echo (Dynamic)
+  workflow = Dynamic
+  description = Repeated additive shader-driven deformation material
+}
+WATERFALL_SHADER
+{
+  name = Waterfall/Procedural Particles (Additive)
+  workflow = Particles
+  description = Additive shader-driven animated noise mimicing particle behavior
+}
 
 // Editable shader params
 /// colors
@@ -93,6 +117,12 @@ WATERFALL_SHADER_PARAM
   range = 0,5
 }
 WATERFALL_SHADER_PARAM
+{
+  name = _TintFresnel
+  type = Float
+  range = 0,5
+}
+WATERFALL_SHADER_PARAM
 {
   name = _Falloff
   type = Float
@@ -123,12 +153,23 @@ WATERFALL_SHADER_PARAM
   range = 0,15
 }
 WATERFALL_SHADER_PARAM
+{
+  name = _NoiseFresnel
+  type = Float
+  range = 0,15
+}
+WATERFALL_SHADER_PARAM
 {
   name = _Brightness
   type = Float
   range = 0,10
 }
-
+WATERFALL_SHADER_PARAM
+{
+  name = _LengthBrightness
+  type = Float
+  range = 0,10
+}
 WATERFALL_SHADER_PARAM
 {
   name = _SpeedX
@@ -275,6 +316,132 @@ WATERFALL_SHADER_PARAM
   type = Float
   range = 0,5
 }
+WATERFALL_SHADER_PARAM
+{
+  name = _ConeLength
+  type = Float
+  range = 0,2
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Stretch
+  type = Float
+  range = -1,1
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _ExitLength
+  type = Float
+  range = 0,5
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _ExitStart
+  type = Float
+  range = 0,1
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _ConeExpansion
+  type = Float
+  range = 0,1
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _ConeFade
+  type = Float
+  range = 0,10
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _ConeFadeStart
+  type = Float
+  range = 0,1
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Smoothness
+  type = Float
+  range = 0,0.5
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Asymmetry
+  type = Float
+  range = -0.3,0.3
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Echos
+  type = Float
+  range = 1.0,12.0
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _EchoLength
+  type = Float
+  range = 0.0,20.0
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _EchoFalloff
+  type = Float
+  range = 0.0,1.0
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Dimming
+  type = Float
+  range = -1.0,1.0
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Scale
+  type = Float
+  range = 0,10
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Expand
+  type = Float
+  range = 0,5
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Resolution
+  type = Float
+  range = 1,5
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _DetailScale
+  type = Float
+  range = 1.5,2.5
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _DetailBrightness
+  type = Float
+  range = 0,1
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Turbulence
+  type = Float
+  range = 0,10
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Speed
+  type = Float
+  range = 0,100
+}
+WATERFALL_SHADER_PARAM
+{
+  name = _Exponent
+  type = Float
+  range = 0,2
+}
 
 /// vec4s
 /// --

GameData/Waterfall/WaterfallTextures.cfg

@@ -48,6 +48,84 @@ WATERFALL_TEXTURE
   description = fx-ion-noise
 }
 WATERFALL_TEXTURE
+{
+  name = Uniform Noise
+  path = Waterfall/FX/fx-katniss-noise-1
+  description = fx-katniss-noise-1
+}
+WATERFALL_TEXTURE
+{
+  name = Uniform Noise Blurred
+  path = Waterfall/FX/fx-katniss-noise-1-blurred
+  description = fx-katniss-noise-1-blurred
+}
+WATERFALL_TEXTURE
+{
+  name = Anisotropic Noise
+  path = Waterfall/FX/fx-katniss-noise-2
+  description = fx-katniss-noise-2
+}
+WATERFALL_TEXTURE
+{
+  name = Anisotropic Noise Extradense
+  path = Waterfall/FX/fx-katniss-noise-2-extradense
+  description = fx-katniss-noise-2-extradense
+}
+WATERFALL_TEXTURE
+{
+  name = Cloud Noise 100
+  path = Waterfall/FX/fx-katniss-noise-3
+  description = fx-katniss-noise-3
+}
+WATERFALL_TEXTURE
+{
+  name = Cloud Noise 100 Blurred
+  path = Waterfall/FX/fx-katniss-noise-3-blurred
+  description = fx-katniss-noise-3-blurred
+}
+WATERFALL_TEXTURE
+{
+  name = Cloud Noise 50
+  path = Waterfall/FX/fx-katniss-noise-4
+  description = fx-katniss-noise-4
+}
+WATERFALL_TEXTURE
+{
+  name = Cloud Noise 50 Blurred
+  path = Waterfall/FX/fx-katniss-noise-4-blurred
+  description = fx-katniss-noise-4-blurred
+}
+WATERFALL_TEXTURE
+{
+  name = Cloud Noise 25
+  path = Waterfall/FX/fx-katniss-noise-5
+  description = fx-katniss-noise-5
+}
+WATERFALL_TEXTURE
+{
+  name = Cloud Noise 25 Blurred
+  path = Waterfall/FX/fx-katniss-noise-5-blurred
+  description = fx-katniss-noise-5-blurred
+}
+WATERFALL_TEXTURE
+{
+  name = Gaussian Noise
+  path = Waterfall/FX/fx-katniss-noise-6
+  description = fx-katniss-noise-6
+}
+WATERFALL_TEXTURE
+{
+  name = Mixed Aniso Noise
+  path = Waterfall/FX/fx-katniss-noise-7
+  description = fx-katniss-noise-7
+}
+WATERFALL_TEXTURE
+{
+  name = Sloped Noise
+  path = Waterfall/FX/fx-katniss-noise-8
+  description = fx-katniss-noise-8
+}
+WATERFALL_TEXTURE
 {
   name = Flare Cross
   path = Waterfall/FX/fx_flaresimple01