Tweaks, changes, and bugfixes
This commit is contained in:
@ -1,7 +1,8 @@
|
||||
[gd_scene load_steps=6 format=2]
|
||||
[gd_scene load_steps=7 format=2]
|
||||
|
||||
[ext_resource path="res://assets/images/character/iron_player.png" type="Texture" id=1]
|
||||
[ext_resource path="res://scripts/entities/Player.gd" type="Script" id=2]
|
||||
[ext_resource path="res://scripts/entities/Camera.gd" type="Script" id=3]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id=1]
|
||||
|
||||
@ -36,3 +37,4 @@ __meta__ = {
|
||||
|
||||
[node name="Camera" type="Camera2D" parent="."]
|
||||
zoom = Vector2( 0.5, 0.5 )
|
||||
script = ExtResource( 3 )
|
||||
|
35
client/scripts/entities/Camera.gd
Normal file
35
client/scripts/entities/Camera.gd
Normal file
@ -0,0 +1,35 @@
|
||||
extends Camera2D
|
||||
|
||||
#-------------#
|
||||
# Camera Zoom #
|
||||
#-------------#
|
||||
export var zoomDecelration = 4
|
||||
export var zoomCapSpeed = 0.125
|
||||
|
||||
export var minZoom = 0.25
|
||||
export var maxZoom = 0.5
|
||||
var zoomChange = 0
|
||||
|
||||
func _ready():
|
||||
zoom.x = (minZoom + maxZoom) / 2
|
||||
zoom.y = (minZoom + maxZoom) / 2
|
||||
|
||||
func _process(delta):
|
||||
CameraZoom(delta)
|
||||
|
||||
func _input(event):
|
||||
if event is InputEventMouseButton:
|
||||
if event.is_pressed():
|
||||
if event.button_index == BUTTON_WHEEL_UP:
|
||||
zoomChange = -zoomCapSpeed
|
||||
if event.button_index == BUTTON_WHEEL_DOWN:
|
||||
zoomChange = zoomCapSpeed
|
||||
|
||||
func CameraZoom(delta):
|
||||
if(zoomChange > 0):
|
||||
zoomChange = clamp(zoomChange - zoomDecelration * delta, 0, zoomCapSpeed)
|
||||
elif(zoomChange < 0):
|
||||
zoomChange = clamp(zoomChange + zoomDecelration * delta, -zoomCapSpeed, 0)
|
||||
|
||||
zoom.x = clamp(zoom.x + zoomChange, minZoom, maxZoom)
|
||||
zoom.y = clamp(zoom.y + zoomChange, minZoom, maxZoom)
|
@ -23,6 +23,7 @@ var packetQueue = []
|
||||
var error_info = ""
|
||||
var world_data : String = ""
|
||||
|
||||
var last_move_time = null
|
||||
|
||||
var connection_timer : Timer
|
||||
|
||||
@ -111,9 +112,12 @@ func send_packet(packet : PoolByteArray, channel = 0, pck_type = GDNetMessage.RE
|
||||
packetQueue.append({'channel':channel, 'packet' : packet, 'type' : pck_type})
|
||||
|
||||
func move_player(x,y):
|
||||
var pckt : PoolByteArray = ("3|" + str(x) + "," + str(y)).to_ascii()
|
||||
if last_move_time == null || OS.get_ticks_msec() - last_move_time > 50:
|
||||
|
||||
var pckt : PoolByteArray = ("3|" + str(x) + "," + str(y)).to_ascii()
|
||||
|
||||
send_packet(pckt, 0, GDNetMessage.SEQUENCED)
|
||||
send_packet(pckt, 0, GDNetMessage.SEQUENCED)
|
||||
last_move_time = OS.get_ticks_msec()
|
||||
|
||||
func _process(delta):
|
||||
process_events()
|
||||
|
Reference in New Issue
Block a user