thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ecs attempt

Browse Source
This commit is contained in:
anton.gurov 2019-11-05 16:44:50 +03:00
parent 284cdc5315
commit 096ff2b182
6 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/game/main.go
View File

@ -4,6 +4,7 @@ import (
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"lab.zaar.be/thefish/alchemyst-go/engine/ecs" "lab.zaar.be/thefish/alchemyst-go/engine/ecs"
"lab.zaar.be/thefish/alchemyst-go/engine/ecs/systems"
"lab.zaar.be/thefish/alchemyst-go/engine/gamemap" "lab.zaar.be/thefish/alchemyst-go/engine/gamemap"
"lab.zaar.be/thefish/alchemyst-go/engine/gamemap/mapgens" "lab.zaar.be/thefish/alchemyst-go/engine/gamemap/mapgens"
"lab.zaar.be/thefish/alchemyst-go/engine/gamestate" "lab.zaar.be/thefish/alchemyst-go/engine/gamestate"
@ -112,12 +113,11 @@ func main() {
controller.AddComponent(player, rooms[0].Center) //implicit Coords controller.AddComponent(player, rooms[0].Center) //implicit Coords
render := mob.MobRenderSystem{EntityController: controller} render := systems.MobRenderSystem{EntityController: controller}
controller.AddSystem(render, 1) controller.AddSystem(render, 1)
level.Player = player
//but every call to bearlibterminal must be wrapped to closure and passed to mainfunc //but every call to bearlibterminal must be wrapped to closure and passed to mainfunc
var exit = false var exit = false

32
engine/ecs/controller.go
View File

@ -12,9 +12,9 @@ type Controller struct {
systems map[reflect.Type]System systems map[reflect.Type]System
sortedSystems map[int][]System sortedSystems map[int][]System
priorityKeys []int priorityKeys []int
nextEntityID int nextEntityID Entity
components map[reflect.Type][]int components map[reflect.Type][]Entity
entities map[int]map[reflect.Type]Component entities map[Entity]map[reflect.Type]Component
deadEntities []int deadEntities []int
// The component map will keep track of what components are available // The component map will keep track of what components are available
@ -28,8 +28,8 @@ func NewController() *Controller {
controller.sortedSystems = make(map[int][]System) controller.sortedSystems = make(map[int][]System)
controller.priorityKeys = []int{} controller.priorityKeys = []int{}
controller.nextEntityID = 0 controller.nextEntityID = 0
controller.components = make(map[reflect.Type][]int) controller.components = make(map[reflect.Type][]Entity)
controller.entities = make(map[int]map[reflect.Type]Component) controller.entities = make(map[Entity]map[reflect.Type]Component)
controller.deadEntities = []int{} controller.deadEntities = []int{}
controller.componentMap = make(map[string]Component) controller.componentMap = make(map[string]Component)
@ -38,7 +38,7 @@ func NewController() *Controller {
// Create a new entity in the world. An entity is simply a unique integer. // Create a new entity in the world. An entity is simply a unique integer.
// If any components are provided, they will be associated with the created entity // If any components are provided, they will be associated with the created entity
func (c *Controller) CreateEntity(components []Component) int { func (c *Controller) CreateEntity(components []Component) Entity {
c.nextEntityID += 1 c.nextEntityID += 1
if len(components) > 0 { if len(components) > 0 {
@ -54,7 +54,7 @@ func (c *Controller) CreateEntity(components []Component) int {
// DeleteEntity removes an entity, all component instances attached to that entity, and any components associations with // DeleteEntity removes an entity, all component instances attached to that entity, and any components associations with
// that entity // that entity
func (c *Controller) DeleteEntity(entity int) { func (c *Controller) DeleteEntity(entity Entity) {
// First, delete all the component associations for the entity to be removed // First, delete all the component associations for the entity to be removed
for k, _ := range c.entities[entity] { for k, _ := range c.entities[entity] {
c.RemoveComponent(entity, k) c.RemoveComponent(entity, k)
@ -87,7 +87,7 @@ func (c *Controller) GetMappedComponentClass(componentName string) Component {
// AddComponent adds a component to an entity. The component is added to the global list of components for the // AddComponent adds a component to an entity. The component is added to the global list of components for the
// processor, and also directly associated with the entity itself. This allows for flexible checking of components, // processor, and also directly associated with the entity itself. This allows for flexible checking of components,
// as you can check which entites are associated with a component, and vice versa. // as you can check which entites are associated with a component, and vice versa.
func (c *Controller) AddComponent(entity int, component Component) { func (c *Controller) AddComponent(entity Entity, component Component) {
// First, get the type of the component // First, get the type of the component
componentType := reflect.TypeOf(component) componentType := reflect.TypeOf(component)
@ -104,7 +104,7 @@ func (c *Controller) AddComponent(entity int, component Component) {
} }
// HasComponent checks a given entity to see if it has a given component associated with it // HasComponent checks a given entity to see if it has a given component associated with it
func (c *Controller) HasComponent(entity int, componentType reflect.Type) bool { func (c *Controller) HasComponent(entity Entity, componentType reflect.Type) bool {
if _, ok := c.entities[entity][componentType]; ok { if _, ok := c.entities[entity][componentType]; ok {
return true return true
} else { } else {
@ -113,7 +113,7 @@ func (c *Controller) HasComponent(entity int, componentType reflect.Type) bool {
} }
// GetComponent returns the component instance for a component type, if one exists for the provided entity // GetComponent returns the component instance for a component type, if one exists for the provided entity
func (c *Controller) GetComponent(entity int, componentType reflect.Type) Component { func (c *Controller) GetComponent(entity Entity, componentType reflect.Type) Component {
// Check the given entity has the provided component // Check the given entity has the provided component
if c.HasComponent(entity, componentType) { if c.HasComponent(entity, componentType) {
return c.entities[entity][componentType] return c.entities[entity][componentType]
@ -123,7 +123,7 @@ func (c *Controller) GetComponent(entity int, componentType reflect.Type) Compon
} }
// GetEntity gets a specific entity, and all of its component instances // GetEntity gets a specific entity, and all of its component instances
func (c *Controller) GetEntity(entity int) map[reflect.Type]Component { func (c *Controller) GetEntity(entity Entity) map[reflect.Type]Component {
for i, _ := range c.entities { for i, _ := range c.entities {
if i == entity { if i == entity {
return c.entities[entity] return c.entities[entity]
@ -134,14 +134,14 @@ func (c *Controller) GetEntity(entity int) map[reflect.Type]Component {
} }
// GetEntities returns a map of all entities and their component instances // GetEntities returns a map of all entities and their component instances
func (c *Controller) GetEntities() map[int]map[reflect.Type]Component { func (c *Controller) GetEntities() map[Entity]map[reflect.Type]Component {
return c.entities return c.entities
} }
// GetEntitiesWithComponent returns a list of all entities with a given component attached // GetEntitiesWithComponent returns a list of all entities with a given component attached
// TODO: Allow for passing a list of components // TODO: Allow for passing a list of components
func (c *Controller) GetEntitiesWithComponent(componentType reflect.Type) []int { func (c *Controller) GetEntitiesWithComponent(componentType reflect.Type) []Entity {
entitiesWithComponent := make([]int, 0) entitiesWithComponent := make([]Entity, 0)
for entity := range c.entities { for entity := range c.entities {
if c.HasComponent(entity, componentType) { if c.HasComponent(entity, componentType) {
entitiesWithComponent = append(entitiesWithComponent, entity) entitiesWithComponent = append(entitiesWithComponent, entity)
@ -152,7 +152,7 @@ func (c *Controller) GetEntitiesWithComponent(componentType reflect.Type) []int
} }
// UpdateComponent updates a component on an entity with a new version of the same component // UpdateComponent updates a component on an entity with a new version of the same component
func (c *Controller) UpdateComponent(entity int, componentType reflect.Type, newComponent Component) int { func (c *Controller) UpdateComponent(entity Entity, componentType reflect.Type, newComponent Component) Entity {
// First, remove the component in question (Don't actually update things, but rather remove and replace) // First, remove the component in question (Don't actually update things, but rather remove and replace)
c.RemoveComponent(entity, componentType) c.RemoveComponent(entity, componentType)
@ -165,7 +165,7 @@ func (c *Controller) UpdateComponent(entity int, componentType reflect.Type, new
// DeleteComponent will delete a component instance from an entity, based on component type. It will also remove the // DeleteComponent will delete a component instance from an entity, based on component type. It will also remove the
// association between the component and the entity, and remove the component from the processor completely if no // association between the component and the entity, and remove the component from the processor completely if no
// other entities are using it. // other entities are using it.
func (c *Controller) RemoveComponent(entity int, componentType reflect.Type) int { func (c *Controller) RemoveComponent(entity Entity, componentType reflect.Type) Entity {
// Find the index of the entity to operate on in the components slice // Find the index of the entity to operate on in the components slice
index := -1 index := -1
for i, v := range c.components[componentType] { for i, v := range c.components[componentType] {

12
engine/mob/mob_render_system.go → engine/ecs/systems/mob_render_system.go
View File

@ -1,12 +1,14 @@
package mob package systems
import ( import (
"lab.zaar.be/thefish/alchemyst-go/engine/ecs" "lab.zaar.be/thefish/alchemyst-go/engine/ecs"
"lab.zaar.be/thefish/alchemyst-go/engine/types" "lab.zaar.be/thefish/alchemyst-go/engine/types"
"lab.zaar.be/thefish/alchemyst-go/ui/mainwindow"
) )
type MobRenderSystem struct { type MobRenderSystem struct {
EntityController *ecs.Controller EntityController *ecs.Controller
Layer *mainwindow.Layer
} }
func (mrs MobRenderSystem) Process(){ func (mrs MobRenderSystem) Process(){
@ -17,13 +19,15 @@ func (mrs MobRenderSystem) Process(){
pos := mrs.EntityController.GetComponent(e, types.Coords{}.TypeOf()).(types.Coords) pos := mrs.EntityController.GetComponent(e, types.Coords{}.TypeOf()).(types.Coords)
appearance := mrs.EntityController.GetComponent(e, types.Appearance{}.TypeOf()).(types.Appearance) appearance := mrs.EntityController.GetComponent(e, types.Appearance{}.TypeOf()).(types.Appearance)
//fixme
// Clear the cell this entity occupies, so it is the only glyph drawn there // Clear the cell this entity occupies, so it is the only glyph drawn there
for i := 0; i <= 2; i++ { for i := 0; i <= 2; i++ {
//fixme mrs.Layer.ClearArea(pos.X, pos.Y,1,1)
gogue.ClearArea(pos.X, pos.Y, 1, 1, i) //gogue.ClearArea(pos.X, pos.Y, 1, 1, i)
} }
//fixme //fixme
gogue.PrintGlyph(pos.X, pos.Y, appearance.Glyph, "", appearance.Layer) mrs.Layer.WithRawColor(appearance.ColorSet.Fg.GetColor()).Put(pos.X, pos.Y, appearance.Glyph)
//gogue.PrintGlyph(pos.X, pos.Y, appearance.Glyph, "", appearance.Layer)
} }
} }
} }

2
engine/gamestate/gamestate.go
View File

@ -2,7 +2,6 @@ package gamestate
import ( import (
"lab.zaar.be/thefish/alchemyst-go/engine/gamemap" "lab.zaar.be/thefish/alchemyst-go/engine/gamemap"
"lab.zaar.be/thefish/alchemyst-go/engine/mob"
) )
type GameState struct { type GameState struct {
@ -13,7 +12,6 @@ type GameState struct {
FovRecompute chan struct{} FovRecompute chan struct{}
Redraw chan struct{} Redraw chan struct{}
Level *gamemap.Level Level *gamemap.Level
Player *mob.Player
} }
// do runs f on the main thread. // do runs f on the main thread.

7
engine/mob/mob.go
View File

@ -18,9 +18,10 @@ func (m *Mob) Walk(level *gamemap.Level, dx, dy int) {
if level.GetTile(newCoords).BlocksPass { if level.GetTile(newCoords).BlocksPass {
return return
} }
if level.Objects.At(newCoords).HasComponent("block_pass") { //fixme
//if level.Objects.At(newCoords).HasComponent("block_pass") {
} //
//}
fmt.Printf("new coords: %d, %d\n", m.Coords.X, m.Coords.Y) fmt.Printf("new coords: %d, %d\n", m.Coords.X, m.Coords.Y)
} }

21
ui/mainwindow/viewport.go
View File

@ -6,6 +6,7 @@ import (
"lab.zaar.be/thefish/alchemyst-go/engine/fov" "lab.zaar.be/thefish/alchemyst-go/engine/fov"
"lab.zaar.be/thefish/alchemyst-go/engine/fov/precomputed_shade" "lab.zaar.be/thefish/alchemyst-go/engine/fov/precomputed_shade"
"lab.zaar.be/thefish/alchemyst-go/engine/gamestate" "lab.zaar.be/thefish/alchemyst-go/engine/gamestate"
"lab.zaar.be/thefish/alchemyst-go/engine/mob"
"lab.zaar.be/thefish/alchemyst-go/engine/types" "lab.zaar.be/thefish/alchemyst-go/engine/types"
"time" "time"
) )
@ -14,12 +15,12 @@ var NotInViewError = errors.New("not in ViewPort")
type ViewPort struct { type ViewPort struct {
*types.Rect *types.Rect
cameraCoords types.Coords cameraCoords types.Coords
layer *Layer layer *Layer
Fov fov.Fov Fov fov.Fov
PlayerCoords types.Coords Player mob.Player
PlayerTorchRadius int TorchRadius int
animateTiles *time.Ticker animateTiles *time.Ticker
} }
func NewViewPort(x, y, w, h int, layer *Layer) *ViewPort { func NewViewPort(x, y, w, h int, layer *Layer) *ViewPort {
@ -32,7 +33,7 @@ func NewViewPort(x, y, w, h int, layer *Layer) *ViewPort {
Fov: computedFov, Fov: computedFov,
} }
vp.PlayerTorchRadius = 11 vp.TorchRadius = 12
vp.animateTiles = time.NewTicker(time.Second / 12) vp.animateTiles = time.NewTicker(time.Second / 12)
return &vp return &vp
@ -45,7 +46,7 @@ func (vp *ViewPort) Close() {
func (vp *ViewPort) Move(state *gamestate.GameState) { func (vp *ViewPort) Move(state *gamestate.GameState) {
c := &state.Player.Coords c := &state.Level.Player.HasComponent(types.Coords{}).Coords
x := c.X - vp.Rect.W/2 x := c.X - vp.Rect.W/2
y := c.Y - vp.Rect.H/2 y := c.Y - vp.Rect.H/2
@ -103,7 +104,7 @@ func (vp *ViewPort) Render(state *gamestate.GameState) {
vp.layer.ClearRect(vp.Rect) vp.layer.ClearRect(vp.Rect)
fovRecompute = true fovRecompute = true
redraw = true redraw = true
vp.Fov.ComputeFov(state.Level, state.Player.Coords, vp.PlayerTorchRadius) vp.Fov.ComputeFov(state.Level, state.Level.Player.Coords, vp.TorchRadius)
} }
//if redraw { //if redraw {
@ -121,7 +122,7 @@ func (vp *ViewPort) Render(state *gamestate.GameState) {
} }
} }
//mobs //mobs
pc, err := vp.ToVPCoords(state.Player.Coords) pc, err := vp.ToVPCoords(state.Level.Player.Coords)
_ = pc _ = pc
if err != nil { if err != nil {
fmt.Println("error on getting player position") fmt.Println("error on getting player position")