Changeset e0545de in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2019-10-19T10:07:32Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d18f3b7

Parents:

dcc4cb31

Message:

Implement bitmaps in canvas GC, demo in gfxdemo

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (7 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -39 +39 @@
 #include <fibril.h>
 #include <guigfx/canvas.h>
+#include <gfx/bitmap.h>
 #include <gfx/color.h>
 #include <gfx/render.h>
 #include <io/console.h>
+#include <io/pixelmap.h>
 #include <stdlib.h>
 #include <str.h>
@@ -49 +51 @@
  *
  * @param gc Graphic context
+ * @param w Width
+ * @param h Height
  */
 static errno_t demo_rects(gfx_context_t *gc, int w, int h)
@@ -54 +58 @@
         gfx_color_t *color = NULL;
         gfx_rect_t rect;
-        int i;
-        errno_t rc;
-
-        while (true) {
+        int i, j;
+        errno_t rc;
+
+        for (j = 0; j < 10; j++) {
                 rc = gfx_color_new_rgb_i16(rand() % 0x10000, rand() % 0x10000,
                     rand() % 0x10000, &color);
@@ -82 +86 @@
                 fibril_usleep(500 * 1000);
         }
+
+        return EOK;
+}
+
+/** Run bitmap demo on a graphic context.
+ *
+ * @param gc Graphic context
+ * @param w Width
+ * @param h Height
+ */
+static errno_t demo_bitmap(gfx_context_t *gc, int w, int h)
+{
+        gfx_bitmap_t *bitmap;
+        gfx_bitmap_params_t params;
+        gfx_bitmap_alloc_t alloc;
+        int i, j;
+        gfx_coord2_t offs;
+        gfx_rect_t srect;
+        errno_t rc;
+        pixelmap_t pixelmap;
+
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p1.x = w;
+        params.rect.p1.y = h;
+
+        rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_bitmap_get_alloc(bitmap, &alloc);
+        if (rc != EOK)
+                return rc;
+
+        /* Fill bitmap with something. In absence of anything else, use pixelmap */
+        pixelmap.width = w;
+        pixelmap.height = h;
+        pixelmap.data = alloc.pixels;
+
+        for (i = 0; i < w; i++) {
+                for (j = 0; j < h; j++) {
+                        pixelmap_put_pixel(&pixelmap, i, j,
+                            PIXEL(255, (i % 30) < 3 ? 255 : 0,
+                            (j % 30) < 3 ? 255 : 0, i / 2));
+                }
+        }
+
+        for (j = 0; j < 10; j++) {
+                for (i = 0; i < 5; i++) {
+                        srect.p0.x = rand() % (w - 40);
+                        srect.p0.y = rand() % (h - 40);
+                        srect.p1.x = srect.p0.x + rand() % (w - srect.p0.x);
+                        srect.p1.y = srect.p0.y + rand() % (h - srect.p0.y);
+                        offs.x = rand() % (w - srect.p1.x);
+                        offs.y = rand() % (h - srect.p1.y);
+                        offs.x = 0;
+                        offs.y = 0;
+
+                        gfx_bitmap_render(bitmap, &srect, &offs);
+                        fibril_usleep(500 * 1000);
+                }
+        }
+
+        gfx_bitmap_destroy(bitmap);
+
+        return EOK;
+}
+
+/** Run demo loop on a graphic context.
+ *
+ * @param gc Graphic context
+ * @param w Width
+ * @param h Height
+ */
+static errno_t demo_loop(gfx_context_t *gc, int w, int h)
+{
+        errno_t rc;
+
+        while (true) {
+                rc = demo_rects(gc, w, h);
+                if (rc != EOK)
+                        return rc;
+
+                rc = demo_bitmap(gc, w, h);
+                if (rc != EOK)
+                        return rc;
+        }
 }
 
@@ -104 +195 @@
         gc = console_gc_get_ctx(cgc);
 
-        rc = demo_rects(gc, 80, 25);
+        rc = demo_loop(gc, 80, 25);
         if (rc != EOK)
                 return rc;
@@ -168 +259 @@
         gc = canvas_gc_get_ctx(cgc);
 
-        rc = demo_rects(gc, 400, 300);
+        rc = demo_loop(gc, 400, 300);
         if (rc != EOK)
                 return rc;
@@ -206 +297 @@
         }
 
-        rc = demo_rects(gc, 400, 300);
+        rc = demo_loop(gc, 400, 300);
         if (rc != EOK)
                 return rc;