Implement the main menu for the ordoor binary
In this commit, we also remove code that doesn't properly belong in view-menu
This commit is contained in:
@@ -7,8 +7,6 @@ import (
|
||||
|
||||
"code.ur.gs/lupine/ordoor/internal/assetstore"
|
||||
"code.ur.gs/lupine/ordoor/internal/ui"
|
||||
"github.com/hajimehoshi/ebiten"
|
||||
"github.com/hajimehoshi/ebiten/audio"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -16,19 +14,6 @@ var (
|
||||
menuName = flag.String("menu", "", "Name of a menu, e.g. Main")
|
||||
)
|
||||
|
||||
type env struct {
|
||||
ui *ui.Interface
|
||||
|
||||
// fonts []*assetstore.Font
|
||||
// fontObjs []*assetstore.Object
|
||||
|
||||
step int
|
||||
state state
|
||||
lastState state
|
||||
}
|
||||
|
||||
type state struct{}
|
||||
|
||||
func main() {
|
||||
flag.Parse()
|
||||
|
||||
@@ -47,51 +32,12 @@ func main() {
|
||||
log.Fatalf("Couldn't load menu %s: %v", *menuName, err)
|
||||
}
|
||||
|
||||
// loadedFonts, err := loadFonts(menu.FontNames...)
|
||||
// if err != nil {
|
||||
// log.Fatalf("Failed to load font: %v", err)
|
||||
// }
|
||||
|
||||
iface, err := ui.NewInterface(menu)
|
||||
if err != nil {
|
||||
log.Fatalf("Couldn't initialize interface: %v", err)
|
||||
}
|
||||
|
||||
if menu.Name == "main" {
|
||||
log.Printf("Installing a click handler!")
|
||||
widget, err := iface.Widget(2, 5) // Menu 2, submenu 5
|
||||
if err != nil {
|
||||
log.Fatalf("Couldn't find widget 2,5: %v", err)
|
||||
}
|
||||
widget.OnMouseClick = func() {
|
||||
os.Exit(0)
|
||||
}
|
||||
}
|
||||
|
||||
// Yay sound
|
||||
if _, err := audio.NewContext(48000); err != nil {
|
||||
log.Fatalf("Failed to audio: %v", err)
|
||||
}
|
||||
music, err := assets.Sound("music_interface") // FIXME: should be a reference to Sounds.dat
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to find interface music: %v", err)
|
||||
}
|
||||
player, err := music.InfinitePlayer()
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to generate music player for interface: %v", err)
|
||||
}
|
||||
player.Play()
|
||||
|
||||
state := state{}
|
||||
env := &env{
|
||||
ui: iface,
|
||||
//objects: menuObjs,
|
||||
// fonts: loadedFonts,
|
||||
state: state,
|
||||
lastState: state,
|
||||
}
|
||||
|
||||
win, err := ui.NewWindow(env, "View Menu: "+*menuName)
|
||||
win, err := ui.NewWindow(iface, "View Menu: "+*menuName)
|
||||
if err != nil {
|
||||
log.Fatal("Couldn't create window: %v", err)
|
||||
}
|
||||
@@ -100,14 +46,3 @@ func main() {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func (e *env) Update(screenX, screenY int) error {
|
||||
e.step += 1
|
||||
e.lastState = e.state
|
||||
|
||||
return e.ui.Update(screenX, screenY)
|
||||
}
|
||||
|
||||
func (e *env) Draw(screen *ebiten.Image) error {
|
||||
return e.ui.Draw(screen)
|
||||
}
|
||||
|
Reference in New Issue
Block a user