|
|
|
@ -74,7 +74,7 @@ func update_global_effect(delta):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func update_camera_pos(delta):
|
|
|
|
func update_camera_pos(delta):
|
|
|
|
target_pos_lerp(0, delta, 6)
|
|
|
|
target_pos_lerp(0, delta, 2)
|
|
|
|
target_pos_lerp(1, delta, 6)
|
|
|
|
target_pos_lerp(1, delta, 6)
|
|
|
|
position.x = (target_pos_now.x + shake_offset_x)
|
|
|
|
position.x = (target_pos_now.x + shake_offset_x)
|
|
|
|
position.z = (target_pos_now.y + target_pos_y + offset)
|
|
|
|
position.z = (target_pos_now.y + target_pos_y + offset)
|
|
|
|
@ -84,7 +84,7 @@ func update_camera_pos(delta):
|
|
|
|
func target_pos_lerp(index: int, delta: float, delta_scale: float):
|
|
|
|
func target_pos_lerp(index: int, delta: float, delta_scale: float):
|
|
|
|
var target_pos_real: Vector2 = target_pos
|
|
|
|
var target_pos_real: Vector2 = target_pos
|
|
|
|
var diff = abs(target_pos_now[index] - target_pos_real[index])
|
|
|
|
var diff = abs(target_pos_now[index] - target_pos_real[index])
|
|
|
|
if diff < Setting.pixel_size:
|
|
|
|
if diff < Setting.pixel_size /2:
|
|
|
|
target_pos_now[index] = target_pos_real[index]
|
|
|
|
target_pos_now[index] = target_pos_real[index]
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
var weight_min = Setting.pixel_size / 2 / diff
|
|
|
|
var weight_min = Setting.pixel_size / 2 / diff
|
|
|
|
|