Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
retour committed Sep 29, 2019
2 parents 7666574 + 58ba6ea commit 9d3d917
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
13 changes: 5 additions & 8 deletions Perspectives/PC/FirstPersonPC.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[gd_scene load_steps=7 format=2]
[gd_scene load_steps=6 format=2]

[ext_resource path="res://Perspectives/PC/PlayerController.gd" type="Script" id=1]
[ext_resource path="res://Perspectives/PC/SettingsCamera.gd" type="Script" id=2]
[ext_resource path="res://UI/OrientationCompass/Compass.tscn" type="PackedScene" id=3]
[ext_resource path="res://Perspectives/PC/Minimap/MinimapIcon.tscn" type="PackedScene" id=4]
[ext_resource path="res://Resources/Images/UI/MapIcons/MapCursor.png" type="Texture" id=5]
[ext_resource path="res://Perspectives/PC/Minimap/MinimapIcon.tscn" type="PackedScene" id=3]
[ext_resource path="res://Resources/Images/UI/MapIcons/MapCursor.png" type="Texture" id=4]

[sub_resource type="CapsuleShape" id=1]

Expand All @@ -28,11 +27,9 @@ far = 70000.0
script = ExtResource( 2 )
setting_title = "player"

[node name="Compass" parent="Head/Camera" instance=ExtResource( 3 )]

[node name="MinimapIcon" parent="Head" instance=ExtResource( 4 )]
[node name="MinimapIcon" parent="Head" instance=ExtResource( 3 )]
transform = Transform( 1.00002, 0, 0, 0, 1, 0, 0, 0, 1.00002, 0, 0, 0 )
icon = ExtResource( 5 )
icon = ExtResource( 4 )
rotate = true

[node name="CollisionShape" type="CollisionShape" parent="."]
Expand Down
6 changes: 3 additions & 3 deletions Util/LinearDrawer/LinearDrawer.gd
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ func set_width(new_width):


# Modifies the road polygon to have a given height
# That height is also extruded downwards as a safeguard against floating roads
# That height * 2 is also extruded downwards as a safeguard against floating roads
func set_height(new_height):
height = new_height

csg_road.polygon[0].y = -height
csg_road.polygon[0].y = -height * 2
csg_road.polygon[1].y = height
csg_road.polygon[2].y = height
csg_road.polygon[3].y = -height
csg_road.polygon[3].y = -height * 2


# Adds the given array of Vector3 points to the road's curve
Expand Down

0 comments on commit 9d3d917

Please sign in to comment.