Action system and speed fixes (#7)

* Add .idea and macOS junk to gitignore

* Update modules

* Scale speed system using global scale

* Rename character system to action and fix speed

* Break character code out of system to util
* Rename system to action to reflect this
* Fix speed system by using delta only once

.gitignore

@@ -1,3 +1,11 @@
+# Tiled session data can cause weird issues
 *.tiled-session
 
+# build data
 bin
+
+# macOS junk
+.DS_Store
+
+# JetBrains IDE stuff
+.idea

go.mod

@@ -4,25 +4,16 @@ go 1.16
 
 require (
 	github.com/EngoEngine/ecs v1.0.5
-	github.com/EngoEngine/engo v1.0.6-0.20210314213613-b700def02163
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-gl/gl v0.0.0-20210315015930-ae072cafe09d // indirect
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210311203641-62640a716d48 // indirect
-	github.com/go-gl/mathgl v1.0.0 // indirect
-	github.com/hajimehoshi/go-mp3 v0.3.1 // indirect
-	github.com/hajimehoshi/oto v0.7.1 // indirect
-	github.com/jfreymuth/oggvorbis v1.0.3 // indirect
-	github.com/srwiley/oksvg v0.0.0-20210209000435-a757b9cbd472 // indirect
-	github.com/stretchr/testify v1.7.0 // indirect
-	github.com/veandco/go-sdl2 v0.4.5 // indirect
-	github.com/vulkan-go/vulkan v0.0.0-20201213112254-a536091a798a // indirect
-	golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect
-	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
-	golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08 // indirect
-	golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4 // indirect
-	golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa // indirect
-	golang.org/x/text v0.3.5 // indirect
+	github.com/EngoEngine/engo v1.0.6
+	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec // indirect
+	github.com/hajimehoshi/oto v1.0.1 // indirect
+	github.com/srwiley/oksvg v0.0.0-20211120171407-1837d6608d8c // indirect
+	github.com/veandco/go-sdl2 v0.4.10 // indirect
+	golang.org/x/exp v0.0.0-20211221223016-e29036178569 // indirect
+	golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
+	golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee // indirect
+	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )
-
-replace github.com/EngoEngine/engo => github.com/eth0net/engo v1.0.6-0.20210314213613-b700def02163

scenes/game/scene.go

@@ -8,7 +8,7 @@ import (
 	"github.com/EngoEngine/engo"
 	"github.com/EngoEngine/engo/common"
 	"github.com/eth0net/magicgame/assets"
-	"github.com/eth0net/magicgame/systems/character"
+	"github.com/eth0net/magicgame/systems/action"
 	"github.com/eth0net/magicgame/util"
 )
 
@@ -53,7 +53,7 @@ func (g *Scene) Setup(u engo.Updater) {
 	}
 	speedSystem.Level = tilemap.Level
 
-	player, err := character.NewCharacter(character.NewCharacterOptions{
+	player, err := util.NewCharacter(util.NewCharacterOptions{
 		Position:       engo.Point{X: 800, Y: 600},
 		SpritesheetURL: spritesheetURL,
 		CellWidth:      32,
@@ -67,7 +67,7 @@ func (g *Scene) Setup(u engo.Updater) {
 	player.CollisionComponent.Main = 1
 	player.ControlComponent.Enabled = true
 
-	npc, err := character.NewCharacter(character.NewCharacterOptions{
+	npc, err := util.NewCharacter(util.NewCharacterOptions{
 		Position:       engo.Point{X: 800, Y: 568},
 		SpritesheetURL: "spritesheets/Female 24-1.png",
 		CellWidth:      32,
@@ -80,10 +80,10 @@ func (g *Scene) Setup(u engo.Updater) {
 	}
 	npc.CollisionComponent.Main = 1
 	npc.CollisionComponent.Group = 1
-	npc.CharacterComponent.Schedule = character.Schedule{
-		Actions: []character.Action{
-			{Type: character.ActWalkTo, Point: engo.Point{X: 900, Y: 600}},
-			{Type: character.ActWalkTo, Point: engo.Point{X: 700, Y: 600}},
+	npc.ActionComponent.Schedule = action.Schedule{
+		Actions: []action.Action{
+			{Type: action.ActWalkTo, Point: engo.Point{X: 900, Y: 600}},
+			{Type: action.ActWalkTo, Point: engo.Point{X: 700, Y: 600}},
 		},
 		Loop: true,
 	}
@@ -98,7 +98,7 @@ func (g *Scene) Setup(u engo.Updater) {
 	g.World.AddSystemInterface(renderSystem, renderable, nil)
 	g.World.AddSystemInterface(animationSystem, animationable, nil)
 	g.World.AddSystemInterface(collisionSystem, collisionable, nil)
-	g.World.AddSystemInterface(characterSystem, characterable, nil)
+	g.World.AddSystemInterface(actionSystem, actionable, nil)
 	g.World.AddSystemInterface(controlSystem, controlable, nil)
 	g.World.AddSystemInterface(speedSystem, speedable, nil)
 	g.World.AddSystem(entityScroller)

scenes/game/variables.go

@@ -2,7 +2,7 @@ package game
 
 import (
 	"github.com/EngoEngine/engo/common"
-	"github.com/eth0net/magicgame/systems/character"
+	"github.com/eth0net/magicgame/systems/action"
 	"github.com/eth0net/magicgame/systems/control"
 	"github.com/eth0net/magicgame/systems/speed"
 )
@@ -12,7 +12,7 @@ var (
 	animationSystem = &common.AnimationSystem{}
 	collisionSystem = &common.CollisionSystem{Solids: 1}
 	renderSystem    = &common.RenderSystem{}
-	characterSystem = &character.CharacterSystem{}
+	actionSystem    = &action.ActionSystem{}
 	controlSystem   = &control.ControlSystem{}
 	speedSystem     = &speed.SpeedSystem{}
 )
@@ -22,7 +22,7 @@ var (
 	animationable *common.Animationable
 	collisionable *common.Collisionable
 	renderable    *common.Renderable
-	characterable *character.Characterable
+	actionable    *action.Actionable
 	controlable   *control.Controlable
 	speedable     *speed.Speedable
 )

systems/character/action.go → systems/action/action.go

@@ -1,4 +1,4 @@
-package character
+package action
 
 import (
 	"github.com/EngoEngine/engo"
@@ -7,43 +7,43 @@ import (
 // ActionType indicates the type of an Action.
 type ActionType int
 
-// ActionTypes available for use in Character Schedules.
+// ActionTypes available for use in Schedules.
 const (
-	// ActStop stops Character movement, preserving the direction.
+	// ActStop stops movement, preserving the direction.
 	ActStop ActionType = iota
 
-	// ActTurn turns the Character to face the direction
-	// indicated by Point and stops Character movement.
+	// ActTurn turns the Entity to face the direction
+	// indicated by Point and stops movement.
 	ActTurn
 
-	// ActWalk makes the Character walk in the direction
+	// ActWalk makes the Entity walk in the direction
 	// indicated by Point until Duration has passed.
 	ActWalk
 
-	// ActRun makes the Character run in the direction
+	// ActRun makes the Entity run in the direction
 	// indicated by Point until Duration has passed.
 	ActRun
 
-	// ActTeleport teleports the Character in the direction
+	// ActTeleport teleports the Entity in the direction
 	// indicated by Point until Duration has passed.
 	ActTeleport
 
-	// ActTurnTo turns the Character to face the location
+	// ActTurnTo turns the Entity to face the location
 	// indicated by Point and updates the SpeedComponent.
 	ActTurnTo
 
-	// ActWalkTo makes the Character walk to the location indicated by Point.
+	// ActWalkTo walks the Entity to the location indicated by Point.
 	ActWalkTo
 
-	// ActRunTo makes the Character run to the location indicated by Point.
+	// ActRunTo runs the Entity to the location indicated by Point.
 	ActRunTo
 
-	// ActTeleportTo teleports the Character to the location indicated by Point.
+	// ActTeleportTo teleports the Entity to the location indicated by Point.
 	ActTeleportTo
 
 	// Other ideas:
 	// FollowPath
-	// FollowCharacter
+	// FollowEntity
 	// FollowSpaceComponent
 	// Interact
 	// Attack
@@ -53,10 +53,10 @@ const (
 	// Anything else
 )
 
-// An Action defines a single act for a Character.
-// Actions are used to create Character Schedules.
+// An Action defines a single act for a Entity.
+// Actions are used to create Schedules.
 type Action struct {
-	// Type determines what to do to the Character
+	// Type determines what to do to the Entity
 	// and how to interpret the other Action fields.
 	Type ActionType
 

systems/action/component.go

@@ -0,0 +1,11 @@
+package action
+
+// ActionComponent marks entities for use with a ActionSystem.
+type ActionComponent struct {
+	Schedule
+}
+
+// GetActionComponent provides type safe access to ActionComponent.
+func (ac *ActionComponent) GetActionComponent() *ActionComponent {
+	return ac
+}

systems/action/constants.go

@@ -0,0 +1,14 @@
+package action
+
+// Animation names for Entities to implement,
+// used by ActionSystem to trigger Animations.
+const (
+	AnimationMoveUp    string = "MoveUp"
+	AnimationMoveDown  string = "MoveDown"
+	AnimationMoveLeft  string = "MoveLeft"
+	AnimationMoveRight string = "MoveRight"
+	AnimationStopUp    string = "StopUp"
+	AnimationStopDown  string = "StopDown"
+	AnimationStopLeft  string = "StopLeft"
+	AnimationStopRight string = "StopRight"
+)

systems/character/entity.go → systems/action/entity.go

@@ -1,4 +1,4 @@
-package character
+package action
 
 import (
 	"github.com/EngoEngine/ecs"
@@ -7,17 +7,17 @@ import (
 	"github.com/eth0net/magicgame/systems/speed"
 )
 
-type characterEntity struct {
+type actionEntity struct {
 	*ecs.BasicEntity
 	*common.AnimationComponent
 	*common.SpaceComponent
-	*CharacterComponent
+	*ActionComponent
 	*speed.SpeedComponent
 }
 
-// setAnimation sets the characterEntity Animation
+// setAnimation sets the actionEntity Animation
 // using the current state of the SpeedComponent.
-func (ce *characterEntity) setAnimation() {
+func (ce *actionEntity) setAnimation() {
 	point := ce.GetSpeedComponent().Point
 	currentAnimation := ce.AnimationComponent.CurrentAnimation
 	if currentAnimation == nil {
@@ -62,10 +62,10 @@ func (ce *characterEntity) setAnimation() {
 	}
 }
 
-// runSchedule executes code on the characterEntity
+// runSchedule executes code on the actionEntity
 // according to the current Action for the Schedule
 // and then updates the Schedule accordingly.
-func (ce *characterEntity) runSchedule(dt float32) {
+func (ce *actionEntity) runSchedule(dt float32) {
 	actionPtr := ce.CurrentAction()
 	if actionPtr == nil {
 		return
@@ -79,43 +79,35 @@ func (ce *characterEntity) runSchedule(dt float32) {
 	case ActStop:
 		ce.SpeedComponent.Point = engo.Point{}
 		actComplete = true
-		break
 
 	case ActTurn:
 		ce.SpeedComponent.Point = action.Point
 		ce.setAnimation()
 		ce.SpeedComponent.Point = engo.Point{}
 		ce.setAnimation()
 		actComplete = true
-		break
 
 	case ActWalk:
 		vector, _ := action.Point.Normalize()
-		vector.MultiplyScalar(dt)
-
 		engo.Mailbox.Dispatch(speed.SpeedMessage{
 			BasicEntity: ce.BasicEntity,
 			Point:       vector,
 		})
 		actComplete = true
-		break
 
 	case ActRun:
 		vector, _ := action.Point.Normalize()
-		vector.MultiplyScalar(dt * 2)
-
+		vector.MultiplyScalar(2)
 		engo.Mailbox.Dispatch(speed.SpeedMessage{
 			BasicEntity: ce.BasicEntity,
 			Point:       vector,
 		})
 		actComplete = true
-		break
 
 	case ActTeleport:
 		vector := action.Point.MultiplyScalar(dt)
 		ce.SpaceComponent.Position.Add(*vector)
 		actComplete = true
-		break
 
 	case ActTurnTo:
 		direction := action.Point.Subtract(ce.SpaceComponent.Position)
@@ -124,39 +116,34 @@ func (ce *characterEntity) runSchedule(dt float32) {
 		ce.SpeedComponent.Point = engo.Point{}
 		ce.setAnimation()
 		actComplete = ce.SpeedComponent.Point == action.Point
-		break
 
 	case ActWalkTo:
 		vector := action.Point
 		vector.Subtract(ce.SpaceComponent.Position)
 		vector, _ = vector.Normalize()
-		vector.MultiplyScalar(dt)
 		engo.Mailbox.Dispatch(speed.SpeedMessage{
 			BasicEntity: ce.BasicEntity,
 			Point:       vector,
 		})
 		if ce.SpaceComponent.Position.Equal(action.Point) {
 			actComplete = true
 		}
-		break
 
 	case ActRunTo:
 		direction := action.Point.Subtract(ce.SpaceComponent.Position)
 		vector, _ := direction.Normalize()
-		vector.MultiplyScalar(dt * 2)
+		vector.MultiplyScalar(2)
 		engo.Mailbox.Dispatch(speed.SpeedMessage{
 			BasicEntity: ce.BasicEntity,
 			Point:       vector,
 		})
 		if ce.SpaceComponent.Position.Equal(action.Point) {
 			actComplete = true
 		}
-		break
 
 	case ActTeleportTo:
 		ce.SpaceComponent.Position = action.Point
 		actComplete = true
-		break
 	}
 
 	ce.currentDuration += dt