X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=1c47e11787a8c9781d662334430a2220aef47bf0;hp=8dcf219b3ee6be7cd8592f26268eefb33bae3fcb;hb=b2da076fe497ab3cbaa01c1e5230210e8a2cf228;hpb=ab636361e865c389fe60584562372ec39ac4c511

diff --git a/util.cpp b/util.cpp
index 8dcf219..1c47e11 100644
--- a/util.cpp
+++ b/util.cpp
@@ -46,6 +46,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];
@@ -99,6 +114,13 @@ void multiply_3x3_matrices(const Matrix3x3 a, const Matrix3x3 b, Matrix3x3 resul
         result[8] = a[2] * b[6] + a[5] * b[7] + a[8] * b[8];
 }
 
+void multiply_3x3_matrix_float3(const Matrix3x3 M, float x0, float x1, float x2, float *y0, float *y1, float *y2)
+{
+	*y0 = M[0] * x0 + M[3] * x1 + M[6] * x2;
+	*y1 = M[1] * x0 + M[4] * x1 + M[7] * x2;
+	*y2 = M[2] * x0 + M[5] * x1 + M[8] * x2;
+}
+
 void invert_3x3_matrix(const Matrix3x3 m, Matrix3x3 result)
 {
 	double inv_det = 1.0 / (