more tests that fail. woot.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/expedite@58999 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 74a897a..d849743 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -126,6 +126,8 @@ image_mask_10.c \
 image_mask_11.c \
 image_mask_12.c \
 image_mask_13.c \
+image_mask_14.c \
+image_mask_15.c \
 filter_object_colors.c \
 filter_object_colors_solid.c \
 filter_object_sepia.c \

diff --git a/src/bin/image_mask_14.c b/src/bin/image_mask_14.c
new file mode 100644 (file)
index 0000000..a2a5d83
--- /dev/null
+++ b/src/bin/image_mask_14.c
@@ -0,0 +1,118 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_mask_14
+#define NAME "Image Mask 14"
+#define ICON "blend.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+static Evas_Object *o_images[OBNUM];
+static Evas_Object *o_mask;
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   
+   o = evas_object_image_add(evas);
+   o_mask = o;
+   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   evas_object_image_fill_set(o, 0, 0, 720, 420);
+   evas_object_resize(o, 720, 420);
+   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+   evas_object_show(o);
+   
+   for (i = 0; i < OBNUM; i++)
+     {
+       o = evas_object_image_add(evas);
+       o_images[i] = o;
+       evas_object_image_file_set(o, build_path("logo.png"), NULL);
+       evas_object_image_fill_set(o, 0, 0, 120, 160);
+       evas_object_resize(o, 120, 160);
+        evas_object_image_smooth_scale_set(o, 1);
+       evas_object_clip_set(o, o_mask);
+       evas_object_show(o);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   evas_object_del(o_mask);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, w0, h0;
+   for (i = 0; i < OBNUM; i++)
+     {
+        w0 = 80;
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        evas_object_move(o_images[i], x, y);
+        evas_object_resize(o_images[i], w, h);
+        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON

diff --git a/src/bin/image_mask_15.c b/src/bin/image_mask_15.c
new file mode 100644 (file)
index 0000000..f6a1abe
--- /dev/null
+++ b/src/bin/image_mask_15.c
@@ -0,0 +1,118 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_mask_15
+#define NAME "Image Mask 15"
+#define ICON "blend.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+static Evas_Object *o_images[OBNUM];
+static Evas_Object *o_mask;
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   
+   o = evas_object_image_add(evas);
+   o_mask = o;
+   evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
+   evas_object_image_fill_set(o, 0, 0, 720, 420);
+   evas_object_resize(o, 720, 420);
+   evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
+   evas_object_show(o);
+   
+   for (i = 0; i < OBNUM; i++)
+     {
+       o = evas_object_image_add(evas);
+       o_images[i] = o;
+       evas_object_image_file_set(o, build_path("logo.png"), NULL);
+       evas_object_image_fill_set(o, 0, 0, 120, 160);
+       evas_object_resize(o, 120, 160);
+        evas_object_image_smooth_scale_set(o, 0);
+       evas_object_clip_set(o, o_mask);
+       evas_object_show(o);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   evas_object_del(o_mask);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, w0, h0;
+   for (i = 0; i < OBNUM; i++)
+     {
+        w0 = 80;
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        evas_object_move(o_images[i], x, y);
+        evas_object_resize(o_images[i], w, h);
+        evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON

diff --git a/src/bin/tests.h b/src/bin/tests.h
index 10e116e..c500640 100644 (file)
--- a/src/bin/tests.h
+++ b/src/bin/tests.h
@@ -102,6 +102,8 @@
 #include "image_mask_11.c"
 #include "image_mask_12.c"
 #include "image_mask_13.c"
+#include "image_mask_14.c"
+#include "image_mask_15.c"
 #include "filter_object_colors.c"
 #include "filter_object_colors_solid.c"
 #include "filter_object_invert.c"

diff --git a/src/bin/ui.c b/src/bin/ui.c
index 0c4b2f9..91904ca 100644 (file)
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -172,22 +172,25 @@ static double weights[] =
      20.000, // MASK 8
      20.000, // MASK 9
    
-     20.000, // test 101 MASK 10
+     20.000, // test 101
      20.000, // MASK 11
      20.000, // MASK 12
      20.000, // MASK 13
-     1.000,
+     20.000, // MASK 14
    
-     2.000, // test 106
-     1.000,
-     2.000, 
+     20.000, // test 106 MASK 15
      1.000,
      2.000,
+     1.000,
+     2.000, 
    
      1.000, // test 111
      2.000,
+     1.000, 
+     2.000,
      10.000, 
-     10.000,
+   
+     10.000, // test 116
    
      0.0, // Exit