Changeset 86

Timestamp:

06/23/08 07:10:33 (2 years ago)

Author:

aqua

Message:

roll back to revision 79

Files:

• snippet/image_projection/projection.c (modified) (3 diffs)

snippet/image_projection/projection.c

@@ -201 +201 @@
         
         matrix* a_inv;
-
         matrix* projection;
         
-        a = matrix_new( 6, 6 );
-        b = matrix_new( 6, 1 );
+        a = matrix_new( 8, 8 );
+        b = matrix_new( 8, 1 );
 
         a->var[0][0] = x[0];
         a->var[0][1] = y[0];
         a->var[0][2] = 1.0;
+        a->var[0][6] = -1 * _x[0] * x[0];
+        a->var[0][7] = -1 * _x[0] * y[0];
         
         a->var[1][0] = x[1];
         a->var[1][1] = y[1];
         a->var[1][2] = 1.0;
+        a->var[1][6] = -1 * _x[1] * x[1];
+        a->var[1][7] = -1 * _x[1] * y[1];
         
         a->var[2][0] = x[2];
         a->var[2][1] = y[2];
         a->var[2][2] = 1.0;
-        
-        a->var[3][3] = x[0];
-        a->var[3][4] = y[0];
-        a->var[3][5] = 1.0;
-
-        a->var[4][3] = x[1];
-        a->var[4][4] = y[1];
+        a->var[2][6] = -1 * _x[2] * x[2];
+        a->var[2][7] = -1 * _x[2] * y[2];
+        
+        a->var[3][0] = x[3];
+        a->var[3][1] = y[3];
+        a->var[3][2] = 1.0;
+        a->var[3][6] = -1 * _x[3] * x[3];
+        a->var[3][7] = -1 * _x[3] * y[3];
+        
+        a->var[4][3] = x[0];
+        a->var[4][4] = y[0];
         a->var[4][5] = 1.0;
-
-        a->var[5][3] = x[2];
-        a->var[5][4] = y[2];
+        a->var[4][6] = -1 * x[0] * _y[0];
+        a->var[4][7] = -1 * y[0] * _y[0];
+
+        a->var[5][3] = x[1];
+        a->var[5][4] = y[1];
         a->var[5][5] = 1.0;
-
+        a->var[5][6] = -1 * x[1] * _y[1];
+        a->var[5][7] = -1 * y[1] * _y[1];
+
+        a->var[6][3] = x[2];
+        a->var[6][4] = y[2];
+        a->var[6][5] = 1.0;
+        a->var[6][6] = -1 * x[2] * _y[2];
+        a->var[6][7] = -1 * y[2] * _y[2];
+
+        a->var[7][3] = x[3];
+        a->var[7][4] = y[3];
+        a->var[7][5] = 1.0;
+        a->var[7][6] = -1 * x[3] * _y[3];
+        a->var[7][7] = -1 * y[3] * _y[3];
+        
         b->var[0][0] = _x[0];
         b->var[1][0] = _x[1];
         b->var[2][0] = _x[2];
-        b->var[3][0] = _y[0];
-        b->var[4][0] = _y[1];
-        b->var[5][0] = _y[2];
+        b->var[3][0] = _x[3];
+        b->var[4][0] = _y[0];
+        b->var[5][0] = _y[1];
+        b->var[6][0] = _y[2];
+        b->var[7][0] = _y[3];
 
         a_inv = matrix_inv(a);
-
         c = matrix_multiple( a_inv, b );
 
@@ -251 +275 @@
         projection->var[1][2] = c->var[5][0];
         
-        projection->var[2][0] = 0;
-        projection->var[2][1] = 0;
+        projection->var[2][0] = c->var[6][0];
+        projection->var[2][1] = c->var[7][0];
         projection->var[2][2] = 1.0;
 
@@ -356 +380 @@
 }
 
+