diff --git a/konstructor/konstructor.controller.go b/konstructor/engine/engine.controller.go similarity index 98% rename from konstructor/konstructor.controller.go rename to konstructor/engine/engine.controller.go index c9841c4..c3e5942 100644 --- a/konstructor/konstructor.controller.go +++ b/konstructor/engine/engine.controller.go @@ -1,4 +1,4 @@ -package konstructor +package engine import ( "fmt" diff --git a/konstructor/konstructor.engine.go b/konstructor/engine/engine.go similarity index 95% rename from konstructor/konstructor.engine.go rename to konstructor/engine/engine.go index cf775ff..e86a290 100644 --- a/konstructor/konstructor.engine.go +++ b/konstructor/engine/engine.go @@ -1,4 +1,4 @@ -package konstructor +package engine import ( "game/konstructor/entity" @@ -8,7 +8,7 @@ import ( ) type Engine struct { - Domain DomainInterface + Domain entity.DomainInterface Controller *Controller Settings *entity.Settings KContext *entity.KContext diff --git a/konstructor/konstructor.utils.go b/konstructor/engine/engine.utils.go similarity index 97% rename from konstructor/konstructor.utils.go rename to konstructor/engine/engine.utils.go index 291f7a0..5618fc1 100644 --- a/konstructor/konstructor.utils.go +++ b/konstructor/engine/engine.utils.go @@ -1,4 +1,4 @@ -package konstructor +package engine import ( "bytes" diff --git a/konstructor/konstructor.screen.dialog.go b/konstructor/engine/screen.dialog.go similarity index 97% rename from konstructor/konstructor.screen.dialog.go rename to konstructor/engine/screen.dialog.go index 4c126c5..285a9d5 100644 --- a/konstructor/konstructor.screen.dialog.go +++ b/konstructor/engine/screen.dialog.go @@ -1,4 +1,4 @@ -package konstructor +package engine import ( "github.com/hajimehoshi/ebiten" diff --git a/konstructor/konstructor.screen.menu.go b/konstructor/engine/screen.menu.go similarity index 97% rename from konstructor/konstructor.screen.menu.go rename to konstructor/engine/screen.menu.go index 83230b7..9333c03 100644 --- a/konstructor/konstructor.screen.menu.go +++ b/konstructor/engine/screen.menu.go @@ -1,4 +1,4 @@ -package konstructor +package engine import ( "github.com/hajimehoshi/ebiten" diff --git a/konstructor/konstructor.screen.playground.go b/konstructor/engine/screen.playground.go similarity index 92% rename from konstructor/konstructor.screen.playground.go rename to konstructor/engine/screen.playground.go index 51f6a18..168a2a3 100644 --- a/konstructor/konstructor.screen.playground.go +++ b/konstructor/engine/screen.playground.go @@ -1,4 +1,4 @@ -package konstructor +package engine import ( "github.com/hajimehoshi/ebiten" diff --git a/konstructor/entity/entity.domain.go b/konstructor/entity/entity.domain.go new file mode 100644 index 0000000..3807996 --- /dev/null +++ b/konstructor/entity/entity.domain.go @@ -0,0 +1,10 @@ +package entity + +type DomainInterface interface { + Init() + GetMenu(name string) Menu + SetMenu(name string, menu Menu) + GetDialog(name string) Dialog + SetDialog(name string, menu Dialog) + GetLevel(index int) Level +} diff --git a/konstructor/entity/konstructor.kcontext.go b/konstructor/entity/entity.kcontext.go similarity index 100% rename from konstructor/entity/konstructor.kcontext.go rename to konstructor/entity/entity.kcontext.go diff --git a/konstructor/konstructor.go b/konstructor/konstructor.go index 259096b..dcd6b2b 100644 --- a/konstructor/konstructor.go +++ b/konstructor/konstructor.go @@ -1,26 +1,15 @@ package konstructor import ( + "game/konstructor/engine" "game/konstructor/entity" "github.com/hajimehoshi/ebiten" ) -type ContextInterface interface { -} - -type DomainInterface interface { - Init() - GetMenu(name string) entity.Menu - SetMenu(name string, menu entity.Menu) - GetDialog(name string) entity.Dialog - SetDialog(name string, menu entity.Dialog) - GetLevel(index int) entity.Level -} - type Konstructor struct { - Domain DomainInterface - Controller *Controller + Domain entity.DomainInterface + Controller *engine.Controller Settings *entity.Settings KContext *entity.KContext } @@ -37,7 +26,7 @@ func (k Konstructor) SetWindow() { } func (k Konstructor) Run() { - ebiten.RunGame(&Engine{ + ebiten.RunGame(&engine.Engine{ KContext: k.KContext, Domain: k.Domain, Controller: k.Controller, diff --git a/main.go b/main.go index 3fb726c..c03a33c 100644 --- a/main.go +++ b/main.go @@ -3,6 +3,7 @@ package main import ( "game/domain" "game/konstructor" + "game/konstructor/engine" "game/konstructor/entity" "github.com/hajimehoshi/ebiten" @@ -27,7 +28,7 @@ func main() { }, }, }, - Controller: &konstructor.Controller{ + Controller: &engine.Controller{ KeyMap: entity.KeyMap{ Up: ebiten.KeyUp, Down: ebiten.KeyDown,