schobers/tins2021
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Compare commits

base: schobers:master
Branches Tags
schobers:master
schobers:qbitter_1_1_4
schobers:qbitter_1_1_3
schobers:qbitter_1_1_2
schobers:qbitter_1_1_1
schobers:qbitter_1_1_0
schobers:qbitter_1_0_0
..
compare: schobers:qbitter_1_1_3
Branches Tags
schobers:master
schobers:qbitter_1_1_4
schobers:qbitter_1_1_3
schobers:qbitter_1_1_2
schobers:qbitter_1_1_1
schobers:qbitter_1_1_0
schobers:qbitter_1_0_0

No commits in common. "master" and "qbitter_1_1_3" have entirely different histories.
master ... qbitter_1_

4 changed files with 4 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
cmd/tins2021/app.go
View File

@ -63,8 +63,8 @@ func (a *app) Init(ctx ui.Context) error {
virtual.RegisterKey("confirm", ui.KeyEnter, tins2021.MustCreateNamedTextureImage(textures, "return-key", drawReturnKey())) virtual.RegisterKey("confirm", ui.KeyEnter, tins2021.MustCreateNamedTextureImage(textures, "return-key", drawReturnKey()))
virtual.RegisterKey("arrow-top-left", ui.KeyUp, tins2021.MustCreateNamedTextureImage(textures, "arrow-top-left-key", drawArrowKey(.75*geom.Pi))) virtual.RegisterKey("arrow-top-left", ui.KeyUp, tins2021.MustCreateNamedTextureImage(textures, "arrow-top-left-key", drawArrowKey(.75*geom.Pi)))
virtual.RegisterKey("arrow-top-right", ui.KeyRight, tins2021.MustCreateNamedTextureImage(textures, "arrow-top-right-key", drawArrowKey(.25*geom.Pi))) virtual.RegisterKey("arrow-top-right", ui.KeyRight, tins2021.MustCreateNamedTextureImage(textures, "arrow-top-right-key", drawArrowKey(.25*geom.Pi)))
virtual.RegisterKey("arrow-bottom-left", ui.KeyLeft, tins2021.MustCreateNamedTextureImage(textures, "arrow-bottom-left-key", drawArrowKey(1.25*geom.Pi))) virtual.RegisterKey("arrow-bottom-left", ui.KeyDown, tins2021.MustCreateNamedTextureImage(textures, "arrow-bottom-left-key", drawArrowKey(1.25*geom.Pi)))
virtual.RegisterKey("arrow-bottom-right", ui.KeyDown, tins2021.MustCreateNamedTextureImage(textures, "arrow-bottom-right-key", drawArrowKey(1.75*geom.Pi))) virtual.RegisterKey("arrow-bottom-right", ui.KeyLeft, tins2021.MustCreateNamedTextureImage(textures, "arrow-bottom-right-key", drawArrowKey(1.75*geom.Pi)))
virtual.RegisterKey("cancel", ui.KeyEscape, tins2021.MustCreateNamedTextureImage(textures, "arrow-left-key", drawArrowKey(geom.Pi))) virtual.RegisterKey("cancel", ui.KeyEscape, tins2021.MustCreateNamedTextureImage(textures, "arrow-left-key", drawArrowKey(geom.Pi)))
virtual.Enabled = a.settings.Controls.Virtual virtual.Enabled = a.settings.Controls.Virtual

4
cmd/tins2021/appcontext.go
View File

@ -197,8 +197,8 @@ func (app *appContext) SetVirtualKeys(cancel, confirm, controls bool) {
topRight = append(topRight, "confirm") topRight = append(topRight, "confirm")
} }
if controls { if controls {
bottomRight = append(bottomRight, "arrow-bottom-right", "arrow-top-right") bottomRight = append(bottomRight, "arrow-top-right", "arrow-bottom-right")
bottomLeft = append(bottomLeft, "arrow-bottom-left", "arrow-top-left") bottomLeft = append(bottomLeft, "arrow-top-left", "arrow-bottom-left")
} }
app.Virtual.SetControls(topLeft, topRight, bottomRight, bottomLeft) app.Virtual.SetControls(topLeft, topRight, bottomRight, bottomLeft)
} }

7
cmd/tins2021/levelcontroller.go
View File

@ -80,13 +80,6 @@ func newLevelControl(app *appContext, ctx ui.Context, level *tins2021.Level) *le
} }
} }
if app.Virtual.Enabled {
control.Controls[ui.KeyUp] = tins2021.DirectionUpLeft
control.Controls[ui.KeyLeft] = tins2021.DirectionDownLeft
control.Controls[ui.KeyDown] = tins2021.DirectionDownRight
control.Controls[ui.KeyRight] = tins2021.DirectionUpRight
}
control.Play(level) control.Play(level)
return control return control

1
cmd/tins2021/virtualcontrols.go
View File

@ -14,7 +14,6 @@ import (
) )
func drawArrowKey(a float64) image.Image { func drawArrowKey(a float64) image.Image {
a = -a
const keyHeight_5 = .5 * tins2021.TextureSize const keyHeight_5 = .5 * tins2021.TextureSize
const keyWidth_5 = .5 * tins2021.TextureSize const keyWidth_5 = .5 * tins2021.TextureSize