rename object to platform, refact of file names

domain/domain.go

@@ -10,7 +10,7 @@ type Domain struct {
 }
 
 func (d *Domain) Init() {
-	d.InitObjectType()
+	d.InitPlatformType()
 	d.InitItemType()
 	d.InitNPCType()
 	d.InitMenu()

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{

domain/object_type.go

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

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

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 {
+	for _, platform := range playground.Platforms {
-		render := object.Type.Render
+		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 {
+	for _, platform := range playground.Items {
-		render := object.Type.Render
+		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 {
+	for _, platform := range playground.NPCs {
-		render := object.Type.Render
+		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,
 		})

konstructor/interface.domain.go

@@ -4,7 +4,7 @@ type DomainBaseFields struct {
 	MenuMap         MenuMap
 	DialogMap       DialogMap
 	Levels          []Level
-	ObjectTypeMap ObjectTypeMap
+	PlatformTypeMap PlatformTypeMap
 	ItemTypeMap     ItemTypeMap
 	NPCTypeMap      NPCTypeMap
 }
@@ -23,8 +23,8 @@ type DomainInterface interface {
 	GetLevels() []Level
 	GetLevel(index int) Level
 
-	GetObjectTypeMap() ObjectTypeMap
+	GetPlatformTypeMap() PlatformTypeMap
-	GetObjectType(name ObjectTypeMapKey) ObjectType
+	GetPlatformType(name PlatformTypeMapKey) PlatformType
 
 	GetItemTypeMap() ItemTypeMap
 	GetItemType(name ItemTypeMapKey) ItemType

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

konstructor/playground.object.go

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

konstructor/screen.playground.go

@@ -8,7 +8,7 @@ type Position struct {
 
 type Playground struct {
 	Render    Render
-	Objects []Object
+	Platforms []Platform
 	NPCs      []NPC
 	Items     []Item
 }