From 4068e66756966983973ab20b68ec5382e398548b Mon Sep 17 00:00:00 2001
From: Anson Bridges <bridges.anson@gmail.com>
Date: Tue, 13 Sep 2022 18:15:01 -0400
Subject: incomplete airplane implementation (needs addl. network sync)

---
 godot/scenes/characters/PlayerRigid.tscn | 56 ++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 20 deletions(-)

(limited to 'godot/scenes/characters/PlayerRigid.tscn')

diff --git a/godot/scenes/characters/PlayerRigid.tscn b/godot/scenes/characters/PlayerRigid.tscn
index 8f61532..89c9df0 100644
--- a/godot/scenes/characters/PlayerRigid.tscn
+++ b/godot/scenes/characters/PlayerRigid.tscn
@@ -1,13 +1,14 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=11 format=2]
 
 [ext_resource path="res://scripts/characters/player_controller_new.gd" type="Script" id=1]
 [ext_resource path="res://theming/FreeMono.otf" type="DynamicFontData" id=2]
 [ext_resource path="res://scenes/characters/PlayerAreaDetect.gd" type="Script" id=3]
 
 [sub_resource type="PhysicsMaterial" id=3]
+resource_local_to_scene = true
 rough = true
 
-[sub_resource type="BoxShape" id=1]
+[sub_resource type="BoxShape" id=6]
 extents = Vector3( 0.325, 0.9, 0.325 )
 
 [sub_resource type="CubeMesh" id=2]
@@ -22,67 +23,78 @@ outline_size = 3
 use_filter = true
 font_data = ExtResource( 2 )
 
+[sub_resource type="BoxShape" id=1]
+extents = Vector3( 0.325, 0.9, 0.325 )
+
+[sub_resource type="CylinderMesh" id=7]
+top_radius = 0.01
+bottom_radius = 0.01
+height = 0.3
+radial_segments = 6
+
 [node name="Soldier" type="RigidBody" groups=["playable", "player"]]
 collision_layer = 32769
 collision_mask = 32769
 mode = 2
 mass = 80.0
 physics_material_override = SubResource( 3 )
-contacts_reported = 5
+continuous_cd = true
+contacts_reported = 3
 contact_monitor = true
 can_sleep = false
-axis_lock_angular_x = true
-axis_lock_angular_y = true
-axis_lock_angular_z = true
 linear_damp = 0.0
 angular_damp = 0.0
 script = ExtResource( 1 )
 
 [node name="Collision" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0 )
-shape = SubResource( 1 )
+shape = SubResource( 6 )
 
-[node name="Head" type="Spatial" parent="."]
+[node name="Neck" type="Spatial" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.44, 0 )
 
-[node name="Camera" type="Camera" parent="Head"]
-keep_aspect = 0
-cull_mask = 524287
-fov = 90.0
-near = 0.2
-far = 1449.4
+[node name="Head" type="Spatial" parent="Neck"]
 
-[node name="UseRay" type="RayCast" parent="Head/Camera"]
+[node name="UseRay" type="RayCast" parent="Neck/Head"]
+unique_name_in_owner = true
 enabled = true
 cast_to = Vector3( 0, 0, -2.5 )
 collision_mask = 131075
 collide_with_areas = true
 
-[node name="MeleeRay" type="RayCast" parent="Head/Camera"]
+[node name="MeleeRay" type="RayCast" parent="Neck/Head"]
+unique_name_in_owner = true
 enabled = true
 cast_to = Vector3( 0, 0, -2.5 )
 collision_mask = 262145
 collide_with_areas = true
 
-[node name="viewmodel_c" type="ViewportContainer" parent="Head"]
+[node name="Camera" type="Camera" parent="Neck/Head"]
+keep_aspect = 0
+cull_mask = 524287
+fov = 90.0
+near = 0.2
+far = 1449.4
+
+[node name="viewmodel_c" type="ViewportContainer" parent="Neck"]
 visible = false
 margin_right = 1024.0
 margin_bottom = 600.0
 
-[node name="viewmodel" type="Viewport" parent="Head/viewmodel_c"]
+[node name="viewmodel" type="Viewport" parent="Neck/viewmodel_c"]
 size = Vector2( 1024, 600 )
 transparent_bg = true
 handle_input_locally = false
 render_target_update_mode = 0
 
-[node name="vm_camera" type="Camera" parent="Head/viewmodel_c/viewmodel"]
+[node name="vm_camera" type="Camera" parent="Neck/viewmodel_c/viewmodel"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.539779, 0 )
 cull_mask = 524288
 current = true
 fov = 90.0
 far = 75.9
 
-[node name="MeshInstance" type="MeshInstance" parent="Head/viewmodel_c/viewmodel"]
+[node name="MeshInstance" type="MeshInstance" parent="Neck/viewmodel_c/viewmodel"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0266792, -0.813922 )
 layers = 524288
 mesh = SubResource( 2 )
@@ -114,5 +126,9 @@ script = ExtResource( 3 )
 [node name="Collision" type="CollisionShape" parent="AreaDetect"]
 shape = SubResource( 1 )
 
+[node name="normal_vis" type="MeshInstance" parent="."]
+mesh = SubResource( 7 )
+skeleton = NodePath("../Feet")
+
 [connection signal="area_entered" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_entered"]
 [connection signal="area_exited" from="AreaDetect" to="AreaDetect" method="_on_AreaDetect_area_exited"]
-- 
cgit v1.2.3