From 9d66e8f2ef801e71a59cf526989c4fc10869853c Mon Sep 17 00:00:00 2001 From: Chris Bradfield Date: Tue, 13 Mar 2018 21:52:41 -0700 Subject: [PATCH] Code cleanup --- 3d/kinematic_character/cubio.gd | 25 +++--- 3d/kinematic_character/follow_camera.gd | 18 ++-- 3d/kinematic_character/level.scn | Bin 481002 -> 480286 bytes 3d/material_testers/tester.gd | 43 ++++----- 3d/navmesh/navmesh.gd | 24 ++--- 3d/platformer/coin.gd | 2 +- 3d/platformer/enemy.gd | 26 +++--- 3d/platformer/follow_camera.gd | 32 +++---- 3d/platformer/player.gd | 85 +++++++++--------- 3d/truck_town/vehicle.gd | 20 ++--- misc/joypads/joypads.gd | 8 +- misc/sensors/main.gd | 5 +- misc/threads/thread.gd | 2 +- misc/tween/main.gd | 8 +- misc/window_management/control.gd | 62 ++++++------- networking/multiplayer_bomber/bomb.gd | 6 +- networking/multiplayer_bomber/gamestate.gd | 16 ++-- networking/multiplayer_bomber/lobby.gd | 26 +++--- networking/multiplayer_bomber/player.gd | 36 ++++---- networking/multiplayer_bomber/score.gd | 4 +- networking/multiplayer_pong/ball.gd | 52 +++++------ networking/multiplayer_pong/lobby.gd | 40 ++++----- networking/multiplayer_pong/paddle.gd | 51 +++++------ networking/multiplayer_pong/pong.gd | 34 ++++--- plugins/custom_import_plugin/import_plugin.gd | 2 +- .../Silly_material_creator.gd | 6 -- .../Silly_material_resource.gd | 2 - .../material_import.gd | 4 +- viewport/2d_in_3d/pong.gd | 14 +-- viewport/3d_in_2d/3D_in_2D.gd | 12 +-- viewport/gui_in_3d/gui_3d.gd | 15 ++-- 31 files changed, 319 insertions(+), 361 deletions(-) diff --git a/3d/kinematic_character/cubio.gd b/3d/kinematic_character/cubio.gd index c1f241f0..4be05807 100644 --- a/3d/kinematic_character/cubio.gd +++ b/3d/kinematic_character/cubio.gd @@ -13,46 +13,45 @@ const MAX_SLOPE_ANGLE = 30 func _physics_process(delta): var dir = Vector3() # Where does the player intend to walk to - var cam_xform = get_node("target/camera").get_global_transform() + var cam_xform = $target/camera.get_global_transform() - if (Input.is_action_pressed("move_forward")): + if Input.is_action_pressed("move_forward"): dir += -cam_xform.basis[2] - if (Input.is_action_pressed("move_backwards")): + if Input.is_action_pressed("move_backwards"): dir += cam_xform.basis[2] - if (Input.is_action_pressed("move_left")): + if Input.is_action_pressed("move_left"): dir += -cam_xform.basis[0] - if (Input.is_action_pressed("move_right")): + if Input.is_action_pressed("move_right"): dir += cam_xform.basis[0] dir.y = 0 dir = dir.normalized() - vel.y += delta*g + vel.y += delta * g var hvel = vel hvel.y = 0 - var target = dir*MAX_SPEED + var target = dir * MAX_SPEED var accel - if (dir.dot(hvel) > 0): + if dir.dot(hvel) > 0: accel = ACCEL else: accel = DEACCEL - hvel = hvel.linear_interpolate(target, accel*delta) + hvel = hvel.linear_interpolate(target, accel * delta) vel.x = hvel.x vel.z = hvel.z - vel = move_and_slide(vel,Vector3(0,1,0)) + vel = move_and_slide(vel, Vector3(0,1,0)) - if (is_on_floor() and Input.is_action_pressed("jump")): + if is_on_floor() and Input.is_action_pressed("jump"): vel.y = JUMP_SPEED var crid = get_node("../elevator1").get_rid() - func _on_tcube_body_enter(body): - if (body == self): + if body == self: get_node("../ty").show() diff --git a/3d/kinematic_character/follow_camera.gd b/3d/kinematic_character/follow_camera.gd index 2cae84d1..7b4dca31 100644 --- a/3d/kinematic_character/follow_camera.gd +++ b/3d/kinematic_character/follow_camera.gd @@ -22,15 +22,15 @@ func _physics_process(dt): # Regular delta follow # Check ranges - if (delta.length() < min_distance): - delta = delta.normalized()*min_distance - elif (delta.length() > max_distance): - delta = delta.normalized()*max_distance + if delta.length() < min_distance: + delta = delta.normalized() * min_distance + elif delta.length() > max_distance: + delta = delta.normalized() * max_distance # Check upper and lower height - if (delta.y > max_height): + if delta.y > max_height: delta.y = max_height - if (delta.y < min_height): + if delta.y < min_height: delta.y = min_height pos = target + delta @@ -39,15 +39,15 @@ func _physics_process(dt): # Turn a little up or down var t = transform - t.basis = Basis(t.basis[0], deg2rad(angle_v_adjust))*t.basis + t.basis = Basis(t.basis[0], deg2rad(angle_v_adjust)) * t.basis transform = t func _ready(): # Find collision exceptions for ray var node = self - while(node): - if (node is RigidBody): + while node: + if node is RigidBody: collision_exception.append(node.get_rid()) break else: diff --git a/3d/kinematic_character/level.scn b/3d/kinematic_character/level.scn index eb8061a072205fd3ee2cd333ef0a906d535e22f9..7b02a2aac0fa8c481e773bc63ccd129253fcbc72 100644 GIT binary patch delta 452697 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