X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=util.h;h=414c20890027f8762e4a64a4fa2acd3d7428def1;hb=2463f8abd9662e08438e23e5c0d0f958ea4fe54e;hp=a1e0e66e4c3269e8799f273203730cbcd7c64604;hpb=e8cff1305e9c4843c6424e3194f4276b031804fc;p=movit

diff --git a/util.h b/util.h
index a1e0e66..414c208 100644
--- a/util.h
+++ b/util.h
@@ -7,16 +7,18 @@
 #include <stdlib.h>
 
 #include <string>
+#include <Eigen/Core>
 
-#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);
 
-// Column major (same as OpenGL).
-typedef double Matrix3x3[9];
+// 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);
 
 // Read a file from disk and return its contents.
 // Dies if the file does not exist.
@@ -26,14 +28,15 @@ std::string read_file(const std::string &filename);
 // and return the object number.
 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);
+// Print a 3x3 matrix to standard output. Useful for debugging.
+void print_3x3_matrix(const Eigen::Matrix3d &m);
 
-// Compute m^-1. Result is undefined if the matrix is singular or near-singular.
-void invert_3x3_matrix(const Matrix3x3 m, Matrix3x3 result);
+// Output a GLSL 3x3 matrix declaration.
+std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m);
 
-// Print a 3x3 matrix to standard output. Useful for debugging.
-void print_3x3_matrix(const Matrix3x3 m);
+// Calculate where to sample, and with what weight, if one wants to use
+// the GPU's bilinear hardware to sample w1 * x[0] + w2 * x[1].
+void combine_two_samples(float w1, float w2, float *offset, float *total_weight);
 
 #ifdef NDEBUG
 #define check_error()