Changes in uspace/lib/draw/source.c [f698054:b3222a3] in mainline

File:

• uspace/lib/draw/source.c (modified) (6 diffs)

uspace/lib/draw/source.c

@@ -45 +45 @@
         source->color = PIXEL(0, 0, 0, 0);
         source->texture = NULL;
-        source->texture_tile = false;
+        source->texture_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 
         source->alpha = PIXEL(255, 0, 0, 0);
         source->mask = NULL;
-        source->mask_tile = false;
+        source->mask_extend = PIXELMAP_EXTEND_TRANSPARENT_BLACK;
 }
 
@@ -73 +73 @@
 }
 
-void source_set_texture(source_t *source, surface_t *texture, bool tile)
+void source_set_texture(source_t *source, surface_t *texture,
+    pixelmap_extend_t extend)
 {
         source->texture = texture;
-        source->texture_tile = tile;
+        source->texture_extend = extend;
 }
 
@@ -84 +85 @@
 }
 
-void source_set_mask(source_t *source, surface_t *mask, bool tile)
+void source_set_mask(source_t *source, surface_t *mask,
+    pixelmap_extend_t extend)
 {
         source->mask = mask;
-        source->mask_tile = tile;
+        source->mask_extend = extend;
 }
 
 bool source_is_fast(source_t *source)
 {
-        return (source->mask == NULL)
-            && (source->alpha == (pixel_t) PIXEL(255, 0, 0, 0))
-            && (source->texture != NULL)
-            && (source->texture_tile == false)
-            && transform_is_fast(&source->transform);
+        return ((source->mask == NULL) &&
+            (source->alpha == (pixel_t) PIXEL(255, 0, 0, 0)) &&
+            (source->texture != NULL) &&
+            (transform_is_fast(&source->transform)));
 }
 
@@ -103 +104 @@
         assert(source_is_fast(source));
 
-        long _x = (long) (x + source->transform.m[0][2]);
-        long _y = (long) (y + source->transform.m[1][2]);
+        long _x = (long) (x + source->transform.matrix[0][2]);
+        long _y = (long) (y + source->transform.matrix[1][2]);
 
         return pixelmap_pixel_at(
@@ -120 +121 @@
                 mask_pix = source->filter(
                     surface_pixmap_access(source->mask),
-                    x, y, source->mask_tile);
+                    x, y, source->mask_extend);
         } else {
                 mask_pix = source->alpha;
@@ -133 +134 @@
                 texture_pix = source->filter(
                     surface_pixmap_access(source->texture),
-                    x, y, source->texture_tile);
+                    x, y, source->texture_extend);
         } else {
                 texture_pix = source->color;