From c045e345d2535fc56eb0c106c6d4a839e1a84283 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Thu, 27 Dec 2018 13:59:19 -0800 Subject: [PATCH] moving window to platform --- graphics/window.go | 34 ---------------------------------- platform/window.go | 9 ++++++++- 2 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 graphics/window.go diff --git a/graphics/window.go b/graphics/window.go deleted file mode 100644 index aa45762..0000000 --- a/graphics/window.go +++ /dev/null @@ -1,34 +0,0 @@ -package graphics - -import "github.com/veandco/go-sdl2/sdl" - -type Window struct { - window *sdl.Window - renderer *sdl.Renderer -} - -func NewWindow(title string, width, height int) (*Window, error) { - window, err := sdl.CreateWindow( - title, - sdl.WINDOWPOS_UNDEFINED, - sdl.WINDOWPOS_UNDEFINED, - int32(width), - int32(height), - sdl.WINDOW_SHOWN, - ) - if err != nil { - return nil, err - } - - renderer, err := sdl.CreateRenderer(window, -1, sdl.RENDERER_ACCELERATED) - if err != nil { - window.Destroy() - return nil, err - } - - return &Window{window, renderer}, nil -} - -func (w *Window) Destroy() { - -} diff --git a/platform/window.go b/platform/window.go index 47aba97..ffcde00 100644 --- a/platform/window.go +++ b/platform/window.go @@ -9,6 +9,7 @@ type Window interface { type window struct { sdlWindow *sdl.Window sdlGlContext sdl.GLContext + sdlRenderer *sdl.Renderer } func newWindow(title string, width, height int) (Window, error) { @@ -30,7 +31,13 @@ func newWindow(title string, width, height int) (Window, error) { return nil, err } - return &window{sdlWindow, sdlGlContext}, nil + sdlRenderer, err := sdl.CreateRenderer(sdlWindow, -1, sdl.RENDERER_ACCELERATED) + if err != nil { + sdlWindow.Destroy() + return nil, err + } + + return &window{sdlWindow, sdlGlContext, sdlRenderer}, nil } func (w *window) Destroy() error {