Commit 2b3c8eb5 authored by Lky's avatar Lky

setup two channels, opB, speed and buttons

parent 89ae3b67
......@@ -24,6 +24,10 @@ in vec2 noiseTexCoord;
out vec4 outputColor;
// this is coming from our C++ code
uniform float mouseX;
uniform float mouseY;
/*
** Hue, saturation, luminance
*/
......@@ -259,9 +263,13 @@ void main()
vec3 color;
vec3 color_layer_1, color_layer_2;
vec3 background_color = vec3(0,0,0);
color_layer_1 = mix(channel_1.rgb, background_color, opBC_ch1);
color_layer_1 = ContrastSaturationBrightness(color_layer_1,1,1,1);
color_layer_2 = mix(channel_2.rgb, background_color, opBC_ch2);
color_layer_2 = ContrastSaturationBrightness(color_layer_2,1,1,1);
color_layer_1 = ContrastSaturationBrightness(channel_1.rgb,1,1,1);
color_layer_2 = ContrastSaturationBrightness(channel_2.rgb,1,1,1);
// // UNCOMMENT TO GET THE THREE PANELS + HAND
// if (texCoordVarying.y/panel_height < 0.3) {
......
This diff is collapsed.
......@@ -94,6 +94,7 @@ public:
ofxDatGuiFolder* geometry_ch1;
ofParameter<int> x_pos_ch1, y_pos_ch1, scale_ch1, rotation_ch1;
ofParameter<int> x_pos_ch2, y_pos_ch2, scale_ch2, rotation_ch2;
ofParameter<bool> doRandom_pos_ch1;
ofxDatGuiFolder* text_ch1;
......@@ -104,6 +105,7 @@ public:
// 3-Panels Masks
int panelWidth, panelHeight;
float speed_ch1, speed_ch2, speed_ch3;
int factor_speed_ch1, factor_speed_ch2, factor_speed_ch3;
float main_opacity;
float opBC_ch1, opBC_ch2, opBC_ch3, extension_3channel;
string blendName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment