Skip to content

Add instant mode that doesn't require a first click #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j-fh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add instant mode that doesn't require a first click #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 81 additions & 31 deletions cmd/hexecute/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func main() {
learnCommand := flag.String("learn", "", "Learn a new gesture for the specified command")
listGestures := flag.Bool("list", false, "List all registered gestures")
removeGesture := flag.String("remove", "", "Remove a gesture by command name")
instantMode := flag.Bool("instant", false, "Enable instant drawing mode (always active, click to complete)")
flag.Parse()

if flag.NArg() > 0 {
Expand Down Expand Up @@ -121,6 +122,10 @@ func main() {
log.Printf("Loaded %d gesture(s)", len(gestures))
}

if *instantMode {
log.Println("Instant mode enabled: drawing always active, click to complete gesture")
}

opengl := opengl.New(app)
if err := opengl.InitGL(); err != nil {
log.Fatal("Failed to initialize OpenGL:", err)
Expand All @@ -141,6 +146,11 @@ func main() {
lastTime := time.Now()
var wasPressed bool

if *instantMode {
app.IsDrawing = true
log.Println("Gesture started (instant mode)")
}

for !window.ShouldClose() {
now := time.Now()
dt := float32(now.Sub(lastTime).Seconds())
Expand Down Expand Up @@ -175,41 +185,81 @@ func main() {
break
}
}

isPressed := window.GetMouseButton()
if isPressed && !wasPressed {
app.IsDrawing = true
log.Println("Gesture started")
} else if !isPressed && wasPressed {
app.IsDrawing = false

if app.LearnMode && len(app.Points) > 0 {
log.Println("Gesture completed")
processed := stroke.ProcessStroke(app.Points)
app.LearnGestures = append(app.LearnGestures, processed)
app.LearnCount++
log.Printf("Captured gesture %d/3", app.LearnCount)

app.Points = nil

if app.LearnCount >= 3 {
if err := gestures.SaveGesture(app.LearnCommand, app.LearnGestures); err != nil {
log.Fatal("Failed to save gesture:", err)

if *instantMode {
if isPressed && !wasPressed {
if len(app.Points) > 0 {
if app.LearnMode {
log.Println("Gesture completed")
processed := stroke.ProcessStroke(app.Points)
app.LearnGestures = append(app.LearnGestures, processed)
app.LearnCount++
log.Printf("Captured gesture %d/3", app.LearnCount)

app.Points = nil
log.Println("Gesture started (ready for next)")

if app.LearnCount >= 3 {
if err := gestures.SaveGesture(app.LearnCommand, app.LearnGestures); err != nil {
log.Fatal("Failed to save gesture:", err)
}
log.Printf("Gesture saved for command: %s", app.LearnCommand)

app.IsExiting = true
app.ExitStartTime = time.Now()
window.DisableInput()
x, y := window.GetCursorPos()
spawn := spawn.New(app)
spawn.SpawnExitWisps(float32(x), float32(y))
}
} else if !app.IsExiting {
log.Println("Gesture completed")
x, y := window.GetCursorPos()
exec := execute.New(app)
exec.RecognizeAndExecute(window, float32(x), float32(y))
app.Points = nil
log.Println("Gesture started (ready for next)")
}
log.Printf("Gesture saved for command: %s", app.LearnCommand)
}
}
} else {
if isPressed && !wasPressed {
app.IsDrawing = true
log.Println("Gesture started")
} else if !isPressed && wasPressed {
app.IsDrawing = false

if app.LearnMode && len(app.Points) > 0 {
log.Println("Gesture completed")
processed := stroke.ProcessStroke(app.Points)
app.LearnGestures = append(app.LearnGestures, processed)
app.LearnCount++
log.Printf("Captured gesture %d/3", app.LearnCount)

app.IsExiting = true
app.ExitStartTime = time.Now()
window.DisableInput()
app.Points = nil

if app.LearnCount >= 3 {
if err := gestures.SaveGesture(app.LearnCommand, app.LearnGestures); err != nil {
log.Fatal("Failed to save gesture:", err)
}
log.Printf("Gesture saved for command: %s", app.LearnCommand)

app.IsExiting = true
app.ExitStartTime = time.Now()
window.DisableInput()
x, y := window.GetCursorPos()
spawn := spawn.New(app)
spawn.SpawnExitWisps(float32(x), float32(y))
}
} else if !app.LearnMode && !app.IsExiting && len(app.Points) > 0 {
log.Println("Gesture completed")
x, y := window.GetCursorPos()
spawn := spawn.New(app)
spawn.SpawnExitWisps(float32(x), float32(y))
exec := execute.New(app)
exec.RecognizeAndExecute(window, float32(x), float32(y))
app.Points = nil
}
} else if !app.LearnMode && !app.IsExiting && len(app.Points) > 0 {
log.Println("Gesture completed")
x, y := window.GetCursorPos()
exec := execute.New(app)
exec.RecognizeAndExecute(window, float32(x), float32(y))
app.Points = nil
}
}
wasPressed = isPressed
Expand All @@ -228,4 +278,4 @@ func main() {
drawer.Draw(window)
window.SwapBuffers()
}
}
}