From b93d9028a9d3bf65520e7312a8f7eb0dced477ce Mon Sep 17 00:00:00 2001 From: Benjamin Navarro Date: Tue, 28 Jan 2020 13:32:18 +0100 Subject: [PATCH] Coding style --- viewport/dynamic_split_screen/CameraController.gd | 14 ++++---------- viewport/dynamic_split_screen/PlayerMovement.gd | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/viewport/dynamic_split_screen/CameraController.gd b/viewport/dynamic_split_screen/CameraController.gd index c75cc3f7..3f9e0994 100644 --- a/viewport/dynamic_split_screen/CameraController.gd +++ b/viewport/dynamic_split_screen/CameraController.gd @@ -21,7 +21,7 @@ extends Spatial export(float) var max_separation = 20.0 export(float) var split_line_thickness = 3.0 -export(Color, RGBA) var split_line_color = Color(0.0, 0.0, 0.0, 1.0) +export(Color, RGBA) var split_line_color = Color.black export(bool) var adaptive_split_line_thickness = true onready var player1 = $'../Player1' @@ -41,7 +41,7 @@ func _ready(): view.material.set_shader_param('viewport2', $Viewport2.get_texture()) -func _process(delta): +func _process(_delta): _move_cameras() _update_splitscreen() @@ -62,14 +62,8 @@ func _move_cameras(): func _update_splitscreen(): var screen_size = get_viewport().get_visible_rect().size - - var player1_position = camera1.unproject_position(player1.translation) - player1_position.x /= screen_size.x; - player1_position.y /= screen_size.y; - - var player2_position = camera2.unproject_position(player2.translation) - player2_position.x /= screen_size.x; - player2_position.y /= screen_size.y; + var player1_position = camera1.unproject_position(player1.translation) / screen_size + var player2_position = camera2.unproject_position(player2.translation) / screen_size var thickness if adaptive_split_line_thickness: diff --git a/viewport/dynamic_split_screen/PlayerMovement.gd b/viewport/dynamic_split_screen/PlayerMovement.gd index ea48d422..80ac4951 100644 --- a/viewport/dynamic_split_screen/PlayerMovement.gd +++ b/viewport/dynamic_split_screen/PlayerMovement.gd @@ -6,7 +6,7 @@ export(int, 1, 2) var player_id = 1 export(float) var walk_speed = 20.0 -func _physics_process(delta): +func _physics_process(_delta): var velocity = Vector3.ZERO velocity.z = -Input.get_action_strength("move_up_player" + str(player_id)) velocity.z += Input.get_action_strength("move_down_player" + str(player_id))