entity layer

domain/dialog.go

@@ -1,22 +1,22 @@
 package domain
 
 import (
-	"game/konstructor"
+	"game/konstructor/entity"
 	"image/color"
 )
 
 func (d *Domain) InitDialog() {
-	d.DialogMap = konstructor.DialogMap{
+	d.DialogMap = entity.DialogMap{
 		"TestDialog": {
-			Layout: konstructor.DialogLayout{
+			Layout: entity.DialogLayout{
-				ChoiceFont: konstructor.FontLayout{
+				ChoiceFont: entity.FontLayout{
 					DPI:           72,
 					Size:          24,
 					Color:         color.White,
 					SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100},
 				},
 			},
-			Choices: []konstructor.DialogChoice{
+			Choices: []entity.DialogChoice{
 				{
 					ID:    "one",
 					Label: "One",
@@ -30,11 +30,11 @@ func (d *Domain) InitDialog() {
 	}
 }
 
-func (d *Domain) GetDialog(name string) konstructor.Dialog {
+func (d *Domain) GetDialog(name string) entity.Dialog {
 	value, _ := d.DialogMap[name]
 	return value
 }
 
-func (d *Domain) SetDialog(name string, dialog konstructor.Dialog) {
+func (d *Domain) SetDialog(name string, dialog entity.Dialog) {
 	d.DialogMap[name] = dialog
 }

domain/domain.go

@@ -1,14 +1,14 @@
 package domain
 
 import (
-	"game/konstructor"
+	"game/konstructor/entity"
 )
 
 type Domain struct {
 	Context   Context
-	MenuMap   konstructor.MenuMap
+	MenuMap   entity.MenuMap
-	DialogMap konstructor.DialogMap
+	DialogMap entity.DialogMap
-	Levels    []konstructor.Level
+	Levels    []entity.Level
 }
 
 func (d *Domain) Init() {

domain/level.go

@@ -1,28 +1,26 @@
 package domain
 
-import (
+import "game/konstructor/entity"
-	"game/konstructor"
-)
 
 func (d *Domain) InitLevel() {
-	d.Levels = []konstructor.Level{
+	d.Levels = []entity.Level{
 		{
 			ID:   "level_1",
 			Name: "Level I.",
-			Playgrounds: []konstructor.Playground{
+			Playgrounds: []entity.Playground{
 				{
 					Background: "level_1_playground_1.png",
-					Objects: []konstructor.Object{
+					Objects: []entity.Object{
 						{
 							ID: "test_object",
-							Position: konstructor.Position{
+							Position: entity.Position{
 								X: 10,
 								Y: 10,
 								Z: 0,
 							},
-							Type: konstructor.ObjectType{
+							Type: entity.ObjectType{
 								ID: "test_object_type",
-								RenderOptions: konstructor.RenderOptions{
+								RenderOptions: entity.RenderOptions{
 									Image:  "test_object.png",
 									Width:  30,
 									Height: 30,
@@ -36,6 +34,6 @@ func (d *Domain) InitLevel() {
 	}
 }
 
-func (d *Domain) GetLevel(index int) konstructor.Level {
+func (d *Domain) GetLevel(index int) entity.Level {
 	return d.Levels[index]
 }

domain/menu.go

@@ -2,24 +2,24 @@ package domain
 
 import (
 	"fmt"
-	"game/konstructor"
+	"game/konstructor/entity"
 	"image/color"
 	"os"
 )
 
 func (d *Domain) InitMenu() {
-	d.MenuMap = konstructor.MenuMap{
+	d.MenuMap = entity.MenuMap{
 		"MainMenu": {
 			CurrentSelected: 0,
-			Layout: konstructor.MenuLayout{
+			Layout: entity.MenuLayout{
-				MenuItemFont: konstructor.FontLayout{
+				MenuItemFont: entity.FontLayout{
 					DPI:           72,
 					Size:          24,
 					Color:         color.White,
 					SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100},
 				},
 			},
-			MenuItems: []konstructor.MenuItem{
+			MenuItems: []entity.MenuItem{
 				{
 					ID:      "start",
 					Label:   "Start Game",
@@ -39,15 +39,15 @@ func (d *Domain) InitMenu() {
 		},
 		"GameMenu": {
 			CurrentSelected: 0,
-			Layout: konstructor.MenuLayout{
+			Layout: entity.MenuLayout{
-				MenuItemFont: konstructor.FontLayout{
+				MenuItemFont: entity.FontLayout{
 					DPI:           72,
 					Size:          24,
 					Color:         color.White,
 					SelectedColor: color.RGBA{R: 0, G: 255, B: 0, A: 100},
 				},
 			},
-			MenuItems: []konstructor.MenuItem{
+			MenuItems: []entity.MenuItem{
 				{
 					ID:      "save",
 					Label:   "Save Game",
@@ -63,12 +63,12 @@ func (d *Domain) InitMenu() {
 	}
 }
 
-func (d *Domain) GetMenu(name string) konstructor.Menu {
+func (d *Domain) GetMenu(name string) entity.Menu {
 	value, _ := d.MenuMap[name]
 	return value
 }
 
-func (d *Domain) SetMenu(name string, menu konstructor.Menu) {
+func (d *Domain) SetMenu(name string, menu entity.Menu) {
 	d.MenuMap[name] = menu
 }
 

konstructor/entity/entity.controller.go

@@ -0,0 +1,14 @@
+package entity
+
+import "github.com/hajimehoshi/ebiten"
+
+type KeyMap struct {
+	Up      ebiten.Key
+	Down    ebiten.Key
+	Right   ebiten.Key
+	Left    ebiten.Key
+	Action0 ebiten.Key
+	Action1 ebiten.Key
+	Action2 ebiten.Key
+	Action3 ebiten.Key
+}

konstructor/entity/entity.dialog.go

@@ -0,0 +1,30 @@
+package entity
+
+import "image/color"
+
+type DialogMap map[string]Dialog
+
+type DialogLayout struct {
+	Background string
+	ChoiceFont FontLayout
+}
+
+type DialogChoice struct {
+	ID      string
+	Label   string
+	Handler func()
+}
+
+type Dialog struct {
+	CurrentSelected int
+	Layout          DialogLayout
+	Choices         []DialogChoice
+}
+
+func (dialog *Dialog) GetChoiceColor(i int) color.Color {
+	if dialog.CurrentSelected == i {
+		return dialog.Layout.ChoiceFont.SelectedColor
+	} else {
+		return dialog.Layout.ChoiceFont.Color
+	}
+}

konstructor/entity/entity.font.go

@@ -0,0 +1,10 @@
+package entity
+
+import "image/color"
+
+type FontLayout struct {
+	DPI           float64
+	Size          float64
+	Color         color.Color
+	SelectedColor color.Color
+}

konstructor/entity/entity.menu.go

@@ -0,0 +1,30 @@
+package entity
+
+import "image/color"
+
+type MenuMap map[string]Menu
+
+type MenuLayout struct {
+	Background   string
+	MenuItemFont FontLayout
+}
+
+type MenuItem struct {
+	ID      string
+	Label   string
+	Handler func()
+}
+
+type Menu struct {
+	CurrentSelected int
+	Layout          MenuLayout
+	MenuItems       []MenuItem
+}
+
+func (menu *Menu) GetMenuItemColor(i int) color.Color {
+	if menu.CurrentSelected == i {
+		return menu.Layout.MenuItemFont.SelectedColor
+	} else {
+		return menu.Layout.MenuItemFont.Color
+	}
+}

konstructor/entity/entity.playground.go

@@ -1,77 +1,65 @@
-package konstructor
+package entity
-
+
-import (
+type Position struct {
-	"github.com/hajimehoshi/ebiten"
+	X int
-)
+	Y int
-
+	Z int
-type Position struct {
+}
-	X int
+
-	Y int
+type RenderOptions struct {
-	Z int
+	Image  string
-}
+	Width  int
-
+	Height int
-type RenderOptions struct {
+}
-	Image  string
+
-	Width  int
+type ObjectType struct {
-	Height int
+	ID            string
-}
+	RenderOptions RenderOptions
-
+}
-type ObjectType struct {
+
-	ID            string
+type Object struct {
-	RenderOptions RenderOptions
+	ID       string
-}
+	Type     ObjectType
-
+	Position Position
-type Object struct {
+}
-	ID       string
+
-	Type     ObjectType
+type NPCType struct {
-	Position Position
+	ID            string
-}
+	RenderOptions RenderOptions
-
+}
-type NPCType struct {
+
-	ID            string
+type NPC struct {
-	RenderOptions RenderOptions
+	ID       string
-}
+	Type     NPCType
-
+	Position Position
-type NPC struct {
+}
-	ID       string
+
-	Type     NPCType
+type Player struct {
-	Position Position
+	ID            string
-}
+	RenderOptions RenderOptions
-
+	Position      Position
-type Player struct {
+}
-	ID            string
+
-	RenderOptions RenderOptions
+type ItemType struct {
-	Position      Position
+	ID            string
-}
+	RenderOptions RenderOptions
-
+}
-type ItemType struct {
+
-	ID            string
+type Item struct {
-	RenderOptions RenderOptions
+	ID       string
-}
+	Type     ItemType
-
+	Position Position
-type Item struct {
+}
-	ID       string
+
-	Type     ItemType
+type Playground struct {
-	Position Position
+	Background string
-}
+	Objects    []Object
-
+	NPCs       []NPC
-type Playground struct {
+	Items      []Item
-	Background string
+}
-	Objects    []Object
+
-	NPCs       []NPC
+type Level struct {
-	Items      []Item
+	ID          string
-}
+	Name        string
-
+	Playgrounds []Playground
-type Level struct {
+}
-	ID          string
-	Name        string
-	Playgrounds []Playground
-}
-
-func (e *Engine) PlaygroundDraw(screen *ebiten.Image) {
-	e.Domain.GetLevel(e.KContext.CurrentLevel)
-}
-
-func (e *Engine) PlaygroundUpdate() {
-	e.Domain.GetLevel(e.KContext.CurrentLevel)
-}

konstructor/entity/entity.settings.go

@@ -0,0 +1,11 @@
+package entity
+
+type ScreenSettings struct {
+	Width  int
+	Height int
+}
+
+type Settings struct {
+	Name   string
+	Screen *ScreenSettings
+}

konstructor/entity/konstructor.kcontext.go

@@ -1,4 +1,4 @@
-package konstructor
+package entity
 
 type KContextScreen struct {
 	Type  string

konstructor/konstructor.controller.go

@@ -1,73 +1,63 @@
-package konstructor
+package konstructor
-
+
-import (
+import (
-	"fmt"
+	"fmt"
-	"reflect"
+	"game/konstructor/entity"
-
+	"reflect"
-	"github.com/hajimehoshi/ebiten"
+
-	"github.com/hajimehoshi/ebiten/inpututil"
+	"github.com/hajimehoshi/ebiten"
-)
+	"github.com/hajimehoshi/ebiten/inpututil"
-
+)
-type KeyMap struct {
+
-	Up      ebiten.Key
+type Controller struct {
-	Down    ebiten.Key
+	PressedKey ebiten.Key
-	Right   ebiten.Key
+	KeyMap     entity.KeyMap
-	Left    ebiten.Key
+}
-	Action0 ebiten.Key
+
-	Action1 ebiten.Key
+func (c *Controller) Watch() {
-	Action2 ebiten.Key
+	values := reflect.ValueOf(c.KeyMap)
-	Action3 ebiten.Key
+
-}
+	for i := 0; i < values.NumField(); i++ {
-
+		key := values.Field(i).Interface().(ebiten.Key)
-type Controller struct {
+		if inpututil.IsKeyJustPressed(key) {
-	PressedKey ebiten.Key
+			fmt.Printf("Key pressed: %s\n", key)
-	KeyMap     KeyMap
+			c.PressedKey = key
-}
+		}
-
+	}
-func (c *Controller) Watch() {
+}
-	values := reflect.ValueOf(c.KeyMap)
+
-
+func (c *Controller) Clear() {
-	for i := 0; i < values.NumField(); i++ {
+	c.PressedKey = Controller{}.PressedKey
-		key := values.Field(i).Interface().(ebiten.Key)
+}
-		if inpututil.IsKeyJustPressed(key) {
+
-			fmt.Printf("Key pressed: %s\n", key)
+func (c *Controller) UpPressed() bool {
-			c.PressedKey = key
+	return c.PressedKey == c.KeyMap.Up
-		}
+}
-	}
+
-}
+func (c *Controller) DownPressed() bool {
-
+	return c.PressedKey == c.KeyMap.Down
-func (c *Controller) Clear() {
+}
-	c.PressedKey = Controller{}.PressedKey
+
-}
+func (c *Controller) RightPressed() bool {
-
+	return c.PressedKey == c.KeyMap.Right
-func (c *Controller) UpPressed() bool {
+}
-	return c.PressedKey == c.KeyMap.Up
+
-}
+func (c *Controller) LeftPressed() bool {
-
+	return c.PressedKey == c.KeyMap.Left
-func (c *Controller) DownPressed() bool {
+}
-	return c.PressedKey == c.KeyMap.Down
+
-}
+func (c *Controller) Action0Pressed() bool {
-
+	return c.PressedKey == c.KeyMap.Action0
-func (c *Controller) RightPressed() bool {
+}
-	return c.PressedKey == c.KeyMap.Right
+
-}
+func (c *Controller) Action1Pressed() bool {
-
+	return c.PressedKey == c.KeyMap.Action1
-func (c *Controller) LeftPressed() bool {
+}
-	return c.PressedKey == c.KeyMap.Left
+
-}
+func (c *Controller) Action2Pressed() bool {
-
+	return c.PressedKey == c.KeyMap.Action2
-func (c *Controller) Action0Pressed() bool {
+}
-	return c.PressedKey == c.KeyMap.Action0
+
-}
+func (c *Controller) Action3Pressed() bool {
-
+	return c.PressedKey == c.KeyMap.Action3
-func (c *Controller) Action1Pressed() bool {
+}
-	return c.PressedKey == c.KeyMap.Action1
-}
-
-func (c *Controller) Action2Pressed() bool {
-	return c.PressedKey == c.KeyMap.Action2
-}
-
-func (c *Controller) Action3Pressed() bool {
-	return c.PressedKey == c.KeyMap.Action3
-}

konstructor/konstructor.engine.go

@@ -1,6 +1,7 @@
 package konstructor
 
 import (
+	"game/konstructor/entity"
 	"os"
 
 	"github.com/hajimehoshi/ebiten"
@@ -9,8 +10,8 @@ import (
 type Engine struct {
 	Domain     DomainInterface
 	Controller *Controller
-	Settings   *Settings
+	Settings   *entity.Settings
-	KContext   *KContext
+	KContext   *entity.KContext
 }
 
 func (e *Engine) Layout(outsideWidth, outsideHeight int) (int, int) {

konstructor/konstructor.go

@@ -1,6 +1,7 @@
 package konstructor
 
 import (
+	"game/konstructor/entity"
 	"log"
 
 	"github.com/hajimehoshi/ebiten"
@@ -11,28 +12,18 @@ type ContextInterface interface {
 
 type DomainInterface interface {
 	Init()
-	GetMenu(name string) Menu
+	GetMenu(name string) entity.Menu
-	SetMenu(name string, menu Menu)
+	SetMenu(name string, menu entity.Menu)
-	GetDialog(name string) Dialog
+	GetDialog(name string) entity.Dialog
-	SetDialog(name string, menu Dialog)
+	SetDialog(name string, menu entity.Dialog)
-	GetLevel(index int) Level
+	GetLevel(index int) entity.Level
-}
-
-type ScreenSettings struct {
-	Width  int
-	Height int
-}
-
-type Settings struct {
-	Name   string
-	Screen *ScreenSettings
 }
 
 type Konstructor struct {
 	Domain     DomainInterface
 	Controller *Controller
-	Settings   *Settings
+	Settings   *entity.Settings
-	KContext   *KContext
+	KContext   *entity.KContext
 }
 
 func (k Konstructor) Init() {

konstructor/konstructor.screen.dialog.go

@@ -1,39 +1,10 @@
 package konstructor
 
 import (
-	"image/color"
-
 	"github.com/hajimehoshi/ebiten"
 	"github.com/hajimehoshi/ebiten/text"
 )
 
-type DialogMap map[string]Dialog
-
-type DialogLayout struct {
-	Background string
-	ChoiceFont FontLayout
-}
-
-type DialogChoice struct {
-	ID      string
-	Label   string
-	Handler func()
-}
-
-type Dialog struct {
-	CurrentSelected int
-	Layout          DialogLayout
-	Choices         []DialogChoice
-}
-
-func (dialog *Dialog) GetChoiceColor(i int) color.Color {
-	if dialog.CurrentSelected == i {
-		return dialog.Layout.ChoiceFont.SelectedColor
-	} else {
-		return dialog.Layout.ChoiceFont.Color
-	}
-}
-
 func (e *Engine) DialogDraw(screen *ebiten.Image) {
 	dialog := e.Domain.GetDialog(e.KContext.Screen.Value)
 

konstructor/konstructor.screen.menu.go

@@ -1,64 +1,35 @@
-package konstructor
+package konstructor
-
+
-import (
+import (
-	"image/color"
+	"github.com/hajimehoshi/ebiten"
-
+	"github.com/hajimehoshi/ebiten/text"
-	"github.com/hajimehoshi/ebiten"
+)
-	"github.com/hajimehoshi/ebiten/text"
+
-)
+func (e *Engine) MenuDraw(screen *ebiten.Image) {
-
+	menu := e.Domain.GetMenu(e.KContext.Screen.Value)
-type MenuMap map[string]Menu
+	face := GetFontFace(menu.Layout.MenuItemFont)
-
+
-type MenuLayout struct {
+	for i, menu_item := range menu.MenuItems {
-	Background   string
+		color := menu.GetMenuItemColor(i)
-	MenuItemFont FontLayout
+		offset := int(menu.Layout.MenuItemFont.Size) * (i + 1)
-}
+		text.Draw(screen, menu_item.Label+"\n", face, 8, offset, color)
-
+	}
-type MenuItem struct {
+}
-	ID      string
+
-	Label   string
+func (e *Engine) MenuUpdate() {
-	Handler func()
+	menu := e.Domain.GetMenu(e.KContext.Screen.Value)
-}
+
-
+	if e.Controller.UpPressed() && menu.CurrentSelected != 0 {
-type Menu struct {
+		menu.CurrentSelected--
-	CurrentSelected int
+	}
-	Layout          MenuLayout
+
-	MenuItems       []MenuItem
+	if e.Controller.DownPressed() && menu.CurrentSelected != len(menu.MenuItems)-1 {
-}
+		menu.CurrentSelected++
-
+	}
-func (menu *Menu) GetMenuItemColor(i int) color.Color {
+
-	if menu.CurrentSelected == i {
+	if e.Controller.Action0Pressed() {
-		return menu.Layout.MenuItemFont.SelectedColor
+		menu.MenuItems[menu.CurrentSelected].Handler()
-	} else {
+	}
-		return menu.Layout.MenuItemFont.Color
+
-	}
+	e.Domain.SetMenu(e.KContext.Screen.Value, menu)
-}
+}
-
-func (e *Engine) MenuDraw(screen *ebiten.Image) {
-	menu := e.Domain.GetMenu(e.KContext.Screen.Value)
-	face := GetFontFace(menu.Layout.MenuItemFont)
-
-	for i, menu_item := range menu.MenuItems {
-		color := menu.GetMenuItemColor(i)
-		offset := int(menu.Layout.MenuItemFont.Size) * (i + 1)
-		text.Draw(screen, menu_item.Label+"\n", face, 8, offset, color)
-	}
-}
-
-func (e *Engine) MenuUpdate() {
-	menu := e.Domain.GetMenu(e.KContext.Screen.Value)
-
-	if e.Controller.UpPressed() && menu.CurrentSelected != 0 {
-		menu.CurrentSelected--
-	}
-
-	if e.Controller.DownPressed() && menu.CurrentSelected != len(menu.MenuItems)-1 {
-		menu.CurrentSelected++
-	}
-
-	if e.Controller.Action0Pressed() {
-		menu.MenuItems[menu.CurrentSelected].Handler()
-	}
-
-	e.Domain.SetMenu(e.KContext.Screen.Value, menu)
-}

konstructor/konstructor.screen.playground.go

@@ -0,0 +1,13 @@
+package konstructor
+
+import (
+	"github.com/hajimehoshi/ebiten"
+)
+
+func (e *Engine) PlaygroundDraw(screen *ebiten.Image) {
+	e.Domain.GetLevel(e.KContext.CurrentLevel)
+}
+
+func (e *Engine) PlaygroundUpdate() {
+	e.Domain.GetLevel(e.KContext.CurrentLevel)
+}

konstructor/konstructor.utils.go

@@ -1,53 +1,46 @@
-package konstructor
+package konstructor
-
+
-import (
+import (
-	"bytes"
+	"bytes"
-	"image"
+	"game/konstructor/entity"
-	"io/ioutil"
+	"image"
-	"log"
+	"io/ioutil"
-
+	"log"
-	"image/color"
+
-	_ "image/png"
+	_ "image/png"
-
+
-	"github.com/hajimehoshi/ebiten"
+	"github.com/hajimehoshi/ebiten"
-	"github.com/hajimehoshi/ebiten/examples/resources/fonts"
+	"github.com/hajimehoshi/ebiten/examples/resources/fonts"
-	"golang.org/x/image/font"
+	"golang.org/x/image/font"
-	"golang.org/x/image/font/opentype"
+	"golang.org/x/image/font/opentype"
-)
+)
-
+
-func LoadImage(path string) *ebiten.Image {
+func LoadImage(path string) *ebiten.Image {
-
+
-	file, err := ioutil.ReadFile(path)
+	file, err := ioutil.ReadFile(path)
-	if err != nil {
+	if err != nil {
-		log.Fatal(err)
+		log.Fatal(err)
-	}
+	}
-
+
-	img, _, err := image.Decode(bytes.NewReader(file))
+	img, _, err := image.Decode(bytes.NewReader(file))
-	if err != nil {
+	if err != nil {
-		log.Fatal(err)
+		log.Fatal(err)
-	}
+	}
-
+
-	out, err := ebiten.NewImageFromImage(img, 0)
+	out, err := ebiten.NewImageFromImage(img, 0)
-	if err != nil {
+	if err != nil {
-		log.Fatal(err)
+		log.Fatal(err)
-	}
+	}
-
+
-	return out
+	return out
-}
+}
-
+
-type FontLayout struct {
+func GetFontFace(layout entity.FontLayout) font.Face {
-	DPI           float64
+	tt, _ := opentype.Parse(fonts.MPlus1pRegular_ttf)
-	Size          float64
+	face, _ := opentype.NewFace(tt, &opentype.FaceOptions{
-	Color         color.Color
+		Size:    layout.DPI,
-	SelectedColor color.Color
+		DPI:     layout.Size,
-}
+		Hinting: font.HintingVertical,
-
+	})
-func GetFontFace(layout FontLayout) font.Face {
+	return face
-	tt, _ := opentype.Parse(fonts.MPlus1pRegular_ttf)
+}
-	face, _ := opentype.NewFace(tt, &opentype.FaceOptions{
-		Size:    layout.DPI,
-		DPI:     layout.Size,
-		Hinting: font.HintingVertical,
-	})
-	return face
-}

main.go

@@ -3,15 +3,15 @@ package main
 import (
 	"game/domain"
 	"game/konstructor"
+	"game/konstructor/entity"
 
 	"github.com/hajimehoshi/ebiten"
 )
 
 func main() {
-
 	k := konstructor.Konstructor{
-		KContext: &konstructor.KContext{
+		KContext: &entity.KContext{
-			Screen: konstructor.KContextScreen{
+			Screen: entity.KContextScreen{
 				Type:  "playground",
 				Value: "",
 			},
@@ -28,7 +28,7 @@ func main() {
 			},
 		},
 		Controller: &konstructor.Controller{
-			KeyMap: konstructor.KeyMap{
+			KeyMap: entity.KeyMap{
 				Up:      ebiten.KeyUp,
 				Down:    ebiten.KeyDown,
 				Right:   ebiten.KeyRight,
@@ -39,9 +39,9 @@ func main() {
 				Action3: ebiten.KeyEscape,
 			},
 		},
-		Settings: &konstructor.Settings{
+		Settings: &entity.Settings{
 			Name: "Game",
-			Screen: &konstructor.ScreenSettings{
+			Screen: &entity.ScreenSettings{
 				Width:  640,
 				Height: 480,
 			},