totallyRonja/CabinGame
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add event bandaid to slider and remove logging

Browse source
This commit is contained in:
Ronja 2020-10-31 12:03:03 +01:00
parent 3aab658b1e
commit 8cf53ab325
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Luxe/blocks/ui/compass.wren
View file

@ -36,21 +36,17 @@ class UiCompass{
Control.set_process(compass){|control, state, event, x,y,w,h| Control.set_process(compass){|control, state, event, x,y,w,h|
if(event.control != control) return if(event.control != control) return
System.print("event: %(event) - currently captured: %(UI.get_captured(ent))")
if(event.type == UIEvent.press){ if(event.type == UIEvent.press){
var relative_pos = AABB.new(x, y, w, h).relative_pos([event.x, event.y]) var relative_pos = AABB.new(x, y, w, h).relative_pos([event.x, event.y])
var inside = M.length(relative_pos.map{|comp| comp - 0.5}) < 0.5 var inside = M.length(relative_pos.map{|comp| comp - 0.5}) < 0.5
if(inside) { if(inside) {
state["pressed"] = true state["pressed"] = true
UI.capture(control) UI.capture(control)
System.print("CAPTURE COMPASS")
} }
} }
if(event.type == UIEvent.release){ if(event.type == UIEvent.release){
state["pressed"] = false state["pressed"] = false
UI.uncapture(control) UI.uncapture(control)
System.print("UNCAPTURE COMPASS")
} }
if((event.type == UIEvent.move || event.type == UIEvent.press) && state["pressed"]){ if((event.type == UIEvent.move || event.type == UIEvent.press) && state["pressed"]){
var center = [x + w/2, y + h/2] var center = [x + w/2, y + h/2]

2
Luxe/blocks/ui/slider.wren
View file

@ -9,6 +9,7 @@ import "globals" for Globals
import "math/rect" for AABB import "math/rect" for AABB
import "math/math" for M import "math/math" for M
import "blocks/debug" for DrawDebug import "blocks/debug" for DrawDebug
import "math/util" for Util
class UiSlider{ class UiSlider{
static horizontal{"horiz"} static horizontal{"horiz"}
@ -50,6 +51,7 @@ class UiSlider{
} }
Control.set_process(slider){|control, state, event, x,y,w,h| Control.set_process(slider){|control, state, event, x,y,w,h|
if(event.control != control) return if(event.control != control) return
if(!Util.valid_event(event)) return
if(event.type == UIEvent.press){ if(event.type == UIEvent.press){
state["pressed"] = true state["pressed"] = true
UI.capture(control) UI.capture(control)