Convert from our home-grown matrices to Eigen all over.

[movit] / util.cpp

diff --git a/util.cpp b/util.cpp
index 2176786978544994fcb733a4a2bea5f6fb9f77f5..0d852e725ad65cb989ce4872d54635596d754c06 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -1,13 +1,10 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
+#include <string.h>
 #include <assert.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include <math.h>
 #include "util.h"
+#include "opengl.h"
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
@@ -50,6 +47,21 @@ void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
        *b += m;
 }
 
+void hsv2rgb_normalized(float h, float s, float v, float *r, float *g, float *b)
+{
+       float ref_r, ref_g, ref_b;
+       hsv2rgb(h, s, v, r, g, b);
+       hsv2rgb(h, 0.0f, v, &ref_r, &ref_g, &ref_b);
+       float lum = 0.2126 * *r + 0.7152 * *g + 0.0722 * *b;
+       float ref_lum = 0.2126 * ref_r + 0.7152 * ref_g + 0.0722 * ref_b;
+       if (lum > 1e-3) {
+               float fac = ref_lum / lum;
+               *r *= fac;
+               *g *= fac;
+               *b *= fac;
+       }
+}
+
 std::string read_file(const std::string &filename)
 {
        static char buf[131072];
@@ -65,11 +77,11 @@ std::string read_file(const std::string &filename)
        return std::string(buf, len);
 }
 
-GLhandleARB compile_shader(const std::string &shader_src, GLenum type)
+GLuint compile_shader(const std::string &shader_src, GLenum type)
 {
-       GLhandleARB obj = glCreateShaderObjectARB(type);
+       GLuint obj = glCreateShader(type);
        const GLchar* source[] = { shader_src.data() };
-       const GLint length[] = { shader_src.size() };
+       const GLint length[] = { (GLint)shader_src.size() };
        glShaderSource(obj, 1, source, length);
        glCompileShader(obj);
 
@@ -77,7 +89,9 @@ GLhandleARB compile_shader(const std::string &shader_src, GLenum type)
        GLsizei log_length = sizeof(info_log) - 1;
        glGetShaderInfoLog(obj, log_length, &log_length, info_log);
        info_log[log_length] = 0; 
-       printf("shader compile log: %s\n", info_log);
+       if (strlen(info_log) > 0) {
+               printf("shader compile log: %s\n", info_log);
+       }
 
        GLint status;
        glGetShaderiv(obj, GL_COMPILE_STATUS, &status);
@@ -88,45 +102,25 @@ GLhandleARB compile_shader(const std::string &shader_src, GLenum type)
        return obj;
 }
 
-void multiply_3x3_matrices(const Matrix3x3 a, const Matrix3x3 b, Matrix3x3 result)
+void print_3x3_matrix(const Eigen::Matrix3d& m)
 {
-        result[0] = a[0] * b[0] + a[3] * b[1] + a[6] * b[2];
-        result[1] = a[1] * b[0] + a[4] * b[1] + a[7] * b[2];
-        result[2] = a[2] * b[0] + a[5] * b[1] + a[8] * b[2];
-
-        result[3] = a[0] * b[3] + a[3] * b[4] + a[6] * b[5];
-        result[4] = a[1] * b[3] + a[4] * b[4] + a[7] * b[5];
-        result[5] = a[2] * b[3] + a[5] * b[4] + a[8] * b[5];
-
-        result[6] = a[0] * b[6] + a[3] * b[7] + a[6] * b[8];
-        result[7] = a[1] * b[6] + a[4] * b[7] + a[7] * b[8];
-        result[8] = a[2] * b[6] + a[5] * b[7] + a[8] * b[8];
-}
-
-void invert_3x3_matrix(const Matrix3x3 m, Matrix3x3 result)
-{
-       double inv_det = 1.0 / (
-               m[6] * m[1] * m[5] - m[6] * m[2] * m[4] -
-               m[3] * m[1] * m[8] + m[3] * m[2] * m[7] +
-               m[0] * m[4] * m[8] - m[0] * m[5] * m[7]);
-
-       result[0] = inv_det * (m[4] * m[8] - m[5] * m[7]);
-       result[1] = inv_det * (m[2] * m[7] - m[1] * m[8]);
-       result[2] = inv_det * (m[1] * m[5] - m[2] * m[4]);
-
-       result[3] = inv_det * (m[6] * m[5] - m[3] * m[8]);
-       result[4] = inv_det * (m[0] * m[8] - m[6] * m[2]);
-       result[5] = inv_det * (m[3] * m[2] - m[0] * m[5]);
-
-       result[6] = inv_det * (m[3] * m[7] - m[6] * m[4]);
-       result[7] = inv_det * (m[6] * m[1] - m[0] * m[7]);
-       result[8] = inv_det * (m[0] * m[4] - m[3] * m[1]);
+       printf("%6.4f %6.4f %6.4f\n", m(0,0), m(0,1), m(0,2));
+       printf("%6.4f %6.4f %6.4f\n", m(1,0), m(1,1), m(1,2));
+       printf("%6.4f %6.4f %6.4f\n", m(2,0), m(2,1), m(2,2));
+       printf("\n");
 }
 
-void print_3x3_matrix(const Matrix3x3 m)
+std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m)
 {
-       printf("%6.4f %6.4f %6.4f\n", m[0], m[3], m[6]);
-       printf("%6.4f %6.4f %6.4f\n", m[1], m[4], m[7]);
-       printf("%6.4f %6.4f %6.4f\n", m[2], m[5], m[8]);
-       printf("\n");
+       char buf[1024];
+       sprintf(buf,
+               "const mat3 %s = mat3(\n"
+               "    %.8f, %.8f, %.8f,\n"
+               "    %.8f, %.8f, %.8f,\n"
+               "    %.8f, %.8f, %.8f);\n\n",
+               name.c_str(),
+               m(0,0), m(1,0), m(2,0),
+               m(0,1), m(1,1), m(2,1),
+               m(0,2), m(1,2), m(2,2));
+       return buf;
 }