From 4aa1d62480c9fc1c252cdc74c8de6deb6dddcedf Mon Sep 17 00:00:00 2001
From: micuat <micuat@gmail.com>
Date: Mon, 19 Oct 2020 17:03:34 +0200
Subject: [PATCH] color remapping

---
 zoneb/bin/data/gradient.png        | Bin 0 -> 5795 bytes
 zoneb/bin/data/shaders/render.frag |   4 +++-
 zoneb/src/ofApp.cpp                |   5 +++++
 zoneb/src/ofApp.h                  |   2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 zoneb/bin/data/gradient.png

diff --git a/zoneb/bin/data/gradient.png b/zoneb/bin/data/gradient.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4259007fbbe19e4046db519627a117bded37c16
GIT binary patch
literal 5795
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
Y$SE^Pz1tMKe*Ziq@aUnYzkhM=zcst`vH$=8

literal 0
HcmV?d00001

diff --git a/zoneb/bin/data/shaders/render.frag b/zoneb/bin/data/shaders/render.frag
index 4cd307c..9008a1f 100644
--- a/zoneb/bin/data/shaders/render.frag
+++ b/zoneb/bin/data/shaders/render.frag
@@ -6,6 +6,7 @@ precision mediump float;
 
 uniform sampler2D uColorTex; // Sampler for the color registered data
 uniform sampler2D u_v4l2cam;
+uniform sampler2D u_gradient;
 
 in vec2 gTexCoord;
 
@@ -18,7 +19,8 @@ void main()
     st += vec2(0.5);
     st.s += 0.15;
     st.t += 0.16;
-    gl_FragColor = texture2D(u_v4l2cam, st);
+    float thermo = texture2D(u_v4l2cam, st).r;
+    gl_FragColor = vec4(texture2D(u_gradient, vec2(thermo, 0.5)).rgb, 1);
     // gl_FragColor = texture2D(uColorTex, gTexCoord);
     // gl_FragColor = vec4(1);
 }
\ No newline at end of file
diff --git a/zoneb/src/ofApp.cpp b/zoneb/src/ofApp.cpp
index 2b5cd23..2833a29 100644
--- a/zoneb/src/ofApp.cpp
+++ b/zoneb/src/ofApp.cpp
@@ -68,6 +68,8 @@ void ofApp::setup()
   // we use a texture because the ofxV4L2 class has no draw method (yet)
   // we use GL_LUMINANCE because the ofxV4L2 class supports only grayscale (for now)
   v4l2Tex.allocate(camWidth, camHeight, GL_LUMINANCE);
+
+  gradient.load("gradient.png");
 }
 
 //--------------------------------------------------------------
@@ -121,6 +123,7 @@ void ofApp::draw()
       shader.setUniformTexture("uWorldTex", kinectDevice.getColorToWorldTex(), 2);
       shader.setUniformTexture("uColorTex", kinectDevice.getColorTex(), 3);
       shader.setUniformTexture("u_v4l2cam", v4l2Tex, 4);
+      shader.setUniformTexture("u_gradient", gradient, 5);
       shader.setUniform2i("uFrameSize", kinectDevice.getColorTex().getWidth(), kinectDevice.getColorTex().getHeight());
       shader.setUniform2i("uDepthFrameSize", kinectDevice.getDepthInColorTex().getWidth(), kinectDevice.getDepthInColorTex().getHeight());
 
@@ -132,6 +135,7 @@ void ofApp::draw()
       shader.setUniformTexture("uWorldTex", kinectDevice.getDepthToWorldTex(), 2);
       shader.setUniformTexture("uColorTex", kinectDevice.getColorInDepthTex(), 3);
       shader.setUniformTexture("u_v4l2cam", v4l2Tex, 4);
+      shader.setUniformTexture("u_gradient", gradient, 5);
       shader.setUniform2i("uFrameSize", kinectDevice.getDepthTex().getWidth(), kinectDevice.getDepthTex().getHeight());
       shader.setUniform2i("uDepthFrameSize", kinectDevice.getDepthTex().getWidth(), kinectDevice.getDepthTex().getHeight());
 
@@ -149,6 +153,7 @@ void ofApp::draw()
     boundShader.setUniformTexture("u_depth", tex);
     boundShader.setUniformTexture("u_ofcam", fbos.at("ofcam"));
     boundShader.setUniformTexture("u_v4l2cam", v4l2Tex);
+    boundShader.setUniformTexture("u_gradient", gradient);
     boundShader.setUniform1i("u_init", 1);
     boundShader.render();
     boundShader.setUniform1i("u_init", 0);
diff --git a/zoneb/src/ofApp.h b/zoneb/src/ofApp.h
index b4cd475..03b4596 100644
--- a/zoneb/src/ofApp.h
+++ b/zoneb/src/ofApp.h
@@ -43,4 +43,6 @@ private:
   bool useColorSpace;
   ofxV4L2 v4l2Cam;
   ofTexture v4l2Tex;
+
+  ofImage gradient;
 };