Skip to content
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

Jump to bottom

Rotate map with keyboard keys? #90 #103

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

Rotate map with keyboard keys? #90 #103

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions project.godot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,16 @@ unit_groups_access_9={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":57,"key_label":0,"unicode":57,"echo":false,"script":null)
]
}
rotate_map_clock={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"echo":false,"script":null)
]
}
rotate_map_counterclock={
"deadzone": 0.5,
"events": [null, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"echo":false,"script":null)
]
}

[internationalization]

Expand Down
39 changes: 30 additions & 9 deletions source/match/IsometricCamera3D.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const EXPECTED_PROJECTION = PROJECTION_ORTHOGONAL
@export var bounding_planes: Array[Plane] = []
@export_group("Rotation")
@export var rotation_speed = 0.005
@export var arrowkey_rotation_speed = 200
@export var default_y_rotation_degrees = 0.0
@export var reference_plane_for_rotation = Plane(Vector3.UP, 0.0)
@export_group("View")
Expand All @@ -24,7 +25,8 @@ var _movement_vector_2d = Vector2(0, 0)
var _pivot_point_2d = null
var _pivot_point_3d = null
var _camera_point_3d = null

var _rotation_pos = Vector2.ZERO
var _arrowkey_rotation = false

func _ready():
assert(projection == EXPECTED_PROJECTION, "unexpected projection")
Expand Down Expand Up @@ -54,9 +56,24 @@ func _physics_process(delta):
func _process(_delta):
if !_is_rotating():
_move()
elif _arrowkey_rotation:
if (Input.is_action_pressed("rotate_map_clock")):
_rotation_pos.x += _delta * arrowkey_rotation_speed
if (Input.is_action_pressed("rotate_map_counterclock")):
_rotation_pos.x -= _delta * arrowkey_rotation_speed
_rotate(_rotation_pos)


func _unhandled_input(event):
if !_is_rotating():
if Input.is_action_just_pressed("rotate_map_clock") or Input.is_action_just_pressed("rotate_map_counterclock"):
_arrowkey_rotation = true
_start_rotation(event)
else:
if Input.is_action_just_released("rotate_map_clock") or Input.is_action_just_released("rotate_map_counterclock") :
if not (Input.is_action_pressed("rotate_map_clock") or Input.is_action_pressed("rotate_map_counterclock")):
_arrowkey_rotation = false
_stop_rotation()
if event is InputEventMouseButton:
if event.is_pressed() and event.button_index == MOUSE_BUTTON_WHEEL_UP:
_zoom_in()
Expand All @@ -66,14 +83,14 @@ func _unhandled_input(event):
event.is_pressed() and event.button_index == MOUSE_BUTTON_MIDDLE and event.double_click
):
_reset_rotation()
elif event.is_pressed() and event.button_index == MOUSE_BUTTON_MIDDLE:
elif event.is_pressed() and event.button_index == MOUSE_BUTTON_MIDDLE and !_arrowkey_rotation:
_start_rotation(event)
elif not event.is_pressed() and event.button_index == MOUSE_BUTTON_MIDDLE:
elif not event.is_pressed() and event.button_index == MOUSE_BUTTON_MIDDLE and !_arrowkey_rotation:
_stop_rotation()
elif event is InputEventMouseMotion:
var mouse_pos = event.position
if _is_rotating():
_rotate(mouse_pos)
var rotation_pos = event.position #the mouse position
if !_arrowkey_rotation and _is_rotating():
_rotate(rotation_pos)


func set_size_safely(a_size):
Expand Down Expand Up @@ -128,16 +145,20 @@ func _start_rotation(event):
_pivot_point_3d = _calculate_pivot_point_3d()
if _pivot_point_3d != null:
_movement_vector_2d = Vector2(0, 0)
_pivot_point_2d = event.position
if "position" in event:
_pivot_point_2d = event.position
else:
_pivot_point_2d = Vector2.ZERO
_camera_point_3d = global_transform.origin


func _stop_rotation():
_pivot_point_2d = null
_rotation_pos = Vector2.ZERO


func _rotate(mouse_pos):
var strength = mouse_pos.x - _pivot_point_2d.x
func _rotate(rotation_pos):
var strength = rotation_pos.x - _pivot_point_2d.x
var camera_point_2d = Vector2(_camera_point_3d.x, _camera_point_3d.z)
var pivot_point_2d = Vector2(_pivot_point_3d.x, _pivot_point_3d.z)
var diff_vec = camera_point_2d - pivot_point_2d
Expand Down
Loading