Changeset 2275Tweet

Timestamp:

Apr 16, 2008, 12:09:30 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Add simple raster FS displacement study.

File:

• research/2008-displacement/main.c (modified) (4 diffs)

research/2008-displacement/main.c

@@ -562 +562 @@
     fprintf(stderr, "Usage: %s <mode> [ARGS...]\n", argv[0]);
     fprintf(stderr, "Allowed modes:\n");
-    fprintf(stderr, " -1 <src1> <src2>   raster FS displacement study on blends of src1 and src2\n");
-    fprintf(stderr, " -2 <src>           quick (a,b,c,d) ED kernel analysis on src\n");
-    fprintf(stderr, " -3 <src>           exhaustive (a,b,c,d) ED kernel analysis on src\n");
+    fprintf(stderr, " -1 <src>           raster FS displacement study on src\n");
+    fprintf(stderr, " -2 <src1> <src2>   raster FS displacement study on blends of src1 and src2\n");
+    fprintf(stderr, " -3 <src>           quick (a,b,c,d) ED kernel analysis on src\n");
+    fprintf(stderr, " -4 <src>           exhaustive (a,b,c,d) ED kernel analysis on src\n");
 }
 
@@ -597 +598 @@
         case 1:
         {
+            float *dest = ed(src, false, 7, 0, 1, 3, 5, 0, 0, 0, 0, 0, 0, 0);
+            study(src, dest, 1.2, 0.001);
+            free(dest);
+            free(src);
+        }
+        break;
+
+        case 2:
+        {
             float *src2, *dest, *tmp;
 
@@ -618 +628 @@
         break;
 
-        case 2:
         case 3:
+        case 4:
         {
             float *dest, *tmp, *tmp2;
@@ -657 +667 @@
 
                 dest = ed(src, false, a2, 0, b2, c2, d2, e2, 0, 0, 0, 0, 0, 0);
-                if(mode == 2)
+                if(mode == 3)
                 {
                     tmp = gauss(src, mat0);