josh/ichigo
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

more load/prepare tweaks

Browse source
This commit is contained in:
Josh Deprez 2021-08-27 14:43:37 +10:00
parent 6fcf57fad1
commit 9553eac378
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
engine/game.go
View file

@ -24,7 +24,7 @@ type Game struct {
Root DrawUpdater // typically a *Scene or SceneRef though Root DrawUpdater // typically a *Scene or SceneRef though
dbmu sync.RWMutex dbmu sync.RWMutex
db map[string]interface{} // Components by ID db map[string]Identifier // Components by ID
} }
// Draw draws the entire thing, with default draw options. // Draw draws the entire thing, with default draw options.
@ -57,17 +57,15 @@ func (g *Game) registerComponent(c interface{}, p []interface{}) error {
if id == "" { if id == "" {
return nil return nil
} }
g.dbmu.Lock()
if _, exists := g.db[id]; exists { if _, exists := g.db[id]; exists {
return fmt.Errorf("duplicate id %q", id) return fmt.Errorf("duplicate id %q", id)
} }
g.db[id] = c g.db[id] = i
g.dbmu.Unlock()
return nil return nil
} }
// Component returns the component with a given ID, or nil if there is none. // Component returns the component with a given ID, or nil if there is none.
func (g *Game) Component(id string) interface{} { func (g *Game) Component(id string) Identifier {
g.dbmu.RLock() g.dbmu.RLock()
defer g.dbmu.RUnlock() defer g.dbmu.RUnlock()
return g.db[id] return g.db[id]
@ -105,6 +103,7 @@ func walk(c interface{}, p []interface{}, v func(interface{}, []interface{}) err
// to Component. You may call Prepare again (e.g. as an alternative to // to Component. You may call Prepare again (e.g. as an alternative to
// fastidiously calling RegisterComponent/UnregisterComponent). // fastidiously calling RegisterComponent/UnregisterComponent).
func (g *Game) LoadAndPrepare(assets fs.FS) error { func (g *Game) LoadAndPrepare(assets fs.FS) error {
// Load all the Loaders
if err := Walk(g.Root, func(c interface{}, _ []interface{}) error { if err := Walk(g.Root, func(c interface{}, _ []interface{}) error {
l, ok := c.(Loader) l, ok := c.(Loader)
if !ok { if !ok {
@ -115,12 +114,15 @@ func (g *Game) LoadAndPrepare(assets fs.FS) error {
return err return err
} }
// Build the component databases
g.dbmu.Lock() g.dbmu.Lock()
g.db = make(map[string]interface{}) g.db = make(map[string]Identifier)
if err := Walk(g.Root, g.registerComponent); err != nil {
return err
}
g.dbmu.Unlock() g.dbmu.Unlock()
// -> here <- is the moment in time where db is empty. // Prepare all the Preppers
Walk(g.Root, g.registerComponent)
Walk(g.Root, func(c interface{}, _ []interface{}) error { Walk(g.Root, func(c interface{}, _ []interface{}) error {
if p, ok := c.(Prepper); ok { if p, ok := c.(Prepper); ok {
p.Prepare(g) p.Prepare(g)