Add New GPU Texture Backend for advanced Usages (see paint example !)

ClickableWidgets.go

@@ -284,16 +284,18 @@ var _ Widget = &ImageButtonWithRgbaWidget{}
 // more useful than the original ImageButtonWidget.
 type ImageButtonWithRgbaWidget struct {
 	*ImageButtonWidget
-	rgba image.Image
-	id   ID
+	id  ID
+	rbt *ReflectiveBoundTexture
 }
 
 // ImageButtonWithRgba creates a new widget.
-func ImageButtonWithRgba(rgba image.Image) *ImageButtonWithRgbaWidget {
+func ImageButtonWithRgba(rgba image.Image, rbt *ReflectiveBoundTexture) *ImageButtonWithRgbaWidget {
+	_ = rbt.SetSurfaceFromRGBA(ImageToRgba(rgba), false)
+
 	return &ImageButtonWithRgbaWidget{
 		id:                GenAutoID("ImageButtonWithRgba"),
-		ImageButtonWidget: ImageButton(nil),
-		rgba:              rgba,
+		rbt:               rbt,
+		ImageButtonWidget: ImageButton(rbt.ToImageWidget().texture),
 	}
 }
 
@@ -335,16 +337,6 @@ func (b *ImageButtonWithRgbaWidget) FramePadding(padding int) *ImageButtonWithRg
 
 // Build implements Widget interface.
 func (b *ImageButtonWithRgbaWidget) Build() {
-	if state := GetState[imageState](Context, b.id.String()); state == nil {
-		SetState(Context, b.id.String(), &imageState{})
-
-		NewTextureFromRgba(b.rgba, func(tex *Texture) {
-			SetState(Context, b.id.String(), &imageState{texture: tex})
-		})
-	} else {
-		b.ImageButtonWidget.texture = state.texture
-	}
-
 	b.ImageButtonWidget.Build()
 }
 

ImageWidgets.go

@@ -1,12 +1,9 @@
 package giu
 
 import (
-	ctx "context"
 	"fmt"
 	"image"
 	"image/color"
-	"net/http"
-	"reflect"
 	"time"
 
 	"github.com/AllenDang/cimgui-go/imgui"
@@ -17,13 +14,14 @@ var _ Widget = &ImageWidget{}
 // ImageWidget adds an image.
 // The default size is the size of the image,
 // to set a specific size, use .Size(width, height).
-// NOTE: ImageWidget is going to be deprecated. ImageWithRGBAWidget
-// should be used instead, however, because it is a native
-// imgui's solution it is still there.
+// NOTE: ImageWidget is not something useful in its own,
+// but an important underlying object of higher level objects.
+// Also, it is an imgui native solution.
 type ImageWidget struct {
 	texture                *Texture
 	width                  float32
 	height                 float32
+	scale                  imgui.Vec2
 	uv0, uv1               imgui.Vec2
 	tintColor, borderColor color.Color
 	onClick                func()
@@ -35,6 +33,7 @@ func Image(texture *Texture) *ImageWidget {
 		texture:     texture,
 		width:       0,
 		height:      0,
+		scale:       imgui.Vec2{X: 1, Y: 1},
 		uv0:         imgui.Vec2{X: 0, Y: 0},
 		uv1:         imgui.Vec2{X: 1, Y: 1},
 		tintColor:   color.RGBA{255, 255, 255, 255},
@@ -74,6 +73,13 @@ func (i *ImageWidget) Size(width, height float32) *ImageWidget {
 	return i
 }
 
+// Scale multiply dimensions after size.
+func (i *ImageWidget) Scale(scaleX, scaleY float32) *ImageWidget {
+	// Size image with DPI scaling
+	i.scale = imgui.Vec2{X: scaleX, Y: scaleY}
+	return i
+}
+
 // Build implements Widget interface.
 func (i *ImageWidget) Build() {
 	if i.width == 0 && i.height == 0 {
@@ -96,6 +102,9 @@ func (i *ImageWidget) Build() {
 		size.Y = rect.Y
 	}
 
+	size.X *= i.scale.X
+	size.Y *= i.scale.Y
+
 	if i.texture == nil || i.texture.tex == nil {
 		Dummy(size.X, size.Y).Build()
 		return
@@ -107,51 +116,36 @@ func (i *ImageWidget) Build() {
 		mousePos := GetMousePos()
 
 		if cursorPos.X <= mousePos.X && cursorPos.Y <= mousePos.Y &&
-			cursorPos.X+int(i.width) >= mousePos.X && cursorPos.Y+int(i.height) >= mousePos.Y {
+			cursorPos.X+int(size.X) >= mousePos.X && cursorPos.Y+int(size.Y) >= mousePos.Y {
 			i.onClick()
 		}
 	}
 
 	imgui.ImageV(i.texture.tex.ID, size, i.uv0, i.uv1, ToVec4Color(i.tintColor), ToVec4Color(i.borderColor))
 }
 
-type imageState struct {
-	loading bool
-	failure bool
-	cancel  ctx.CancelFunc
-	texture *Texture
-	img     *image.RGBA
-}
-
-// Dispose cleans imageState (implements Disposable interface).
-func (is *imageState) Dispose() {
-	is.texture = nil
-	// Cancel ongoing image downloading
-	if is.loading && is.cancel != nil {
-		is.cancel()
-	}
-}
-
 var _ Widget = &ImageWithRgbaWidget{}
 
 // ImageWithRgbaWidget wraps ImageWidget.
 // It is more useful because it doesn't make you to care about
 // imgui textures. You can just pass golang-native image.Image and
 // display it in giu.
 type ImageWithRgbaWidget struct {
-	id   ID
-	rgba *image.RGBA
-	img  *ImageWidget
+	id  ID
+	rbt *ReflectiveBoundTexture
+	img *ImageWidget
 }
 
 // ImageWithRgba creates ImageWithRgbaWidget.
 // The default size is the size of the image,
 // to set a specific size, use .Size(width, height).
-func ImageWithRgba(rgba image.Image) *ImageWithRgbaWidget {
+func ImageWithRgba(rgba image.Image, rbt *ReflectiveBoundTexture) *ImageWithRgbaWidget {
+	_ = rbt.SetSurfaceFromRGBA(ImageToRgba(rgba), false)
+
 	return &ImageWithRgbaWidget{
-		id:   GenAutoID("ImageWithRgba"),
-		rgba: ImageToRgba(rgba),
-		img:  Image(nil),
+		id:  GenAutoID("ImageWithRgba"),
+		rbt: rbt,
+		img: rbt.ToImageWidget(),
 	}
 }
 
@@ -175,20 +169,6 @@ func (i *ImageWithRgbaWidget) OnClick(cb func()) *ImageWithRgbaWidget {
 
 // Build implements Widget interface.
 func (i *ImageWithRgbaWidget) Build() {
-	if i.rgba != nil {
-		var imgState *imageState
-		if imgState = GetState[imageState](Context, i.id.String()); imgState == nil || !reflect.DeepEqual(i.rgba, imgState.img) {
-			imgState = &imageState{}
-			SetState(Context, i.id.String(), imgState)
-
-			NewTextureFromRgba(i.rgba, func(tex *Texture) {
-				imgState.texture = tex
-			})
-		}
-
-		i.img.texture = imgState.texture
-	}
-
 	i.img.Build()
 }
 
@@ -200,19 +180,21 @@ var _ Widget = &ImageWithFileWidget{}
 // because files are not included in executable binaries!
 // You may want to use "embed" package and ImageWithRgba instead.
 type ImageWithFileWidget struct {
-	id      string
-	imgPath string
-	img     *ImageWidget
+	id  string
+	rbt *ReflectiveBoundTexture
+	img *ImageWidget
 }
 
 // ImageWithFile constructs a new ImageWithFileWidget.
 // The default size is the size of the image,
 // to set a specific size, use .Size(width, height).
-func ImageWithFile(imgPath string) *ImageWithFileWidget {
+func ImageWithFile(imgPath string, rbt *ReflectiveBoundTexture) *ImageWithFileWidget {
+	_ = rbt.SetSurfaceFromFile(imgPath, false)
+
 	return &ImageWithFileWidget{
-		id:      fmt.Sprintf("ImageWithFile_%s", imgPath),
-		imgPath: imgPath,
-		img:     Image(nil),
+		id:  fmt.Sprintf("ImageWithFile_%s", imgPath),
+		rbt: rbt,
+		img: rbt.ToImageWidget(),
 	}
 }
 
@@ -236,21 +218,6 @@ func (i *ImageWithFileWidget) OnClick(cb func()) *ImageWithFileWidget {
 
 // Build implements Widget interface.
 func (i *ImageWithFileWidget) Build() {
-	var imgState *imageState
-	if imgState = GetState[imageState](Context, i.id); imgState == nil {
-		// Prevent multiple invocation to LoadImage.
-		imgState = &imageState{}
-		SetState(Context, i.id, imgState)
-
-		img, err := LoadImage(i.imgPath)
-		if err == nil {
-			NewTextureFromRgba(img, func(tex *Texture) {
-				imgState.texture = tex
-			})
-		}
-	}
-
-	i.img.texture = imgState.texture
 	i.img.Build()
 }
 
@@ -260,22 +227,25 @@ var _ Widget = &ImageWithURLWidget{}
 // an URL as image source.
 type ImageWithURLWidget struct {
 	id              string
+	srbt            *StatefulReflectiveBoundTexture
 	imgURL          string
 	downloadTimeout time.Duration
 	whenLoading     Layout
 	whenFailure     Layout
 	onReady         func()
 	onFailure       func(error)
+	onLoading       func()
 	img             *ImageWidget
 }
 
 // ImageWithURL creates ImageWithURLWidget.
 // The default size is the size of the image,
 // to set a specific size, use .Size(width, height).
-func ImageWithURL(url string) *ImageWithURLWidget {
+func ImageWithURL(url string, srbt *StatefulReflectiveBoundTexture) *ImageWithURLWidget {
 	return &ImageWithURLWidget{
 		id:              fmt.Sprintf("ImageWithURL_%s", url),
 		imgURL:          url,
+		srbt:            srbt,
 		downloadTimeout: 10 * time.Second,
 		whenLoading:     Layout{Dummy(100, 100)},
 		whenFailure:     Layout{Dummy(100, 100)},
@@ -295,6 +265,12 @@ func (i *ImageWithURLWidget) OnFailure(onFailure func(error)) *ImageWithURLWidge
 	return i
 }
 
+// OnLoading sets event trigger when image starts download/load.
+func (i *ImageWithURLWidget) OnLoading(onLoading func()) *ImageWithURLWidget {
+	i.onLoading = onLoading
+	return i
+}
+
 // OnClick sets click callback.
 func (i *ImageWithURLWidget) OnClick(cb func()) *ImageWithURLWidget {
 	i.img.OnClick(cb)
@@ -327,79 +303,28 @@ func (i *ImageWithURLWidget) LayoutForFailure(widgets ...Widget) *ImageWithURLWi
 
 // Build implements Widget interface.
 func (i *ImageWithURLWidget) Build() {
-	var imgState *imageState
-	if imgState = GetState[imageState](Context, i.id); imgState == nil {
-		imgState = &imageState{}
-		SetState(Context, i.id, imgState)
-
-		// Prevent multiple invocation to download image.
-		downloadContext, cancelFunc := ctx.WithCancel(ctx.Background())
-
-		SetState(Context, i.id, &imageState{loading: true, cancel: cancelFunc})
-
-		errorFn := func(err error) {
-			SetState(Context, i.id, &imageState{failure: true})
+	if i.onFailure != nil {
+		i.srbt.onFailure = i.onFailure
+	}
 
-			// Trigger onFailure event
-			if i.onFailure != nil {
-				i.onFailure(err)
-			}
-		}
+	if i.onLoading != nil {
+		i.srbt.onLoading = i.onLoading
+	}
 
-		go func() {
-			// Load image from url
-			client := &http.Client{Timeout: i.downloadTimeout}
-
-			req, err := http.NewRequestWithContext(downloadContext, "GET", i.imgURL, http.NoBody)
-			if err != nil {
-				errorFn(err)
-				return
-			}
-
-			resp, err := client.Do(req)
-			if err != nil {
-				errorFn(err)
-				return
-			}
-
-			defer func() {
-				if closeErr := resp.Body.Close(); closeErr != nil {
-					errorFn(closeErr)
-				}
-			}()
-
-			img, _, err := image.Decode(resp.Body)
-			if err != nil {
-				errorFn(err)
-				return
-			}
-
-			rgba := ImageToRgba(img)
-
-			EnqueueNewTextureFromRgba(rgba, func(tex *Texture) {
-				SetState(Context, i.id, &imageState{
-					loading: false,
-					failure: false,
-					texture: tex,
-				})
-			})
-
-			// Trigger onReady event
-			if i.onReady != nil {
-				i.onReady()
-			}
-		}()
+	if i.onReady != nil {
+		i.srbt.onSuccess = i.onReady
 	}
 
-	imgState = GetState[imageState](Context, i.id)
+	_ = i.srbt.SetSurfaceFromURL(i.imgURL, i.downloadTimeout, false)
 
-	switch {
-	case imgState.failure:
+	state := i.srbt.GetState()
+	switch state {
+	case SsFailure:
 		i.whenFailure.Build()
-	case imgState.loading:
+	case SsLoading:
 		i.whenLoading.Build()
-	default:
-		i.img.texture = imgState.texture
+	case SsSuccess:
+		i.img.texture = i.srbt.ToImageWidget().texture
 		i.img.Build()
 	}
 }