fix #7: use only left mouse button to draw, it toggles cell state

This commit is contained in:
2024-07-13 19:31:25 +02:00
parent 50b630791a
commit 05d56568e4
3 changed files with 12 additions and 15 deletions

View File

@@ -52,7 +52,7 @@ const (
DEFAULT_CELLSIZE = 4
DEFAULT_ZOOMFACTOR = 400
DEFAULT_GEOM = "640x384"
DEFAULT_THEME = "standard" // "light" // inverse => "dark"
DEFAULT_THEME = "standard"
)
const KEYBINDINGS string = `
@@ -62,9 +62,9 @@ const KEYBINDINGS string = `
- PAGE DOWN: slow down
- MOUSE WHEEL: zoom in or out
- LEFT MOUSE BUTTON: use to drag canvas, keep clicked and move mouse
- I: enter "insert" (draw) mode: use left mouse to set cells alife and right
button to dead. Leave with "space". While in insert mode, use middle mouse
button to drag grid.
- I: enter "insert" (draw) mode: use left mouse to toggle a cells alife state.
Leave with insert mode with "space". While in insert mode, use middle mouse
button to drag the grid.
- R: reset to 1:1 zoom
- ESCAPE: open menu, o: open options menu
- S: save game state to file (can be loaded with -l)

View File

@@ -264,10 +264,8 @@ func (scene *ScenePlay) CheckInput() {
func (scene *ScenePlay) CheckDrawingInput() {
if scene.Config.Drawmode {
switch {
case ebiten.IsMouseButtonPressed(ebiten.MouseButtonLeft):
scene.ToggleCellOnCursorPos(Alive)
case ebiten.IsMouseButtonPressed(ebiten.MouseButtonRight):
scene.ToggleCellOnCursorPos(Dead)
case inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft):
scene.ToggleCellOnCursorPos()
case inpututil.IsKeyJustPressed(ebiten.KeyEscape):
scene.Config.Drawmode = false
}
@@ -465,14 +463,14 @@ func (scene *ScenePlay) Update() error {
}
// set a cell to alive or dead
func (scene *ScenePlay) ToggleCellOnCursorPos(alive uint8) {
func (scene *ScenePlay) ToggleCellOnCursorPos() {
// use cursor pos relative to the world
worldX, worldY := scene.Camera.ScreenToWorld(ebiten.CursorPosition())
x := int(worldX) / scene.Config.Cellsize
y := int(worldY) / scene.Config.Cellsize
if x > -1 && y > -1 && x < scene.Config.Width && y < scene.Config.Height {
scene.Grids[scene.Index].Data[y][x].State = alive
scene.Grids[scene.Index].Data[y][x].State ^= 1
scene.History.Age[y][x] = 1
}
}