Merge pull request #10 from andydotxyz/drivergraphics

Move driver graphics out of main package
HFO4 · May 13, 2019 · 38cf886 · 38cf886
2 parents c8aabed + d38d483
commit 38cf886
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/driver/gui.go b/driver/gui.go
@@ -75,6 +75,12 @@ func (lcd *LCD) NewInput(b []byte) {
 }
 
 func (lcd *LCD) Run(drawSignal chan bool) {
+	pixelgl.Run(func() {
+		lcd.run(drawSignal)
+	})
+}
+
+func (lcd *LCD) run(drawSignal chan bool) {
 	cfg := pixelgl.WindowConfig{
 		Title:  lcd.title,
 		Bounds: pixel.R(0, 0, 160*3, 142*3),

diff --git a/main.go b/main.go
@@ -7,7 +7,6 @@ import (
 	"github.com/HFO4/gbc-in-cloud/driver"
 	"github.com/HFO4/gbc-in-cloud/gb"
 	"github.com/HFO4/gbc-in-cloud/server"
-	"github.com/faiface/pixel/pixelgl"
 	"log"
 	"os"
 )
@@ -50,8 +49,9 @@ func startGUI() {
 	core.SpeedMultiple = 0
 	core.ToggleSound = SoundOn
 	core.Init(ROMPath)
-	go core.DisplayDriver.Run(core.DrawSignal)
-	core.Run()
+
+	go core.Run()
+	core.DisplayDriver.Run(core.DrawSignal)
 }
 
 func runServer() {
@@ -85,7 +85,7 @@ func runServer() {
 	streamServer.Run()
 }
 
-func run() {
+func main() {
 	flag.Parse()
 	if h {
 		flag.Usage()
@@ -102,7 +102,3 @@ func run() {
 		return
 	}
 }
-
-func main() {
-	pixelgl.Run(run)
-}