Skip to content

Commit c6c8043

Browse files
committed
Add new scene
1 parent 4f8a44b commit c6c8043

4 files changed

Lines changed: 36 additions & 0 deletions

File tree

main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"github.com/applejag/epic-wizard-firefly-gladiators/assets"
55
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/game"
6+
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/scenes"
67
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/state"
78

89
"github.com/firefly-zero/firefly-go/firefly"
@@ -21,6 +22,9 @@ func boot() {
2122

2223
state.Input.Boot()
2324
scenemanager.Boot()
25+
26+
// TODO: switching to this scene from start while I'm developing the scene code
27+
scenemanager.SwitchSceneNoTransition(scenes.RacingBattle2)
2428
}
2529

2630
func update() {

pkg/game/scenemanager.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/scenes/insectarium"
88
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/scenes/mainmenu"
99
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/scenes/racebattle"
10+
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/scenes/racebattle2"
1011
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/scenes/shop"
1112
"github.com/applejag/epic-wizard-firefly-gladiators/pkg/util"
1213

@@ -23,6 +24,7 @@ type SceneManager struct {
2324
Insectarium insectarium.Scene
2425
Shop shop.Scene
2526
Field field.Scene
27+
RaceBattle2 racebattle2.Scene
2628

2729
UI UI
2830
}
@@ -66,6 +68,7 @@ func (s *SceneManager) Boot() {
6668
s.Field.Boot()
6769
s.MainMenu.Boot()
6870
s.RaceBattle.Boot()
71+
s.RaceBattle2.Boot()
6972
s.Shop.Boot()
7073
}
7174

@@ -91,6 +94,8 @@ func (s *SceneManager) Update() {
9194
s.MainMenu.Update()
9295
case scenes.RacingBattle, scenes.RacingTraining:
9396
s.RaceBattle.Update()
97+
case scenes.RacingBattle2:
98+
s.RaceBattle2.Update()
9499
case scenes.Shop:
95100
s.Shop.Update()
96101
}
@@ -110,6 +115,8 @@ func (s *SceneManager) Render() {
110115
s.MainMenu.Render()
111116
case scenes.RacingBattle, scenes.RacingTraining:
112117
s.RaceBattle.Render()
118+
case scenes.RacingBattle2:
119+
s.RaceBattle2.Render()
113120
case scenes.Shop:
114121
s.Shop.Render()
115122
}
@@ -128,6 +135,8 @@ func (s *SceneManager) onSceneSwitch(scene scenes.Scene) {
128135
s.RaceBattle.OnSceneEnter(2)
129136
case scenes.RacingTraining:
130137
s.RaceBattle.OnSceneEnter(1)
138+
case scenes.RacingBattle2:
139+
s.RaceBattle2.OnSceneEnter()
131140
case scenes.Shop:
132141
s.Shop.OnSceneEnter()
133142
}

pkg/scenes/racebattle2/scene.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package racebattle2
2+
3+
type Scene struct{}
4+
5+
func (s *Scene) Boot() {
6+
}
7+
8+
func (s *Scene) Update() {
9+
}
10+
11+
func (s *Scene) Render() {
12+
}
13+
14+
func (s *Scene) OnSceneEnter() {
15+
}

pkg/scenes/scenes.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ var AllScenes = []Scene{
1313
Shop,
1414
RacingBattle,
1515
RacingTraining,
16+
17+
RacingBattle2,
1618
}
1719

1820
type Scene byte
@@ -24,6 +26,10 @@ const (
2426
Shop
2527
RacingBattle
2628
RacingTraining
29+
30+
// New racebattle design
31+
// Will replace the old racebattle eventually
32+
RacingBattle2
2733
)
2834

2935
func (s Scene) String() string {
@@ -40,6 +46,8 @@ func (s Scene) String() string {
4046
return "racing training"
4147
case Shop:
4248
return "shop"
49+
case RacingBattle2:
50+
return "racing battle (new)"
4351
default:
4452
panic("unexpected Scene")
4553
}

0 commit comments

Comments
 (0)