Let FlatInput take in float data (sort of kludgy, though). Also remove the get_*...

[movit] / main.cpp

diff --git a/main.cpp b/main.cpp
index bc52e1d25b6bb2befb605a2a9e61e6016ac0305c..625dba6097d724c5a7fa6a3e66b72a32b46d1a0d 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,14 +18,13 @@
 #include <SDL/SDL_opengl.h>
 #include <SDL/SDL_image.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include "effect.h"
 #include "effect_chain.h"
 #include "util.h"
+#include "opengl.h"
 #include "widgets.h"
 
+#include "flat_input.h"
 #include "lift_gamma_gain_effect.h"
 #include "saturation_effect.h"
 #include "diffusion_effect.h"
@@ -48,9 +47,9 @@ void update_hsv(Effect *lift_gamma_gain_effect, Effect *saturation_effect)
        RGBTriplet gamma(1.0f, 1.0f, 1.0f);
        RGBTriplet gain(1.0f, 1.0f, 1.0f);
 
-       hsv2rgb(lift_theta, lift_rad, lift_v, &lift.r, &lift.g, &lift.b);
-       hsv2rgb(gamma_theta, gamma_rad, gamma_v * 2.0f, &gamma.r, &gamma.g, &gamma.b);
-       hsv2rgb(gain_theta, gain_rad, gain_v * 4.0f, &gain.r, &gain.g, &gain.b);
+       hsv2rgb_normalized(lift_theta, lift_rad, lift_v, &lift.r, &lift.g, &lift.b);
+       hsv2rgb_normalized(gamma_theta, gamma_rad, gamma_v * 2.0f, &gamma.r, &gamma.g, &gamma.b);
+       hsv2rgb_normalized(gain_theta, gain_rad, gain_v * 4.0f, &gain.r, &gain.g, &gain.b);
 
        bool ok = lift_gamma_gain_effect->set_vec3("lift", (float *)&lift);
        ok = ok && lift_gamma_gain_effect->set_vec3("gamma", (float *)&gamma);
@@ -164,11 +163,11 @@ int main(int argc, char **argv)
        EffectChain chain(WIDTH, HEIGHT);
 
        ImageFormat inout_format;
-       inout_format.pixel_format = FORMAT_BGRA;
        inout_format.color_space = COLORSPACE_sRGB;
        inout_format.gamma_curve = GAMMA_sRGB;
 
-       Input *input = chain.add_input(inout_format);
+       FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA, GL_UNSIGNED_BYTE, img_w, img_h);
+       chain.add_input(input);
        Effect *lift_gamma_gain_effect = chain.add_effect(new LiftGammaGainEffect());
        Effect *saturation_effect = chain.add_effect(new SaturationEffect());
        Effect *diffusion_effect = chain.add_effect(new DiffusionEffect());