Skip to content

Commit 619085f

Browse files
committed
move fullscreen request to demo
1 parent 888f03e commit 619085f

5 files changed

Lines changed: 26 additions & 21 deletions

File tree

.fat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dist/demo/atlas.webp 1432 1457
22
dist/demo/index.css 69 94
3-
dist/demo/index.html 153223 75042
4-
dist/demo/index.js 148142 69922
5-
dist/demo/index.wasm 85556 46012
3+
dist/demo/index.html 153223 74947
4+
dist/demo/index.js 148142 69839
5+
dist/demo/index.wasm 85556 46025

src/internal/demo/app/app.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import (
55
"github.com/oidoid/void/src/internal/demo/hooks"
66
"github.com/oidoid/void/src/internal/demo/levels/levelhooks"
77
"github.com/oidoid/void/src/void/ventities"
8+
"github.com/oidoid/void/src/void/vgame"
89
"github.com/oidoid/void/src/void/vhooks"
910
)
1011

1112
func New() *engine.Eng {
1213
this := engine.New()
14+
this.ReqFullscreen(vgame.FullscreenReqEnter)
1315
this.In().MapDefaults()
1416
this.Superballs = *ventities.NewEntVec(hooks.UpdateSuperballs)
1517
this.RegisterUpdate(&this.Superballs)

src/internal/demo/app/app_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"github.com/oidoid/void/src/internal/demo/engine"
77
"github.com/oidoid/void/src/internal/demo/entities"
88
"github.com/oidoid/void/src/internal/demo/gfx"
9+
"github.com/oidoid/void/src/void/vgame"
910
"github.com/oidoid/void/src/void/vgeo"
1011
"github.com/oidoid/void/src/void/vgfx"
1112
)
@@ -17,6 +18,13 @@ const (
1718
fps = 120
1819
)
1920

21+
func TestNewReqsFullscreen(t *testing.T) {
22+
gam := New()
23+
if got := gam.FullscreenReq(); got != int32(vgame.FullscreenReqEnter) {
24+
t.Errorf("FullscreenReq() = %v, want enter", got)
25+
}
26+
}
27+
2028
func TestNewPopulatesTiledTexts(t *testing.T) {
2129
gam := New()
2230
if got, want := gam.Texts.Len(), 1; got != want {

src/internal/demo/engine/eng.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ func New() *Eng {
6161
}),
6262
LastBoingMs: -math.MaxFloat64,
6363
}
64-
this.ReqFullscreen(vgame.FullscreenReqEnter)
6564
this.Layer(gfx.LayerTiles).Shader = vgfx.ShaderTiles
6665
this.Layer(gfx.LayerTiles).ScaleMode = vgfx.LayerScaleModeManual
6766
this.Layer(gfx.LayerP1).ScaleMode = vgfx.LayerScaleModeManual

src/internal/demo/engine/eng_test.go

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ func TestFullscreenToggle(t *testing.T) {
6464
gam := New()
6565
toggle := entities.NewFullscreenToggle(gam)
6666
toggle.OnUpdate(toggle)
67-
if toggle.On {
68-
t.Error("toggle.On = true, want false")
67+
if !toggle.On {
68+
t.Error("toggle.On = false, want true")
6969
}
70-
toggle.On = true
70+
toggle.On = false
7171
toggle.OnClick(toggle)
72-
if gam.FullscreenEnabled() {
73-
t.Error("FullscreenEnabled() = true, want false")
72+
if !gam.FullscreenEnabled() {
73+
t.Error("FullscreenEnabled() = false, want true")
7474
}
75-
if got := gam.FullscreenReq(); got != int32(vgame.FullscreenReqExit) {
76-
t.Errorf("FullscreenReq() = %v, want exit", got)
75+
if got := gam.FullscreenReq(); got != int32(vgame.FullscreenReqEnter) {
76+
t.Errorf("FullscreenReq() = %v, want enter", got)
7777
}
7878
}
7979

@@ -200,27 +200,23 @@ func TestAdjustLvlScaleAt(t *testing.T) {
200200
}
201201
}
202202

203-
// reqs fullscreen and wakelock by default.
204-
func TestDefaultFullscreenAndWakelockReqs(t *testing.T) {
203+
// starts windowed and reqs wakelock by default.
204+
func TestDefaults(t *testing.T) {
205205
gam := New()
206206
gam.Router.Update = func(*Eng) vgame.Status { return vgame.Pause }
207207
gam.Update()
208-
if !gam.FullscreenEnabled() {
209-
t.Error("FullscreenEnabled() = false, want true")
208+
if gam.FullscreenEnabled() {
209+
t.Error("FullscreenEnabled() = true, want false")
210210
}
211-
if got := gam.FullscreenReq(); got != int32(vgame.FullscreenReqEnter) {
212-
t.Errorf("FullscreenReq() = %v, want enter", got)
211+
if got := gam.FullscreenReq(); got != int32(vgame.FullscreenReqNone) {
212+
t.Errorf("FullscreenReq() = %v, want none", got)
213213
}
214214
if got := gam.ReqWakelockFlag(); got != 1 {
215215
t.Errorf("ReqWakelockFlag() = %v, want 1", got)
216216
}
217217

218-
gam.ReqFullscreen(vgame.FullscreenReqExit)
219218
gam.DisableWakelock(true)
220219
gam.Update()
221-
if got := gam.FullscreenReq(); got != int32(vgame.FullscreenReqExit) {
222-
t.Errorf("FullscreenReq() = %v, want exit", got)
223-
}
224220
if got := gam.ReqWakelockFlag(); got != 0 {
225221
t.Errorf("ReqWakelockFlag() = %v, want 0", got)
226222
}

0 commit comments

Comments
 (0)