From 420f2af0c4f442d2d64063849bba4727d798725b Mon Sep 17 00:00:00 2001 From: Zsolt Tasnadi Date: Fri, 7 Jul 2023 09:21:25 +0200 Subject: [PATCH] rename object to platform, refact of file names --- domain/domain.go | 2 +- domain/level.go | 10 +++---- domain/object_type.go | 29 ------------------- domain/{item_type.go => type.item.go} | 0 domain/{npc_type.go => type.npc.go} | 0 domain/type.platform.go | 29 +++++++++++++++++++ .../easy_ebitengine/screen.playground.go | 22 +++++++------- konstructor/interface.domain.go | 16 +++++----- .../{playground.item.go => object.item.go} | 0 .../{playground.npc.go => object.npc.go} | 0 konstructor/object.platform.go | 16 ++++++++++ konstructor/playground.object.go | 16 ---------- konstructor/screen.playground.go | 8 ++--- 13 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 domain/object_type.go rename domain/{item_type.go => type.item.go} (100%) rename domain/{npc_type.go => type.npc.go} (100%) create mode 100644 domain/type.platform.go rename konstructor/{playground.item.go => object.item.go} (100%) rename konstructor/{playground.npc.go => object.npc.go} (100%) create mode 100644 konstructor/object.platform.go delete mode 100644 konstructor/playground.object.go diff --git a/domain/domain.go b/domain/domain.go index ad15256..b5eb3ca 100644 --- a/domain/domain.go +++ b/domain/domain.go @@ -10,7 +10,7 @@ type Domain struct { } func (d *Domain) Init() { - d.InitObjectType() + d.InitPlatformType() d.InitItemType() d.InitNPCType() d.InitMenu() diff --git a/domain/level.go b/domain/level.go index 0c45154..4fe70fc 100644 --- a/domain/level.go +++ b/domain/level.go @@ -12,24 +12,24 @@ func (d *Domain) InitLevel() { Render: konstructor.Render{ Image: "assets/images/playgrounds/level_1_playground_1.png", }, - Objects: []konstructor.Object{ + Platforms: []konstructor.Platform{ { - ID: "test_object", + ID: "test_platform", Position: konstructor.Position{ X: 10, Y: 10, Z: 0, }, - Type: d.GetObjectType(TestObjectType), + Type: d.GetPlatformType(TestPlatformType), }, { - ID: "test_object2", + ID: "test_platform2", Position: konstructor.Position{ X: 50, Y: 50, Z: 0, }, - Type: d.GetObjectType(TestObjectType), + Type: d.GetPlatformType(TestPlatformType), }, }, Items: []konstructor.Item{ diff --git a/domain/object_type.go b/domain/object_type.go deleted file mode 100644 index aa11168..0000000 --- a/domain/object_type.go +++ /dev/null @@ -1,29 +0,0 @@ -package domain - -import "game/konstructor" - -const ( - TestObjectType konstructor.ObjectTypeMapKey = "test" -) - -func (d *Domain) InitObjectType() { - d.ObjectTypeMap = konstructor.ObjectTypeMap{ - TestObjectType: konstructor.ObjectType{ - ID: "test_object_type", - Render: konstructor.Render{ - Image: "assets/images/objects/test_object.png", - Width: 30, - Height: 30, - }, - }, - } -} - -func (d *Domain) GetObjectTypeMap() konstructor.ObjectTypeMap { - return d.ObjectTypeMap -} - -func (d *Domain) GetObjectType(name konstructor.ObjectTypeMapKey) konstructor.ObjectType { - value, _ := d.ObjectTypeMap[name] - return value -} diff --git a/domain/item_type.go b/domain/type.item.go similarity index 100% rename from domain/item_type.go rename to domain/type.item.go diff --git a/domain/npc_type.go b/domain/type.npc.go similarity index 100% rename from domain/npc_type.go rename to domain/type.npc.go diff --git a/domain/type.platform.go b/domain/type.platform.go new file mode 100644 index 0000000..9541d26 --- /dev/null +++ b/domain/type.platform.go @@ -0,0 +1,29 @@ +package domain + +import "game/konstructor" + +const ( + TestPlatformType konstructor.PlatformTypeMapKey = "test" +) + +func (d *Domain) InitPlatformType() { + d.PlatformTypeMap = konstructor.PlatformTypeMap{ + TestPlatformType: konstructor.PlatformType{ + ID: "test_platform_type", + Render: konstructor.Render{ + Image: "assets/images/platforms/test_platform.png", + Width: 30, + Height: 30, + }, + }, + } +} + +func (d *Domain) GetPlatformTypeMap() konstructor.PlatformTypeMap { + return d.PlatformTypeMap +} + +func (d *Domain) GetPlatformType(name konstructor.PlatformTypeMapKey) konstructor.PlatformType { + value, _ := d.PlatformTypeMap[name] + return value +} diff --git a/konstructor/engines/easy_ebitengine/screen.playground.go b/konstructor/engines/easy_ebitengine/screen.playground.go index 7259649..93aa8b9 100644 --- a/konstructor/engines/easy_ebitengine/screen.playground.go +++ b/konstructor/engines/easy_ebitengine/screen.playground.go @@ -16,7 +16,7 @@ func (e *Engine) PlaygroundUpdate() { func (e *Engine) PlaygroundDraw(screen *ebiten.Image) { e.PlaygroundBackgroundDraw(screen) - e.PlaygroundObjectsDraw(screen) + e.PlaygroundPlatformsDraw(screen) e.PlaygroundItemsDraw(screen) e.PlaygroundNPCsDraw(screen) } @@ -27,13 +27,13 @@ func (e *Engine) PlaygroundBackgroundDraw(screen *ebiten.Image) { screen.DrawImage(e.GetImage(render), &ebiten.DrawImageOptions{}) } -func (e *Engine) PlaygroundObjectsDraw(screen *ebiten.Image) { +func (e *Engine) PlaygroundPlatformsDraw(screen *ebiten.Image) { playground := e.GetPlayground() geoM := ebiten.GeoM{} - for _, object := range playground.Objects { - render := object.Type.Render + for _, platform := range playground.Platforms { + render := platform.Type.Render geoM.Reset() - geoM.Translate(float64(object.Position.X), float64(object.Position.Y)) + geoM.Translate(float64(platform.Position.X), float64(platform.Position.Y)) screen.DrawImage(e.GetImage(render), &ebiten.DrawImageOptions{ GeoM: geoM, }) @@ -43,10 +43,10 @@ func (e *Engine) PlaygroundObjectsDraw(screen *ebiten.Image) { func (e *Engine) PlaygroundItemsDraw(screen *ebiten.Image) { playground := e.GetPlayground() geoM := ebiten.GeoM{} - for _, object := range playground.Items { - render := object.Type.Render + for _, platform := range playground.Items { + render := platform.Type.Render geoM.Reset() - geoM.Translate(float64(object.Position.X), float64(object.Position.Y)) + geoM.Translate(float64(platform.Position.X), float64(platform.Position.Y)) screen.DrawImage(e.GetImage(render), &ebiten.DrawImageOptions{ GeoM: geoM, }) @@ -56,10 +56,10 @@ func (e *Engine) PlaygroundItemsDraw(screen *ebiten.Image) { func (e *Engine) PlaygroundNPCsDraw(screen *ebiten.Image) { playground := e.GetPlayground() geoM := ebiten.GeoM{} - for _, object := range playground.NPCs { - render := object.Type.Render + for _, platform := range playground.NPCs { + render := platform.Type.Render geoM.Reset() - geoM.Translate(float64(object.Position.X), float64(object.Position.Y)) + geoM.Translate(float64(platform.Position.X), float64(platform.Position.Y)) screen.DrawImage(e.GetImage(render), &ebiten.DrawImageOptions{ GeoM: geoM, }) diff --git a/konstructor/interface.domain.go b/konstructor/interface.domain.go index acf381c..4632b3b 100644 --- a/konstructor/interface.domain.go +++ b/konstructor/interface.domain.go @@ -1,12 +1,12 @@ package konstructor type DomainBaseFields struct { - MenuMap MenuMap - DialogMap DialogMap - Levels []Level - ObjectTypeMap ObjectTypeMap - ItemTypeMap ItemTypeMap - NPCTypeMap NPCTypeMap + MenuMap MenuMap + DialogMap DialogMap + Levels []Level + PlatformTypeMap PlatformTypeMap + ItemTypeMap ItemTypeMap + NPCTypeMap NPCTypeMap } type DomainInterface interface { @@ -23,8 +23,8 @@ type DomainInterface interface { GetLevels() []Level GetLevel(index int) Level - GetObjectTypeMap() ObjectTypeMap - GetObjectType(name ObjectTypeMapKey) ObjectType + GetPlatformTypeMap() PlatformTypeMap + GetPlatformType(name PlatformTypeMapKey) PlatformType GetItemTypeMap() ItemTypeMap GetItemType(name ItemTypeMapKey) ItemType diff --git a/konstructor/playground.item.go b/konstructor/object.item.go similarity index 100% rename from konstructor/playground.item.go rename to konstructor/object.item.go diff --git a/konstructor/playground.npc.go b/konstructor/object.npc.go similarity index 100% rename from konstructor/playground.npc.go rename to konstructor/object.npc.go diff --git a/konstructor/object.platform.go b/konstructor/object.platform.go new file mode 100644 index 0000000..da72856 --- /dev/null +++ b/konstructor/object.platform.go @@ -0,0 +1,16 @@ +package konstructor + +type PlatformTypeMapKey string + +type PlatformTypeMap map[PlatformTypeMapKey]PlatformType + +type PlatformType struct { + ID string + Render Render +} + +type Platform struct { + ID string + Type PlatformType + Position Position +} diff --git a/konstructor/playground.object.go b/konstructor/playground.object.go deleted file mode 100644 index db8069e..0000000 --- a/konstructor/playground.object.go +++ /dev/null @@ -1,16 +0,0 @@ -package konstructor - -type ObjectTypeMapKey string - -type ObjectTypeMap map[ObjectTypeMapKey]ObjectType - -type ObjectType struct { - ID string - Render Render -} - -type Object struct { - ID string - Type ObjectType - Position Position -} diff --git a/konstructor/screen.playground.go b/konstructor/screen.playground.go index 5cf3ddd..9643fd4 100644 --- a/konstructor/screen.playground.go +++ b/konstructor/screen.playground.go @@ -7,10 +7,10 @@ type Position struct { } type Playground struct { - Render Render - Objects []Object - NPCs []NPC - Items []Item + Render Render + Platforms []Platform + NPCs []NPC + Items []Item } type Level struct {