Changeset 3530Tweet

Timestamp:

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

Author:

sam

Message:

Minor cleanup in img2twit.

File:

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

libpipi/trunk/examples/img2twit.cpp

@@ -493 +493 @@
         *r = int2midrange(pt % RANGE_B, RANGE_B); pt /= RANGE_B;
     }
-}
-
-static inline float clip(float x, int modulo)
-{
-    float mul = (float)modulo + 0.9999;
-    int round = (int)(x * mul);
-    return (float)round / (float)modulo;
 }
 
@@ -664 +657 @@
         for(x = rx; x < rx + rw; x++)
         {
-            K::Point_2 m((float)x * dw * RANGE_X / p->w + dw * RANGE_X,
-                         (float)y * dh * RANGE_Y / p->h + dh * RANGE_Y);
+            float myx = (float)x * dw * RANGE_X / p->w;
+            float myy = (float)y * dh * RANGE_Y / p->h;
+
+            K::Point_2 m(myx + dw * RANGE_X, myy + dh * RANGE_Y);
             Point_coordinate_vector coords;
             CGAL::Triple<
@@ -696 +691 @@
                 //float k = (*it).second * (0.60f + fs);
                 //float k = pow((*it).second, (1.0f + fs));
+
+                // Try to attenuate peak artifacts
+                //k /= (0.1 * (RANGE_X * RANGE_X + RANGE_Y * RANGE_Y)
+                //       + (myx - fx) * (myx - fx) + (myy - fy) * (myy - fy));
+
+                // Cute circles
+                //k = 1.0 / (0.015 * (RANGE_X * RANGE_X + RANGE_Y * RANGE_Y)
+                //       + (myx - fx) * (myx - fx) + (myy - fy) * (myy - fy));
 
                 r += k * fr;