diff --git a/scenes/Global.gd b/scenes/Global.gd index cdd1d8a..aaf685c 100644 --- a/scenes/Global.gd +++ b/scenes/Global.gd @@ -24,6 +24,11 @@ func goto_scene(path): wait_frames = 1 Loading.get_node("ColorRect/CenterContainer/VBoxContainer/ProgressBar").set_max(loader.get_stage_count()) +func gyroscope_enabled(): + if Input.get_gyroscope(): + return true + else: + return false func _process(_delta): print("[global#_process]") diff --git a/scenes/levels/warcraft/WarCraft.gd b/scenes/levels/warcraft/WarCraft.gd index 95685c5..c0ea296 100644 --- a/scenes/levels/warcraft/WarCraft.gd +++ b/scenes/levels/warcraft/WarCraft.gd @@ -1,8 +1,9 @@ extends Spatial const TIME_MAX = 3000 # msec -const GYROSCOPE_MAX_DIFF = 0.1 -const OFFSET_CAMERA = 0.12 +const GYROSCOPE_MAX_DIFF = 0.5 +const OFFSET_CAMERA_MAX = 0.12 +const OFFSET_STEP_CHANGE = 0.01 var gyroscope_value_old = Vector3(0, 0, 0) @@ -48,66 +49,63 @@ func _check_change_angle_camera(): var camera = $"Main Camera" var gyroscope = Input.get_gyroscope() - if camera.h_offset >= -OFFSET_CAMERA: - if _action_pressed("ui_left") or _gyroscope_changed_left(gyroscope): - # print("[warcraft#_ready] move camera angle to left") - $"Main Camera".h_offset -= 0.01 - - if camera.h_offset <= OFFSET_CAMERA: - if _action_pressed("ui_right") or _gyroscope_changed_right(gyroscope): - # print("[warcraft#_ready] move camera angle to right") - $"Main Camera".h_offset += 0.01 + if camera.h_offset >= -OFFSET_CAMERA_MAX: + if _action_pressed("ui_left") or _action_gyroscope("left", gyroscope): + print("[warcraft#_ready] move camera angle to left") + $"Main Camera".h_offset -= OFFSET_STEP_CHANGE - if camera.v_offset >= -OFFSET_CAMERA: - if _action_pressed("ui_down") or _gyroscope_changed_down(gyroscope): - # print("[warcraft#_ready] move camera angle to right") - $"Main Camera".v_offset -= 0.01 + if camera.h_offset <= OFFSET_CAMERA_MAX: + if _action_pressed("ui_right") or _action_gyroscope("right", gyroscope): + print("[warcraft#_ready] move camera angle to right") + $"Main Camera".h_offset += OFFSET_STEP_CHANGE - if camera.v_offset <= OFFSET_CAMERA: - if _action_pressed("ui_up") or _gyroscope_changed_up(gyroscope): - # print("[warcraft#_ready] move camera angle to right") - $"Main Camera".v_offset += 0.01 + if camera.v_offset >= -OFFSET_CAMERA_MAX: + if _action_pressed("ui_down") or _action_gyroscope("down", gyroscope): + print("[warcraft#_ready] move camera angle to down") + $"Main Camera".v_offset -= OFFSET_STEP_CHANGE + + if camera.v_offset <= OFFSET_CAMERA_MAX: + if _action_pressed("ui_up") or _action_gyroscope("up", gyroscope): + print("[warcraft#_ready] move camera angle to up") + $"Main Camera".v_offset += OFFSET_STEP_CHANGE gyroscope_value_old = gyroscope func _action_pressed(action): return Input.is_action_pressed(action) -func _gyroscope_changed_left(gyroscope): - if (gyroscope.y - gyroscope_value_old.y) > GYROSCOPE_MAX_DIFF: - print("[warcraft#_ready] (left)") - # print("[warcraft#_ready] "+String(gyroscope.y)+" (left ) y "+String(gyroscope.y)+" - y.old "+String(gyroscope_value_old.y)+" = "+String(gyroscope.y - gyroscope_value_old.y)) - return true +func _action_gyroscope(action, gyroscope): + if Global.gyroscope_enabled(): + var expression = Expression.new() + + expression.parse("_gyroscope_changed_"+action+"(gyroscope)", ["gyroscope"]) + + if expression.execute([gyroscope], self): + return true + else: + return false else: return false +func _gyroscope_changed_left(gyroscope): + return (gyroscope.abs().y - gyroscope_value_old.abs().y) > GYROSCOPE_MAX_DIFF and \ + gyroscope.y < gyroscope_value_old.y + func _gyroscope_changed_right(gyroscope): - if (gyroscope.y - gyroscope_value_old.y) > GYROSCOPE_MAX_DIFF and gyroscope.y > 0: - print("[warcraft#_ready] (right)") - # print("[warcraft#_ready] "+String(gyroscope.y)+" (right) y "+String(gyroscope.y)+" - x.old "+String(gyroscope_value_old.y)+" = "+String(gyroscope.y - gyroscope_value_old.y)) - return true - else: - return false + return (gyroscope.abs().y - gyroscope_value_old.abs().y) > GYROSCOPE_MAX_DIFF and \ + gyroscope.y > gyroscope_value_old.y func _gyroscope_changed_down(gyroscope): - if (gyroscope.z - gyroscope_value_old.z) > GYROSCOPE_MAX_DIFF or \ - (gyroscope.x - gyroscope_value_old.x) > GYROSCOPE_MAX_DIFF: - print("[warcraft#_ready] "+String(gyroscope.z)+"|| "+String(gyroscope.x)+" (down )") - # print("[warcraft#_ready] (down)") - # print("[warcraft#_ready] (down) x "+String(gyroscope.x)+" - x.old "+String(gyroscope_value_old.x)+" = "+String(gyroscope.x - gyroscope_value_old.x)) - return true - else: - return false + return (gyroscope.abs().z - gyroscope_value_old.abs().z) > GYROSCOPE_MAX_DIFF and \ + gyroscope.z > gyroscope_value_old.z or \ + (gyroscope.abs().x - gyroscope_value_old.abs().x) > GYROSCOPE_MAX_DIFF and \ + gyroscope.x > gyroscope_value_old.x func _gyroscope_changed_up(gyroscope): - if (gyroscope.z - gyroscope_value_old.z) > GYROSCOPE_MAX_DIFF and gyroscope.z > 0 or \ - (gyroscope.x - gyroscope_value_old.x) > GYROSCOPE_MAX_DIFF and gyroscope.x > 0 : - print("[warcraft#_ready] "+String(gyroscope.z)+"|| "+String(gyroscope.x)+" (up )") - # print("[warcraft#_ready] (up ) ") - # print("[warcraft#_ready] (up) x "+String(gyroscope.x)+" - x.old "+String(gyroscope_value_old.x)+" = "+String(gyroscope.x - gyroscope_value_old.x)) - return true - else: - return false + return (gyroscope.abs().z - gyroscope_value_old.abs().z) > GYROSCOPE_MAX_DIFF and \ + gyroscope.z < gyroscope_value_old.z or \ + (gyroscope.abs().x - gyroscope_value_old.abs().x) > GYROSCOPE_MAX_DIFF and \ + gyroscope.x < gyroscope_value_old.x func _notification(what): # Notification for android back action @@ -122,7 +120,7 @@ func _quit_to_menu(): Global.goto_scene("res://scenes/main.tscn") # Event when user click/touch dagger -func _on_dagger_input_event(camera, event, click_position, click_normal, shape_idx): +func _on_dagger_input_event(_camera, event, _click_position, _click_normal, _shape_idx): _initialize_mesh_ref("dagger", event) func _initialize_mesh_ref(meshInstance, event): diff --git a/scenes/levels/warcraft/WarCraft.tscn b/scenes/levels/warcraft/WarCraft.tscn index b3a6804..31a8f79 100644 --- a/scenes/levels/warcraft/WarCraft.tscn +++ b/scenes/levels/warcraft/WarCraft.tscn @@ -113,7 +113,7 @@ cell_center_y = false cell_center_z = false baked_meshes = [ SubResource( 2 ) ] data = { -"cells": PoolIntArray( 0, 0, 536870915, 65531, 0, 3, 65532, 0, 3, 65533, 0, 3, 65534, 0, 3, 65535, 0, -1610612733, 0, 1, 3, 65531, 1, 3, 65532, 1, 3, 65533, 1, 3, 65534, 1, -1610612733, 65535, 1, 3, 0, 2, -1073741821, 65531, 2, 3, 65532, 2, 3, 65533, 2, 3, 65534, 2, -1610612733, 65535, 2, 3, 0, 65534, 3, 65531, 65534, 3, 65532, 65534, -1073741821, 65533, 65534, 3, 65534, 65534, 536870915, 65535, 65534, 3, 0, 65535, 3, 65531, 65535, 3, 65532, 65535, 3, 65533, 65535, 3, 65534, 65535, 3, 65535, 65535, 3 ) +"cells": PoolIntArray( 0, 0, 3, 65531, 0, 3, 65532, 0, 536870915, 65533, 0, 3, 65534, 0, 3, 65535, 0, 3, 0, 1, 3, 65531, 1, 3, 65532, 1, 3, 65533, 1, 3, 65534, 1, 3, 65535, 1, 3, 0, 2, 3, 65531, 2, 3, 65532, 2, -1610612733, 65533, 2, 3, 65534, 2, 3, 65535, 2, -1073741821, 0, 65534, 536870915, 65531, 65534, 3, 65532, 65534, 3, 65533, 65534, -1610612733, 65534, 65534, 3, 65535, 65534, -1073741821, 0, 65535, 3, 65531, 65535, 3, 65532, 65535, 3, 65533, 65535, 3, 65534, 65535, 3, 65535, 65535, 3 ) } __meta__ = { "_editor_clip_": 0, diff --git a/scenes/main.gd b/scenes/main.gd index 5dacb77..6902d50 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -15,14 +15,6 @@ func _ready(): $Grid/Menu/Action/About.text = tr("MAIN_BUTTON_ABOUT") $Grid/Menu/Action/Quit.text = tr("MAIN_BUTTON_QUIT") -func _process(delta): - var gyroscope = Input.get_gyroscope().abs() - var value = Vector2(gyroscope[0], gyroscope[1]) - if value[0] > value_old[0] + max_diff and value[1] > value_old[1] + max_diff: - print("[main#_process] " + String(value)) - - value_old = value - # Quit the game func _on_Quit_pressed(): get_tree().quit(0)