lupine/ordoor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make include directives work in .mnu files

Browse Source
This commit is contained in:
Nick Thomas
2020-04-13 21:03:54 +01:00
parent 76bf8438b0
commit dc131939f4
11 changed files with 298 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
internal/assetstore/menu.go
View File

@@ -7,10 +7,10 @@ import (
)
type Menu struct {
assets *AssetStore
fonts []*Font // TODO: place the fonts directly into the relevant records
obj *Object // TODO: handle multiple objects in the menu
raw *menus.Menu // TODO: remove raw
assets *AssetStore
fonts []*Font // TODO: place the fonts directly into the relevant records
objects []*Object // TODO: place the objects directly into the relevant records
raw *menus.Menu // TODO: remove raw
Name string
}
@@ -25,10 +25,10 @@ func (m *Menu) Font(idx int) *Font {
return m.fonts[idx]
}
func (m *Menu) Images(start, count int) ([]*ebiten.Image, error) {
func (m *Menu) Images(objIdx, start, count int) ([]*ebiten.Image, error) {
out := make([]*ebiten.Image, count)
sprites, err := m.Sprites(start, count)
sprites, err := m.Sprites(objIdx, start, count)
if err != nil {
return nil, err
}
@@ -40,11 +40,11 @@ func (m *Menu) Images(start, count int) ([]*ebiten.Image, error) {
return out, nil
}
func (m *Menu) Sprites(start, count int) ([]*Sprite, error) {
func (m *Menu) Sprites(objIdx, start, count int) ([]*Sprite, error) {
out := make([]*Sprite, count)
for i := start; i < start+count; i++ {
sprite, err := m.Sprite(i)
sprite, err := m.Sprite(objIdx, i)
if err != nil {
return nil, err
}
@@ -55,8 +55,8 @@ func (m *Menu) Sprites(start, count int) ([]*Sprite, error) {
return out, nil
}
func (m *Menu) Sprite(idx int) (*Sprite, error) {
return m.obj.Sprite(idx)
func (m *Menu) Sprite(objIdx, idx int) (*Sprite, error) {
return m.objects[objIdx].Sprite(idx)
}
func (a *AssetStore) Menu(name string) (*Menu, error) {
@@ -93,29 +93,40 @@ func (a *AssetStore) Menu(name string) (*Menu, error) {
raw.Internationalize(i18n)
obj, err := a.loadMenuObject(raw) // TODO: multiple objects
// FIXME: we should parse the menu into a list of elements like "ListBox",
// "Dialogue", etc, and present those with objects already selected
objects, err := a.loadMenuObjects(raw)
if err != nil {
return nil, err
}
menu := &Menu{
assets: a,
fonts: fonts,
obj: obj,
raw: raw,
Name: name,
assets: a,
fonts: fonts,
objects: objects,
raw: raw,
Name: name,
}
a.menus[name] = menu
return menu, nil
}
func (a *AssetStore) loadMenuObject(menu *menus.Menu) (*Object, error) {
filename := menu.ObjectFiles[0]
filename, err := a.lookup(filename, "", "Menu") // Extension already present
if err != nil {
return nil, err
func (a *AssetStore) loadMenuObjects(menu *menus.Menu) ([]*Object, error) {
out := make([]*Object, len(menu.ObjectFiles))
for i, name := range menu.ObjectFiles {
filename, err := a.lookup(name, "", "Menu") // Extension already present
if err != nil {
return nil, err
}
obj, err := a.ObjectByPath(filename)
if err != nil {
return nil, err
}
out[i] = obj
}
return a.ObjectByPath(filename)
return out, nil
}