Skip to content

Commit def3c4f

Browse files
kivutarkivutar
committed
Per scene hint bar
1 parent 89c40ee commit def3c4f

9 files changed

Lines changed: 111 additions & 9 deletions

File tree

‎assets‎

‎menu/menu.go‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ type Scene interface {
5252
segueBack()
5353
update()
5454
render()
55+
drawHintBar()
5556
Entry() *entry
5657
}
5758

@@ -97,32 +98,37 @@ func Render() {
9798

9899
menu := menu.stack[i]
99100
menu.render()
101+
menu.drawHintBar()
100102
}
101-
102-
drawHintBar()
103103
}
104104

105-
func drawHintBar() {
105+
func genericDrawHintBar() {
106106
w, h := vid.Window.GetFramebufferSize()
107107
c := video.Color{R: 0.25, G: 0.25, B: 0.25, A: 1}
108108
menu.ratio = float32(w) / 1920
109109
vid.DrawRect(0.0, float32(h)-70*menu.ratio, float32(w), 70*menu.ratio, 1.0, video.Color{R: 0.75, G: 0.75, B: 0.75, A: 1})
110110
vid.Font.SetColor(0.25, 0.25, 0.25, 1.0)
111+
111112
stack := 30 * menu.ratio
112-
vid.DrawImage(menu.icons["key-arrows"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
113+
vid.DrawImage(menu.icons["key-up-down"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
113114
stack += 70 * menu.ratio
114115
stack += 10 * menu.ratio
115116
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "NAVIGATE")
116117
stack += vid.Font.Width(0.5*menu.ratio, "NAVIGATE")
118+
117119
stack += 30 * menu.ratio
118120
vid.DrawImage(menu.icons["key-z"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
119121
stack += 70 * menu.ratio
120122
stack += 10 * menu.ratio
121-
vid.Font.Printf(370*menu.ratio, float32(h)-23*menu.ratio, 0.5*menu.ratio, "CANCEL")
122-
stack += vid.Font.Width(0.5*menu.ratio, "CANCEL")
123-
stack += 10 * menu.ratio
123+
vid.Font.Printf(370*menu.ratio, float32(h)-23*menu.ratio, 0.5*menu.ratio, "BACK")
124+
stack += vid.Font.Width(0.5*menu.ratio, "BACK")
125+
126+
stack += 30 * menu.ratio
124127
vid.DrawImage(menu.icons["key-x"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
125-
vid.Font.Printf(590*menu.ratio, float32(h)-23*menu.ratio, 0.5*menu.ratio, "OK")
128+
stack += 70 * menu.ratio
129+
stack += 10 * menu.ratio
130+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "OK")
131+
stack += vid.Font.Width(0.5*menu.ratio, "OK")
126132
}
127133

128134
// genericSegueMount is the smooth transition of the menu entries first appearance

‎menu/scene_core_options.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,7 @@ func (s *screenCoreOptions) update() {
6363
func (s *screenCoreOptions) render() {
6464
genericRender(&s.entry)
6565
}
66+
67+
func (s *screenCoreOptions) drawHintBar() {
68+
genericDrawHintBar()
69+
}

‎menu/scene_explorer.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,7 @@ func (explorer *screenExplorer) update() {
9292
func (explorer *screenExplorer) render() {
9393
genericRender(&explorer.entry)
9494
}
95+
96+
func (explorer *screenExplorer) drawHintBar() {
97+
genericDrawHintBar()
98+
}

‎menu/scene_main.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,7 @@ func (main *screenMain) update() {
105105
func (main *screenMain) render() {
106106
genericRender(&main.entry)
107107
}
108+
109+
func (main *screenMain) drawHintBar() {
110+
genericDrawHintBar()
111+
}

‎menu/scene_playlist.go‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,32 @@ func (s *screenPlaylist) render() {
151151
}
152152
}
153153
}
154+
155+
func (s *screenPlaylist) drawHintBar() {
156+
w, h := vid.Window.GetFramebufferSize()
157+
c := video.Color{R: 0.25, G: 0.25, B: 0.25, A: 1}
158+
menu.ratio = float32(w) / 1920
159+
vid.DrawRect(0.0, float32(h)-70*menu.ratio, float32(w), 70*menu.ratio, 1.0, video.Color{R: 0.75, G: 0.75, B: 0.75, A: 1})
160+
vid.Font.SetColor(0.25, 0.25, 0.25, 1.0)
161+
162+
stack := 30 * menu.ratio
163+
vid.DrawImage(menu.icons["key-up-down"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
164+
stack += 70 * menu.ratio
165+
stack += 10 * menu.ratio
166+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "NAVIGATE")
167+
stack += vid.Font.Width(0.5*menu.ratio, "NAVIGATE")
168+
169+
stack += 30 * menu.ratio
170+
vid.DrawImage(menu.icons["key-z"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
171+
stack += 70 * menu.ratio
172+
stack += 10 * menu.ratio
173+
vid.Font.Printf(370*menu.ratio, float32(h)-23*menu.ratio, 0.5*menu.ratio, "BACK")
174+
stack += vid.Font.Width(0.5*menu.ratio, "BACK")
175+
176+
stack += 30 * menu.ratio
177+
vid.DrawImage(menu.icons["key-x"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
178+
stack += 70 * menu.ratio
179+
stack += 10 * menu.ratio
180+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "RUN")
181+
stack += vid.Font.Width(0.5*menu.ratio, "RUN")
182+
}

‎menu/scene_quick.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,7 @@ func (s *screenQuick) update() {
104104
func (s *screenQuick) render() {
105105
genericRender(&s.entry)
106106
}
107+
108+
func (s *screenQuick) drawHintBar() {
109+
genericDrawHintBar()
110+
}

‎menu/scene_settings.go‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,32 @@ func (s *screenSettings) update() {
152152
func (s *screenSettings) render() {
153153
genericRender(&s.entry)
154154
}
155+
156+
func (s *screenSettings) drawHintBar() {
157+
w, h := vid.Window.GetFramebufferSize()
158+
c := video.Color{R: 0.25, G: 0.25, B: 0.25, A: 1}
159+
menu.ratio = float32(w) / 1920
160+
vid.DrawRect(0.0, float32(h)-70*menu.ratio, float32(w), 70*menu.ratio, 1.0, video.Color{R: 0.75, G: 0.75, B: 0.75, A: 1})
161+
vid.Font.SetColor(0.25, 0.25, 0.25, 1.0)
162+
163+
stack := 30 * menu.ratio
164+
vid.DrawImage(menu.icons["key-up-down"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
165+
stack += 70 * menu.ratio
166+
stack += 10 * menu.ratio
167+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "NAVIGATE")
168+
stack += vid.Font.Width(0.5*menu.ratio, "NAVIGATE")
169+
170+
stack += 30 * menu.ratio
171+
vid.DrawImage(menu.icons["key-left-right"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
172+
stack += 70 * menu.ratio
173+
stack += 10 * menu.ratio
174+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "SET")
175+
stack += vid.Font.Width(0.5*menu.ratio, "SET")
176+
177+
stack += 30 * menu.ratio
178+
vid.DrawImage(menu.icons["key-z"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
179+
stack += 70 * menu.ratio
180+
stack += 10 * menu.ratio
181+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "BACK")
182+
stack += vid.Font.Width(0.5*menu.ratio, "BACK")
183+
}

‎menu/scene_tabs.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,3 +301,25 @@ func (tabs screenTabs) render() {
301301
256*menu.ratio, 256*menu.ratio, e.scale, video.Color{R: 1, G: 1, B: 1, A: e.iconAlpha})
302302
}
303303
}
304+
305+
func (tabs screenTabs) drawHintBar() {
306+
w, h := vid.Window.GetFramebufferSize()
307+
c := video.Color{R: 0.25, G: 0.25, B: 0.25, A: 1}
308+
menu.ratio = float32(w) / 1920
309+
vid.DrawRect(0.0, float32(h)-70*menu.ratio, float32(w), 70*menu.ratio, 1.0, video.Color{R: 0.75, G: 0.75, B: 0.75, A: 1})
310+
vid.Font.SetColor(0.25, 0.25, 0.25, 1.0)
311+
312+
stack := 30 * menu.ratio
313+
vid.DrawImage(menu.icons["key-left-right"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
314+
stack += 70 * menu.ratio
315+
stack += 10 * menu.ratio
316+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "NAVIGATE")
317+
stack += vid.Font.Width(0.5*menu.ratio, "NAVIGATE")
318+
319+
stack += 30 * menu.ratio
320+
vid.DrawImage(menu.icons["key-x"], stack, float32(h)-70*menu.ratio, 70*menu.ratio, 70*menu.ratio, 1.0, c)
321+
stack += 70 * menu.ratio
322+
stack += 10 * menu.ratio
323+
vid.Font.Printf(stack, float32(h)-23*menu.ratio, 0.5*menu.ratio, "OPEN")
324+
stack += vid.Font.Width(0.5*menu.ratio, "OPEN")
325+
}

0 commit comments

Comments
 (0)