Skip to content

Fixed getting stuck into edges with key nav #4

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
StStep wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed getting stuck into edges with key nav #4

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
29 changes: 20 additions & 9 deletions addons/carmel4a97.RTS_Camera2D/RTS-Camera2D.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Copyright 2017 Kamil Lewan <carmel4a97@gmail.com>
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All @@ -33,7 +33,7 @@ export (bool) var wheel = true
export (int) var zoom_out_limit = 100

# Camera speed in px/s.
export (int) var camera_speed = 450
export (int) var camera_speed = 450

# Initial zoom value taken from Editor.
var camera_zoom = get_zoom()
Expand Down Expand Up @@ -66,7 +66,6 @@ func _ready():
set_follow_smoothing(4)

func _physics_process(delta):

# Move camera by keys defined in InputMap (ui_left/top/right/bottom).
if key:
if __keys[0]:
Expand All @@ -77,7 +76,7 @@ func _physics_process(delta):
camera_movement.x += camera_speed * delta
if __keys[3]:
camera_movement.y += camera_speed * delta

# Move camera by mouse, when it's on the margin (defined by camera_margin).
if edge:
var rec = get_viewport().get_visible_rect()
Expand All @@ -90,14 +89,26 @@ func _physics_process(delta):
camera_movement.y += camera_speed * delta
if v.y <= camera_margin:
camera_movement.y -= camera_speed * delta

# When RMB is pressed, move camera by difference of mouse position
if drag and __rmbk:
camera_movement = _prev_mouse_pos - get_local_mouse_position()

# Update position of the camera.
position += camera_movement * get_zoom()


# Limit position to avoid getting stuck in corner
var size = get_viewport().get_visible_rect ().size * get_zoom().x
if global_position.x + size.x/2 >= limit_right:
global_position.x = limit_right - size.x/2
if global_position.y + size.y/2 >= limit_bottom:
global_position.y = limit_bottom - size.y/2
if global_position.x - size.x/2 <= limit_left:
global_position.x = limit_left + size.x/2
if global_position.y - size.y/2 <= limit_top:
global_position.y = limit_top + size.y/2


# Set camera movement to zero, update old mouse position.
camera_movement = Vector2(0,0)
_prev_mouse_pos = get_local_mouse_position()
Expand Down