make context great again

This commit is contained in:
2019-11-14 22:28:58 +03:00
parent 3560be99a1
commit 6a37870bd2
12 changed files with 160 additions and 84 deletions

View File

@ -1,6 +1,7 @@
package mainwindow
import (
"context"
"fmt"
"lab.zaar.be/thefish/alchemyst-go/engine/types"
"lab.zaar.be/thefish/alchemyst-go/util/appctx"
@ -9,12 +10,12 @@ import (
type MainWindow struct {
types.Rect
ctx appctx.ClientCtx
ctx context.Context
layers map[string]types.Renderable
}
func Init(ctx appctx.ClientCtx) *MainWindow {
ctx.Logger().Info().Msgf("Opening main window...")
func Init(ctx context.Context) *MainWindow {
appctx.Logger(ctx).Info().Msgf("Opening main window...")
mw := MainWindow{ctx: ctx, layers: make(map[string]types.Renderable, 0)}
mw.Open()
return &mw
@ -32,12 +33,12 @@ func (mw *MainWindow) GetLayer(name string) *Layer {
if layer, ok := mw.layers[name]; ok {
return layer.(*Layer)
}
mw.ctx.Logger().Fatal().Msgf("No layer with such name %s", name)
appctx.Logger(mw.ctx).Fatal().Msgf("No layer with such name %s", name)
return nil
}
func (mw *MainWindow) Open() {
config := mw.ctx.Config()
config := appctx.Config(mw.ctx)
blt.Open()
//blt.Set("window: size=80x25, title="+config.Title+" v"+string(version)+"; font: ./fonts/Monaco-Linux.ttf, size=10")
blt.Set(
@ -57,7 +58,7 @@ func (mw *MainWindow) Open() {
}
func (mw *MainWindow) Close() {
mw.ctx.Logger().Info().Msg("Closing main window...")
appctx.Logger(mw.ctx).Info().Msg("Closing main window...")
blt.Close()
}