From d55c08024339a7e4aa63b7e25f0fd2e6b68e9df4 Mon Sep 17 00:00:00 2001
From: Zsolt Tasnadi <rastasi@gmail.com>
Date: Sun, 2 Jul 2023 19:58:41 +0200
Subject: [PATCH] structure tweaks

---
 domain/context.go          | 16 ++--------------
 konstructor/engine.go      |  6 +++---
 konstructor/konstructor.go |  5 +++--
 konstructor/logic.go       |  6 ++++--
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/domain/context.go b/domain/context.go
index 2dd1d91..d15a996 100644
--- a/domain/context.go
+++ b/domain/context.go
@@ -8,19 +8,7 @@ type Player struct {
 	Name string
 }
 
-type GameField struct {
-	Level        Level
-	LevelSection LevelSection
-}
-
-type Position struct {
-	X int
-	Y int
-}
-
 type Context struct {
-	Player           Player
-	User             User
-	CurrentGameField GameField
-	CurrentPosition  Position
+	Player Player
+	User   User
 }
diff --git a/konstructor/engine.go b/konstructor/engine.go
index 7a8e8d2..0297161 100644
--- a/konstructor/engine.go
+++ b/konstructor/engine.go
@@ -10,16 +10,16 @@ type Engine struct {
 }
 
 func (g *Engine) Layout(outsideWidth, outsideHeight int) (int, int) {
-	return g.Konstructor.Settings.Screen.Width, g.Konstructor.Settings.Screen.Height
+	return g.Logic.Settings.Screen.Width, g.Logic.Settings.Screen.Height
 }
 
 func (g *Engine) Update(screen *ebiten.Image) error {
-	g.Konstructor.Controller.Watch()
+	g.Logic.Controller.Watch()
 	g.Logic.Update(screen)
 	return nil
 }
 
 func (g *Engine) Draw(screen *ebiten.Image) {
 	g.Logic.Draw(screen)
-	g.Konstructor.Controller.Clear()
+	g.Logic.Controller.Clear()
 }
diff --git a/konstructor/konstructor.go b/konstructor/konstructor.go
index 5089b16..277a0fc 100644
--- a/konstructor/konstructor.go
+++ b/konstructor/konstructor.go
@@ -34,9 +34,10 @@ func (k Konstructor) Init() {
 	ebiten.SetWindowSize(k.Settings.Screen.Width, k.Settings.Screen.Height)
 	ebiten.SetWindowTitle(k.Settings.Name)
 	if err := ebiten.RunGame(&Engine{
-		Konstructor: &k,
 		Logic: &Logic{
-			Konstructor: &k,
+			Domain:     k.Domain,
+			Controller: k.Controller,
+			Settings:   k.Settings,
 		},
 	}); err != nil {
 		log.Fatal(err)
diff --git a/konstructor/logic.go b/konstructor/logic.go
index db1fc30..679e223 100644
--- a/konstructor/logic.go
+++ b/konstructor/logic.go
@@ -7,14 +7,16 @@ import (
 )
 
 type Logic struct {
-	Konstructor *Konstructor
+	Domain     DomainInterface
+	Controller *Controller
+	Settings   *Settings
 }
 
 func (l *Logic) Update(screen *ebiten.Image) {
 }
 
 func (l *Logic) Draw(screen *ebiten.Image) {
-	if l.Konstructor.Controller.UpPressed() {
+	if l.Controller.UpPressed() {
 		screen.Fill(color.White)
 	}
 }