X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=0d852e725ad65cb989ce4872d54635596d754c06;hp=c18f00949d1e2d1bca75bd3945ac2fcbc82e6811;hb=771acfe782f3052bb7326ee7f066ed78657754b4;hpb=a592c55caca0fb654bad4ec43b84c46abcee21c2 diff --git a/util.cpp b/util.cpp index c18f009..0d852e7 100644 --- a/util.cpp +++ b/util.cpp @@ -1,13 +1,10 @@ -#define GL_GLEXT_PROTOTYPES 1 - #include +#include #include -#include -#include - #include #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,3 +102,25 @@ GLhandleARB compile_shader(const std::string &shader_src, GLenum type) return obj; } +void print_3x3_matrix(const Eigen::Matrix3d& m) +{ + 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"); +} + +std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m) +{ + 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; +}