From fd3b13a4cd8aadee796ad77afdd122583e82f99c Mon Sep 17 00:00:00 2001
From: OPENRNDR Actions <actions@openrndr.org>
Date: Wed, 3 Jun 2020 20:51:13 +0000
Subject: [PATCH 1/2] add demos to README.md

---
 orx-dnk3/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/orx-dnk3/README.md b/orx-dnk3/README.md
index e99f1c85..9b3dabfa 100644
--- a/orx-dnk3/README.md
+++ b/orx-dnk3/README.md
@@ -50,6 +50,11 @@ Supported Gltf features
 
 ![DemoScene02Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-dnk3/images/DemoScene02Kt.png)
 
+### DemoScene03
+[source code](src/demo/kotlin/DemoScene03.kt)
+
+![DemoScene03Kt](https://raw.githubusercontent.com/openrndr/orx/media/orx-dnk3/images/DemoScene03Kt.png)
+
 ### DemoSkinning01
 [source code](src/demo/kotlin/DemoSkinning01.kt)
 

From dd2bd348e345e70c4729a6e58235e225282fe9c8 Mon Sep 17 00:00:00 2001
From: Abe Pazos <abe@hamoid.com>
Date: Sat, 6 Jun 2020 09:12:20 +0200
Subject: [PATCH 2/2] Make ColorCorrection clamped by default, add Boolean
 setting (#121)

---
 orx-fx/src/main/kotlin/color/ColorCorrection.kt            | 5 +++++
 .../org/openrndr/extra/fx/gl3/color/color-correction.frag  | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/orx-fx/src/main/kotlin/color/ColorCorrection.kt b/orx-fx/src/main/kotlin/color/ColorCorrection.kt
index e15c6c21..e2eff8ab 100644
--- a/orx-fx/src/main/kotlin/color/ColorCorrection.kt
+++ b/orx-fx/src/main/kotlin/color/ColorCorrection.kt
@@ -2,6 +2,7 @@ package org.openrndr.extra.fx.color
 
 import org.openrndr.draw.*
 import org.openrndr.extra.fx.filterFragmentUrl
+import org.openrndr.extra.parameters.BooleanParameter
 import org.openrndr.extra.parameters.Description
 import org.openrndr.extra.parameters.DoubleParameter
 
@@ -25,6 +26,9 @@ class ColorCorrection : Filter(filterShaderFromUrl(filterFragmentUrl("color/colo
     @DoubleParameter("opacity", 0.0, 1.0, order = 5)
     var opacity: Double by parameters
 
+    @BooleanParameter("clamp", order = 6)
+    var clamped: Boolean by parameters
+
     init {
         contrast = 0.0
         brightness = 0.0
@@ -32,5 +36,6 @@ class ColorCorrection : Filter(filterShaderFromUrl(filterFragmentUrl("color/colo
         hueShift = 0.0
         gamma = 1.0
         opacity = 1.0
+        clamped = true
     }
 }
\ No newline at end of file
diff --git a/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/color/color-correction.frag b/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/color/color-correction.frag
index bbf51acf..32fd34ec 100644
--- a/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/color/color-correction.frag
+++ b/orx-fx/src/main/resources/org/openrndr/extra/fx/gl3/color/color-correction.frag
@@ -8,6 +8,7 @@ uniform float contrast;
 uniform float hueShift;
 uniform float gamma;
 uniform float opacity;
+uniform bool clamped;
 
 uniform sampler2D tex0;
 in vec2 v_texCoord0;
@@ -61,5 +62,9 @@ void main() {
     nc.rgb = pow(nc.rgb, vec3(gamma));
     nc.rgb = shiftHue(nc.rgb, (hueShift/360.0));
     vec4 cc = brightnessMatrix(brightness) * contrastMatrix((contrast + 1)) * saturationMatrix(saturation + 1) * nc;
-    o_color = vec4(cc.rgb, 1.0) * color.a * opacity;
+    if(clamped) {
+        o_color = clamp(vec4(cc.rgb, 1.0) * color.a * opacity, 0.0, 1.0);
+    } else {
+        o_color = vec4(cc.rgb, 1.0) * color.a * opacity;
+    }
 }
\ No newline at end of file