Support rendering to a given FBO instead of to the screen.

[movit] / util.h

diff --git a/util.h b/util.h
index a1e0e66e4c3269e8799f273203730cbcd7c64604..4834bbdf4a86f4dc6048183f6f74d8b1259e3f10 100644 (file)
--- a/util.h
+++ b/util.h
@@ -8,13 +8,17 @@
 
 #include <string>
 
-#include <GL/gl.h>
+#include "opengl.h"
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
 // Converts a HSV color to RGB. Assumes h in [0, 2pi> or [-pi, pi>
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b);
 
+// Converts a HSV color to RGB, but keeps luminance constant
+// (ie. color luminance is as if S=0).
+void hsv2rgb_normalized(float h, float s, float v, float *r, float *g, float *b);
+
 // Column major (same as OpenGL).
 typedef double Matrix3x3[9];
 
@@ -29,6 +33,9 @@ GLuint compile_shader(const std::string &shader_src, GLenum type);
 // Compute a * b.
 void multiply_3x3_matrices(const Matrix3x3 a, const Matrix3x3 b, Matrix3x3 result);
 
+// Compute M * [x0 x1 x2]'.
+void multiply_3x3_matrix_float3(const Matrix3x3 M, float x0, float x1, float x2, float *y0, float *y1, float *y2);
+
 // Compute m^-1. Result is undefined if the matrix is singular or near-singular.
 void invert_3x3_matrix(const Matrix3x3 m, Matrix3x3 result);