aboutsummaryrefslogtreecommitdiff
path: root/order.go
diff options
context:
space:
mode:
authorMartin Kagamino Lehoux <martin@lehoux.net>2026-01-15 22:05:38 +0100
committerMartin Kagamino Lehoux <martin@lehoux.net>2026-01-15 22:05:46 +0100
commit13626410c4d6db7fdc15ded5ee7865fcdbf0b88a (patch)
treea549d918804acb7682c857e742f1af189692cf62 /order.go
parentcf85fc095bc9b6ab4b49e4f88a5f04d7ac2fe74b (diff)
refactor: transition to struct-of-arrays ECS architecture
- Replace individual Entity structs with centralized component slices in Game struct (SoA layout). - Implement bitmask-based component lookup (CM_Position, CM_Move, etc.). - Convert logic from object-oriented Update() methods to standalone Systems (UpdateMoveSystem, UpdateGatherSystem, UpdateSpawnSystem). - Update rendering, selection, and input handling to iterate over component arrays.
Diffstat (limited to 'order.go')
-rw-r--r--order.go44
1 files changed, 24 insertions, 20 deletions
diff --git a/order.go b/order.go
index d6f1ccb..9c3d643 100644
--- a/order.go
+++ b/order.go
@@ -1,37 +1,41 @@
package main
import (
+ "log/slog"
+
"age_of_empires/ecs"
+ "age_of_empires/monad"
"age_of_empires/physics"
- "log/slog"
)
-type Order interface {
- Update(e *Entity, g *Game)
-}
+type OrderKind int
-func (e *Entity) UpdateOrder(g *Game) {
- if !e.Order.IsEnabled || e.Order.Value == nil {
- return
- }
- e.Order.Value.Update(e, g)
-}
+const (
+ OrderKindNone OrderKind = iota
+ OrderKindPatrol
+ OrderKindGather
+)
-func (e *Entity) MainAction(g *Game, destination physics.Point, entityAtDestination *Entity, moveMap physics.MoveMap) {
- if entityAtDestination != nil && entityAtDestination.ResourceSource.IsEnabled && e.ResourceGatherer.IsEnabled {
- Gather(e, entityAtDestination, g)
+func MainAction(g *Game, mainEntity ecs.Entity, target physics.Point, moveMap physics.MoveMap) {
+ mask := g.Mask[mainEntity]
+ targetEntity := g.entityAt(target)
+ gatherTargetRequired := ecs.CM_ResourceSource
+ mainGatherRequired := ecs.CM_ResourceGatherer | ecs.CM_Move
+ if targetEntity >= 0 && (g.Mask[targetEntity]&gatherTargetRequired == gatherTargetRequired) && (mask&mainGatherRequired == mainGatherRequired) {
+ Gather(g.getMoveMap(), g.Position[mainEntity], &g.Move[mainEntity], &g.Order[mainEntity], &g.ResourceGatherer[mainEntity], targetEntity, g.Position[targetEntity])
return
}
- if e.Move.IsEnabled {
- if e.Order.IsEnabled {
- e.Order.Value = nil
- }
- physics.StartMove(&e.Move, e.Position, destination, moveMap)
+ moveRequired := ecs.CM_Move | ecs.CM_Position
+ if mask&moveRequired == moveRequired {
+ position := g.Position[mainEntity]
+ g.Order[mainEntity] = OrderKindNone
+ g.Move[mainEntity] = physics.NewMove(position, target, moveMap)
return
}
- if e.Spawn.IsEnabled {
+ if mask&ecs.CM_Spawn == ecs.CM_Spawn {
slog.Info("Setting spawn target")
- e.Spawn.Value.SpawnTarget = ecs.C(destination)
+ spawn := &g.Spawn[mainEntity]
+ spawn.SpawnTarget = monad.Some(target)
return
}
}