Use STBI; Supports PNG, JPG, BMP, etc

Author: pisaiah

brush_fillcan.v

@@ -1,6 +1,5 @@
 module main
 
-import vpng
 import gg
 import iui as ui
 import gx
@@ -15,7 +14,7 @@ mut:
 	down_y int
 }
 
-fn (brush FillBrush) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
+fn (brush FillBrush) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
 	mut pixels := &KA(ptr)
 
 	down_color := get_pixel(x, y, mut pixels.file)
@@ -24,7 +23,7 @@ fn (brush FillBrush) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorA
 }
 
 // TODO: Optimize, improve.
-fn check_pix(x int, y int, mut storage KA, down_color vpng.Pixel, color vpng.TrueColorAlpha) []int {
+fn check_pix(x int, y int, mut storage KA, down_color gx.Color, color gx.Color) []int {
 	mut arr := []int{}
 	if x < 0 || y < 0 {
 		return arr
@@ -60,17 +59,17 @@ fn check_pix(x int, y int, mut storage KA, down_color vpng.Pixel, color vpng.Tru
 	return arr
 }
 
-fn do_y(x int, yy int, mut storage KA, down_color vpng.Pixel, color vpng.TrueColorAlpha) bool {
+fn do_y(x int, yy int, mut storage KA, down_color gx.Color, color gx.Color) bool {
 	main_ := get_pixel(x, yy, mut storage.file)
 
 	if main_ == down_color {
-		storage.file.set_pixel(x, yy, color)
+		set_pixel(storage.file, x, yy, color)
 
 		mut xx := x - 1
 		for xx > 0 {
 			mut color_ := get_pixel(xx, yy, mut storage.file)
 			if color_ == down_color {
-				storage.file.set_pixel(xx, yy, color)
+				set_pixel(storage.file, xx, yy, color)
 			} else {
 				break
 			}
@@ -81,7 +80,7 @@ fn do_y(x int, yy int, mut storage KA, down_color vpng.Pixel, color vpng.TrueCol
 		for xx < storage.width {
 			mut color_ := get_pixel(xx, yy, mut storage.file)
 			if color_ == down_color {
-				storage.file.set_pixel(xx, yy, color)
+				set_pixel(storage.file, xx, yy, color)
 			} else {
 				break
 			}

brushes.v

@@ -1,6 +1,5 @@
 module main
 
-import vpng
 import gg
 import iui as ui
 import gx
@@ -11,7 +10,7 @@ import rand
 //
 interface Brush {
 	name string
-	set_pixels(voidptr, int, int, vpng.TrueColorAlpha, int)
+	set_pixels(voidptr, int, int, gx.Color, int)
 	draw_hint(voidptr, int, int, int, int, gx.Color, int)
 mut:
 	down_x int
@@ -28,11 +27,11 @@ mut:
 	down_y int
 }
 
-fn (brush &CalligraphyBrushLeft) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
+fn (brush &CalligraphyBrushLeft) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
 	mut pixels := &KA(ptr)
 	for i in 0 .. size {
-		pixels.file.set_pixel(x + i, y - i, color)
-		pixels.file.set_pixel(x - i, y + i, color)
+		set_pixel(pixels.file, x + i, y - i, color)
+		set_pixel(pixels.file, x - i, y + i, color)
 	}
 }
 
@@ -57,11 +56,11 @@ mut:
 	down_y int
 }
 
-fn (brush &CalligraphyBrush) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
-	mut pixels := &KA(ptr)
+fn (brush &CalligraphyBrush) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
+	mut data := &KA(ptr)
 	for i in 0 .. size {
-		pixels.file.set_pixel(x - i, y - i, color)
-		pixels.file.set_pixel(x + i, y + i, color)
+		set_pixel(data.file, x - i, y - i, color)
+		set_pixel(data.file, x + i, y + i, color)
 	}
 }
 
@@ -86,19 +85,19 @@ mut:
 	down_y int
 }
 
-fn (brush PencilBrush) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
-	mut pixels := &KA(ptr)
+fn (brush PencilBrush) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
+	mut data := &KA(ptr)
 	wid := size / 2
 
 	for i in 0 .. size {
 		for j in 0 .. size {
 			xx := x + i - wid
 			yy := y + j - wid
-			if xx >= 0 && yy >= 0 && xx <= pixels.width {
+			if xx >= 0 && yy >= 0 && xx <= data.width {
 				if size < 4 || (!(j == size - 1 && i == size - 1) && !(j == size - 1 && i == 0)
 					&& !(j == 0 && i == 0) && !(j == 0 && i == size - 1)) {
-					if xx < pixels.width && yy < pixels.height {
-						pixels.file.set_pixel(xx, yy, color)
+					if xx < data.width && yy < data.height {
+						set_pixel(data.file, xx, yy, color)
 					}
 				}
 			}
@@ -131,7 +130,7 @@ mut:
 	down_y int
 }
 
-fn (brush SpraycanBrush) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
+fn (brush SpraycanBrush) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
 	mut pixels := &KA(ptr)
 	wid := size / 2
 
@@ -146,7 +145,7 @@ fn (brush SpraycanBrush) set_pixels(ptr voidptr, x int, y int, color vpng.TrueCo
 				if size < 4 || (!(j == size - 1 && i == size - 1) && !(j == size - 1 && i == 0)
 					&& !(j == 0 && i == 0) && !(j == 0 && i == size - 1)) {
 					if rand_int == 0 {
-						pixels.file.set_pixel(xx, yy, color)
+						set_pixel(pixels.file, xx, yy, color)
 					}
 				}
 			}
@@ -193,7 +192,7 @@ struct Box {
 	zoom f32
 }
 
-fn (brush &SelectionTool) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
+fn (brush &SelectionTool) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
 	mut storage := &KA(ptr)
 	if storage.brush.down_x == -1 {
 		storage.brush.down_x = x

drawer.v

@@ -1,6 +1,5 @@
 module main
 
-import vpng
 import gg
 import iui as ui
 import gx
@@ -26,7 +25,7 @@ fn mouse_down_loop(mut win ui.Window, mut this ui.Component) {
 		if win.mouse_y < (size.height - 25) && cy < this.height && cx < this.width
 			&& (cy * zoom) >= 0 && (cx * zoom) >= 0 {
 			gx_color := pixels.color
-			color := vpng.TrueColorAlpha{gx_color.r, gx_color.g, gx_color.b, gx_color.a}
+			color := gx.Color{gx_color.r, gx_color.g, gx_color.b, gx_color.a}
 			dsize := pixels.draw_size
 			pixels.brush.set_pixels(pixels, cx, cy, color, dsize)
 
@@ -105,7 +104,7 @@ fn draw_image(mut win ui.Window, com &ui.Component) {
 		this.width + 1, this.height + 1, gx.rgb(215, 215, 215))
 
 	// Draw box-shadow
-	draw_box_shadow(this, y_slide, x_slide, gg)
+	draw_box_shadow(this, y_slide, x_slide, gg, win.theme)
 
 	// Draw Image
 	gg.draw_image_with_config(config)
@@ -127,13 +126,19 @@ fn color_from_string(st string) gx.Color {
 //
 // Draw box shadow around image canvas
 //
-fn draw_box_shadow(this ui.Component, y_slide &ui.Slider, x_slide &ui.Slider, gg gg.Context) {
+fn draw_box_shadow(this ui.Component, y_slide &ui.Slider, x_slide &ui.Slider, gg gg.Context, theme ui.Theme) {
 	mut shadows := [gx.rgb(171, 183, 203), gx.rgb(176, 188, 207),
 		gx.rgb(182, 193, 212), gx.rgb(187, 198, 215), gx.rgb(193, 203, 220),
 		gx.rgb(198, 208, 225), gx.rgb(204, 213, 230), gx.rgb(209, 218, 234)]
 
+	tn := theme.name
+	if tn.contains('Dark') || tn.contains('Black') {
+		// TODO: Dark shadow
+		return
+	}
+
 	mut si := this.y + this.height + 2
-	mut sx := this.x + this.width + 1
+	mut sx := this.x + this.width + 2
 	for mut shadow in shadows {
 		gg.draw_line(this.x + 10 - int(x_slide.cur), si - int(y_slide.cur), this.width + this.x + 1 - int(x_slide.cur),
 			si - int(y_slide.cur), shadow)
@@ -156,8 +161,7 @@ fn make_gg_image(mut storage KA, mut win ui.Window, first bool) {
 		})
 		win.gg.set_bg_color(gx.rgb(210, 220, 240))
 	}
-	bytess := storage.file.get_unfiltered()
-	win.gg.update_pixel_data(storage.ggim, bytess.data)
+	win.gg.update_pixel_data(storage.ggim, storage.file.data)
 }
 
 // Create an new ui.Image
@@ -181,6 +185,10 @@ fn theme_click(mut win ui.Window, com ui.MenuItem) {
 		background := gx.rgb(25, 42, 77)
 		win.gg.set_bg_color(gx.rgb(25, 42, 77))
 		win.id_map['background'] = &background
+	} else if text.contains('Black') {
+		win.gg.set_bg_color(gx.rgb(0, 0, 0))
+		background := gx.rgb(0, 0, 0)
+		win.id_map['background'] = &background
 	} else {
 		win.gg.set_bg_color(gx.rgb(210, 220, 240))
 		background := gx.rgb(210, 220, 240)

image_file.v

@@ -0,0 +1,47 @@
+module main
+
+import stbi
+import gx
+
+pub fn read(path string) ?stbi.Image {
+	return stbi.load(path)
+}
+
+pub fn write(img stbi.Image, path string) {
+	stbi.stbi_write_png(path, img.width, img.height, 4, img.data, img.width * 4) or { panic(err) }
+}
+
+// Get RGB value from image loaded with STBI
+pub fn get_pixel(x int, y int, mut this stbi.Image) gx.Color {
+	image := this
+	unsafe {
+		data := &byte(image.data)
+		p := data + (4 * (y * image.width + x))
+		r := p[0]
+		g := p[1]
+		b := p[2]
+		a := p[3]
+		return gx.Color{r, g, b, a}
+	}
+}
+
+// Get RGB value from image loaded with STBI
+fn set_pixel(image stbi.Image, x int, y int, color gx.Color) bool {
+	if x < 0 || x >= image.width {
+		return false
+	}
+
+	if y < 0 || y >= image.height {
+		return false
+	}
+
+	unsafe {
+		data := &byte(image.data)
+		p := data + (4 * (y * image.width + x))
+		p[0] = color.r
+		p[1] = color.g
+		p[2] = color.b
+		p[3] = color.a
+		return true
+	}
+}

menus.v

@@ -69,8 +69,11 @@ fn make_draw_size_menu(mut win ui.Window) {
 }
 
 fn draw_size_item(ds int) &ui.MenuItem {
-	mut item := ui.menuitem(ds.str() + 'px')
-	item.set_click(draw_size_click)
+	item := ui.menu_item(
+		text: ds.str() + 'px'
+		click_event_fn: draw_size_click
+	)
+
 	return item
 }
 
@@ -81,19 +84,25 @@ fn draw_size_click(mut win ui.Window, com ui.MenuItem) {
 
 fn make_zoom_menu(mut win ui.Window) {
 	// Zoom menu
-	mut mz := ui.menuitem('Zoom')
-
-	mut zoomm := ui.menuitem('Decrease (-)')
-	zoomm.set_click(zoom_decrease_click)
-	mz.add_child(zoomm)
-
-	mut zoomp := ui.menuitem('Increase (+)')
-	zoomp.set_click(zoom_increase_click)
-	mz.add_child(zoomp)
-
-	mut zoom_full := ui.menuitem('Increase by 1000%')
-	zoom_full.set_click(zoom_increase_big_click)
-	mz.add_child(zoom_full)
+	zoomm := ui.menu_item(
+		text: 'Decrease (-)'
+		click_event_fn: zoom_decrease_click
+	)
+
+	zoomp := ui.menu_item(
+		text: 'Increase (+)'
+		click_event_fn: zoom_increase_click
+	)
+
+	zoom_full := ui.menu_item(
+		text: 'Increase by 1000%'
+		click_event_fn: zoom_increase_big_click
+	)
+
+	mz := ui.menu_item(
+		text: 'Zoom'
+		children: [zoomm, zoomp, zoom_full]
+	)
 
 	win.bar.add_child(mz)
 }

shapes.v

@@ -1,6 +1,5 @@
 module main
 
-import vpng
 import gg
 import iui as ui
 import gx
@@ -17,7 +16,7 @@ mut:
 	selected_area Box
 }
 
-fn (brush &RectShape) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
+fn (brush &RectShape) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
 	mut storage := &KA(ptr)
 	if storage.brush.down_x == -1 {
 		storage.brush.down_x = x
@@ -42,7 +41,7 @@ fn (brush &RectShape) draw_hint(ptr voidptr, tx int, ty int, cx int, cy int, col
 			if zoom == box.zoom && box.x != -1 {
 				win.gg.draw_rect_empty(box.x, box.y, box.w, box.h, gx.blue)
 
-				tcolor := vpng.TrueColorAlpha{color.r, color.g, color.b, color.a}
+				tcolor := gx.Color{color.r, color.g, color.b, color.a}
 
 				base_x := int(box.w / zoom)
 				base_y := int(box.h / zoom)
@@ -56,7 +55,7 @@ fn (brush &RectShape) draw_hint(ptr voidptr, tx int, ty int, cx int, cy int, col
 				for i in min_x .. max_x {
 					for j in min_y .. max_y {
 						if (i == min_x || i == max_x - 1) || j == min_y || j == max_y - 1 {
-							storage.file.set_pixel(box.x + i, box.y + j, tcolor)
+							set_pixel(storage.file, box.x + i, box.y + j, tcolor)
 						}
 					}
 				}
@@ -100,7 +99,7 @@ mut:
 	selected_area Box
 }
 
-fn (brush &SquareShape) set_pixels(ptr voidptr, x int, y int, color vpng.TrueColorAlpha, size int) {
+fn (brush &SquareShape) set_pixels(ptr voidptr, x int, y int, color gx.Color, size int) {
 	mut storage := &KA(ptr)
 	if storage.brush.down_x == -1 {
 		storage.brush.down_x = x
@@ -125,7 +124,7 @@ fn (brush &SquareShape) draw_hint(ptr voidptr, tx int, ty int, cx int, cy int, c
 			if zoom == box.zoom && box.x != -1 {
 				win.gg.draw_rect_empty(box.x, box.y, box.w, box.h, gx.blue)
 
-				tcolor := vpng.TrueColorAlpha{color.r, color.g, color.b, color.a}
+				tcolor := gx.Color{color.r, color.g, color.b, color.a}
 
 				base_x := int(box.w / zoom)
 				base_y := int(box.h / zoom)
@@ -139,7 +138,7 @@ fn (brush &SquareShape) draw_hint(ptr voidptr, tx int, ty int, cx int, cy int, c
 				for i in min_x .. max_x {
 					for j in min_y .. max_y {
 						if (i == min_x || i == max_x - 1) || j == min_y || j == max_y - 1 {
-							storage.file.set_pixel(box.x + i, box.y + j, tcolor)
+							set_pixel(storage.file, box.x + i, box.y + j, tcolor)
 						}
 					}
 				}