alexandru.stanciu/immersive-home
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

clean up enter leave

Browse Source
This commit is contained in:
Nitwel 2023-11-05 14:09:19 +01:00
parent c240efa56f
commit 8a75f09efe
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/raycast.gd
View File

@ -26,13 +26,14 @@ func _get_event_data():
func _handle_move(): func _handle_move():
var distance = ray.get_collision_point().distance_to(_click_point) var distance = ray.get_collision_point().distance_to(_click_point)
var collider = ray.get_collider()
if distance > 0.01: if distance > 0.01:
if _is_pressed: if _is_pressed:
_call_fn("_on_press_move") _call_fn(collider, "_on_press_move")
_moved = true _moved = true
if _is_grabbed: if _is_grabbed:
_call_fn("_on_grab_move") _call_fn(collider, "_on_grab_move")
_moved = true _moved = true
func _handle_enter_leave(): func _handle_enter_leave():
@ -41,11 +42,8 @@ func _handle_enter_leave():
if collider == _last_collided: if collider == _last_collided:
return return
if _last_collided != null && _last_collided.has_method("_on_ray_enter"): _call_fn(collider, "_on_ray_enter")
_last_collided._on_ray_enter(_get_event_data()) _call_fn(_last_collided, "_on_ray_leave")
if collider != null && collider.has_method("_on_ray_leave"):
collider._on_ray_leave(_get_event_data())
_last_collided = collider _last_collided = collider
@ -59,11 +57,11 @@ func _on_button_pressed(button):
"trigger_click": "trigger_click":
_is_pressed = true _is_pressed = true
_click_point = ray.get_collision_point() _click_point = ray.get_collision_point()
_call_fn("_on_press_down") _call_fn(collider, "_on_press_down")
"grip_click": "grip_click":
_is_grabbed = true _is_grabbed = true
_click_point = ray.get_collision_point() _click_point = ray.get_collision_point()
_call_fn("_on_grab_down") _call_fn(collider, "_on_grab_down")
func _on_button_released(button): func _on_button_released(button):
var collider = ray.get_collider() var collider = ray.get_collider()
@ -75,22 +73,16 @@ func _on_button_released(button):
"trigger_click": "trigger_click":
if _is_pressed: if _is_pressed:
if _moved == false: if _moved == false:
_call_fn("_on_click") _call_fn(collider, "_on_click")
_call_fn("_on_press_up") _call_fn(collider, "_on_press_up")
_is_pressed = false _is_pressed = false
_moved = false _moved = false
"grip_click": "grip_click":
if _is_grabbed: if _is_grabbed:
_call_fn("_on_grab_up") _call_fn(collider, "_on_grab_up")
_is_grabbed = false _is_grabbed = false
_moved = false _moved = false
func _call_fn(fn_name: String): func _call_fn(collider: Object, fn_name: String):
print("call_fn", fn_name) if collider != null && collider.has_method(fn_name):
var collider = ray.get_collider()
if collider == null:
return
if collider.has_method(fn_name):
collider.call(fn_name, _get_event_data()) collider.call(fn_name, _get_event_data())