games/gorpg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

entity layer

Browse Source
This commit is contained in:
Zsolt Tasnadi
2023-07-04 22:58:23 +02:00
parent 93b2725c8a
commit e9c35f01ab
19 changed files with 364 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
domain/dialog.go
View File

@@ -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{
ChoiceFont: konstructor.FontLayout{
Layout: entity.DialogLayout{
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
}

8
domain/domain.go
View File

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

18
domain/level.go
View File

@@ -1,28 +1,26 @@
package domain
import (
"game/konstructor"
)
import "game/konstructor/entity"
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]
}

20
domain/menu.go
View File

@@ -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{
MenuItemFont: konstructor.FontLayout{
Layout: entity.MenuLayout{
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{
MenuItemFont: konstructor.FontLayout{
Layout: entity.MenuLayout{
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
}

14
konstructor/entity/entity.controller.go Normal file
View File

@@ -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
}

30
konstructor/entity/entity.dialog.go Normal file
View File

@@ -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
}
}

10
konstructor/entity/entity.font.go Normal file
View File

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

30
konstructor/entity/entity.menu.go Normal file
View File

@@ -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
}
}

142
konstructor/playground.go → konstructor/entity/entity.playground.go
View File

@@ -1,77 +1,65 @@
package konstructor
import (
"github.com/hajimehoshi/ebiten"
)
type Position struct {
X int
Y int
Z int
}
type RenderOptions struct {
Image string
Width int
Height int
}
type ObjectType struct {
ID string
RenderOptions RenderOptions
}
type Object struct {
ID string
Type ObjectType
Position Position
}
type NPCType struct {
ID string
RenderOptions RenderOptions
}
type NPC struct {
ID string
Type NPCType
Position Position
}
type Player struct {
ID string
RenderOptions RenderOptions
Position Position
}
type ItemType struct {
ID string
RenderOptions RenderOptions
}
type Item struct {
ID string
Type ItemType
Position Position
}
type Playground struct {
Background string
Objects []Object
NPCs []NPC
Items []Item
}
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)
}
package entity
type Position struct {
X int
Y int
Z int
}
type RenderOptions struct {
Image string
Width int
Height int
}
type ObjectType struct {
ID string
RenderOptions RenderOptions
}
type Object struct {
ID string
Type ObjectType
Position Position
}
type NPCType struct {
ID string
RenderOptions RenderOptions
}
type NPC struct {
ID string
Type NPCType
Position Position
}
type Player struct {
ID string
RenderOptions RenderOptions
Position Position
}
type ItemType struct {
ID string
RenderOptions RenderOptions
}
type Item struct {
ID string
Type ItemType
Position Position
}
type Playground struct {
Background string
Objects []Object
NPCs []NPC
Items []Item
}
type Level struct {
ID string
Name string
Playgrounds []Playground
}

11
konstructor/entity/entity.settings.go Normal file
View File

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

2
konstructor/kcontext.go → konstructor/entity/konstructor.kcontext.go
View File

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

136
konstructor/controller.go → konstructor/konstructor.controller.go
View File

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

5
konstructor/engine.go → konstructor/konstructor.engine.go
View File

@@ -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
KContext *KContext
Settings *entity.Settings
KContext *entity.KContext
}
func (e *Engine) Layout(outsideWidth, outsideHeight int) (int, int) {

25
konstructor/konstructor.go
View File

@@ -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
SetMenu(name string, menu Menu)
GetDialog(name string) Dialog
SetDialog(name string, menu Dialog)
GetLevel(index int) Level
}
type ScreenSettings struct {
Width int
Height int
}
type Settings struct {
Name string
Screen *ScreenSettings
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
Settings *Settings
KContext *KContext
Settings *entity.Settings
KContext *entity.KContext
}
func (k Konstructor) Init() {

29
konstructor/dialog.go → konstructor/konstructor.screen.dialog.go
View File

@@ -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)

99
konstructor/menu.go → konstructor/konstructor.screen.menu.go
View File

@@ -1,64 +1,35 @@
package konstructor
import (
"image/color"
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/text"
)
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
}
}
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)
}
package konstructor
import (
"github.com/hajimehoshi/ebiten"
"github.com/hajimehoshi/ebiten/text"
)
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)
}

13
konstructor/konstructor.screen.playground.go Normal file
View File

@@ -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)
}

99
konstructor/utils.go → konstructor/konstructor.utils.go
View File

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

12
main.go
View File

@@ -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{
Screen: konstructor.KContextScreen{
KContext: &entity.KContext{
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,
},