monogame: Refactoring

internal/graphicsdriver/monogame/graphics.go

@@ -24,10 +24,7 @@ import (
 )
 
 type Graphics struct {
-	dst      *Image
+	game *monogame.Game
-	src      *Image
-	vertices []float32
-	indices  []uint16
 }
 
 var theGraphics Graphics
@@ -36,6 +33,10 @@ func Get() *Graphics {
 	return &theGraphics
 }
 
+func (g *Graphics) SetGame(game *monogame.Game) {
+	g.game = game
+}
+
 func (g *Graphics) SetThread(thread *thread.Thread) {
 	panic("monogame: SetThread is not implemented")
 }
@@ -53,12 +54,11 @@ func (g *Graphics) SetTransparent(transparent bool) {
 }
 
 func (g *Graphics) SetVertices(vertices []float32, indices []uint16) {
-	g.vertices = vertices
+	g.game.SetVertices(vertices, indices)
-	g.indices = indices
 }
 
 func (g *Graphics) NewImage(width, height int) (driver.Image, error) {
-	v := monogame.CurrentGame().NewRenderTarget2D(width, height)
+	v := g.game.NewRenderTarget2D(width, height)
 	return &Image{
 		v:      v,
 		g:      g,

internal/graphicsdriver/monogame/image.go

@@ -42,11 +42,11 @@ func (*Image) Pixels() ([]byte, error) {
 }
 
 func (i *Image) SetAsDestination() {
-	i.g.dst = i
+	i.v.SetAsDestination()
 }
 
 func (i *Image) SetAsSource() {
-	i.g.src = i
+	i.v.SetAsSource()
 }
 
 func (i *Image) ReplacePixels(args []*driver.ReplacePixelsArgs) {

internal/monogame/monogame.go

@@ -40,12 +40,6 @@ type Game struct {
 	draw    js.Func
 }
 
-var currentGame *Game
-
-func CurrentGame() *Game {
-	return currentGame
-}
-
 func NewGame(ud UpdateDrawer) *Game {
 	update := js.FuncOf(func(this js.Value, args []js.Value) interface{} {
 		return ud.Update()
@@ -62,7 +56,6 @@ func NewGame(ud UpdateDrawer) *Game {
 		draw:    draw,
 	}
 	runtime.SetFinalizer(g, (*Game).Dispose)
-	currentGame = g
 	return g
 }
 
@@ -70,7 +63,6 @@ func (g *Game) Dispose() {
 	runtime.SetFinalizer(g, nil)
 	g.update.Release()
 	g.draw.Release()
-	currentGame = nil
 }
 
 func (g *Game) Run() {
@@ -81,13 +73,19 @@ func (g *Game) NewRenderTarget2D(width, height int) *RenderTarget2D {
 	v := g.binding.Call("NewRenderTarget2D", width, height)
 	r := &RenderTarget2D{
 		v:       v,
+		binding: g.binding,
 	}
 	runtime.SetFinalizer(r, (*RenderTarget2D).Dispose)
 	return r
 }
 
+func (g *Game) SetVertices(vertices []float32, indices []uint16) {
+	// TODO: Implement this
+}
+
 type RenderTarget2D struct {
 	v       js.Value
+	binding js.Value
 }
 
 func (r *RenderTarget2D) Dispose() {
@@ -99,6 +97,14 @@ func (r *RenderTarget2D) ReplacePixels(args []*driver.ReplacePixelsArgs) {
 	for _, a := range args {
 		arr := js.Global().Get("Uint8Array").New(len(a.Pixels))
 		js.CopyBytesToJS(arr, a.Pixels)
-		r.v.Call("ReplacePixels", arr, a.X, a.Y, a.Width, a.Height)
+		r.binding.Call("ReplacePixels", r.v, arr, a.X, a.Y, a.Width, a.Height)
 	}
 }
+
+func (r *RenderTarget2D) SetAsDestination() {
+	r.binding.Set("Dst", r.v)
+}
+
+func (r *RenderTarget2D) SetAsSource() {
+	r.binding.Set("Src", r.v)
+}

internal/uidriver/monogame/ui.go

@@ -37,6 +37,7 @@ func (*UI) Run(context driver.UIContext) error {
 	defer g.Dispose()
 
 	theUI.game = g
+	theUI.Graphics().(*graphics.Graphics).SetGame(g)
 	g.Run()
 	return nil
 }