Changeset 3529

Timestamp:

05/27/09 07:04:30 (4 years ago)

Author:

sam

Message:

Fix img2twit's rendering. Apparently CGAL's Delaunay triangulation module
does not work with negative indices.

File:

• libpipi/trunk/examples/img2twit.cpp (modified) (4 diffs)

libpipi/trunk/examples/img2twit.cpp

@@ -649 +649 @@
         float fx, fy, fr, fg, fb, fs;
         get_point(i, &fx, &fy, &fr, &fg, &fb, &fs);
-        dt.insert(K::Point_2(fx, fy));
+        dt.insert(K::Point_2(fx + dw * RANGE_X, fy + dh * RANGE_Y));
         /* Keep link to point */
         lookup[(int)(fx * 2) + dw * RANGE_X * 2 * (int)(fy * 2)] = i;
@@ -655 +655 @@
 
     /* Add fake points to close the triangulation */
-    dt.insert(K::Point_2(-dw * RANGE_X, -dh * RANGE_Y));
-    dt.insert(K::Point_2(2 * dw * RANGE_X, -dh * RANGE_Y));
-    dt.insert(K::Point_2(-dw * RANGE_X, 2 * dh * RANGE_Y));
-    dt.insert(K::Point_2(2 * dw * RANGE_X, 2 * dh * RANGE_Y));
+    dt.insert(K::Point_2(0, 0));
+    dt.insert(K::Point_2(3 * dw * RANGE_X, 0));
+    dt.insert(K::Point_2(0, 3 * dh * RANGE_Y));
+    dt.insert(K::Point_2(3 * dw * RANGE_X, 3 * dh * RANGE_Y));
 
     for(y = ry; y < ry + rh; y++)
@@ -664 +664 @@
         for(x = rx; x < rx + rw; x++)
         {
-            K::Point_2 m((float)x * dw * RANGE_X / p->w,
-                         (float)y * dh * RANGE_Y / p->h);
+            K::Point_2 m((float)x * dw * RANGE_X / p->w + dw * RANGE_X,
+                         (float)y * dh * RANGE_Y / p->h + dh * RANGE_Y);
             Point_coordinate_vector coords;
             CGAL::Triple<
@@ -680 +680 @@
                 float fx, fy, fr, fg, fb, fs;
 
-                fx = (*it).first.x();
-                fy = (*it).first.y();
+                fx = (*it).first.x() - dw * RANGE_X;
+                fy = (*it).first.y() - dh * RANGE_Y;
 
                 if(fx < 0 || fy < 0