From 723f55186b63d17927b4ffe555a38ce2e8b3802f Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Sat, 29 Dec 2018 17:04:37 -0800
Subject: [PATCH] get imgui properly running in viewer

---
 platform/imgui_backend/imgui_backend.go | 2 +-
 platform/window.go                      | 4 ++--
 tools/viewer/main.go                    | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/imgui_backend/imgui_backend.go b/platform/imgui_backend/imgui_backend.go
index 3f6b664..d87de7d 100644
--- a/platform/imgui_backend/imgui_backend.go
+++ b/platform/imgui_backend/imgui_backend.go
@@ -299,7 +299,7 @@ func createFontTexture() uint32 {
 	// Store our identifier
 	io.Fonts().SetTextureID(imgui.TextureID(fontTexture))
 
-	// Restore singleton
+	// Restore state
 	gl.BindTexture(gl.TEXTURE_2D, uint32(lastTexture))
 	return fontTexture
 }
diff --git a/platform/window.go b/platform/window.go
index 9fb1f4c..cd12169 100644
--- a/platform/window.go
+++ b/platform/window.go
@@ -82,11 +82,11 @@ func (w *Window) RenderTexture(texture *Texture, srcRect, dstRect math.Rect4i) {
 
 func (w *Window) advance() {
 	imgui_backend.NewFrame(w.displaySize())
+	w.sdlRenderer.Clear()
+
 	w.scene.Advance(w)
 
 	imgui.Render()
-
-	w.sdlWindow.GLMakeCurrent(w.sdlGlContext)
 	imgui_backend.Render(w.displaySize(), w.bufferSize(), imgui.RenderedDrawData())
 	w.sdlWindow.GLSwap()
 }
diff --git a/tools/viewer/main.go b/tools/viewer/main.go
index dc87ac2..6623e93 100644
--- a/tools/viewer/main.go
+++ b/tools/viewer/main.go
@@ -5,6 +5,7 @@ import (
 	"log"
 	"os"
 
+	imgui "github.com/FooSoft/imgui-go"
 	"github.com/FooSoft/lazarus/formats/dat"
 	"github.com/FooSoft/lazarus/formats/dc6"
 	"github.com/FooSoft/lazarus/math"
@@ -62,6 +63,8 @@ func (s *scene) Init(window *platform.Window) error {
 }
 
 func (s *scene) Advance(window *platform.Window) error {
+	imgui.Text("Hello")
+
 	window.RenderTexture(
 		s.texture,
 		math.Rect4i{X: 0, Y: 0, W: 256, H: 256},