From 1d347e770fddcdd051890cdf070fd2779ab113bf Mon Sep 17 00:00:00 2001 From: Anson Bridges Date: Mon, 19 Sep 2022 17:44:22 -0400 Subject: problems: player controller perf, boat perf, NAVSERVER PERF --- godot/scenes/machines/Cannon.tscn | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'godot/scenes/machines') diff --git a/godot/scenes/machines/Cannon.tscn b/godot/scenes/machines/Cannon.tscn index 633d910..fbfbdf1 100644 --- a/godot/scenes/machines/Cannon.tscn +++ b/godot/scenes/machines/Cannon.tscn @@ -1,7 +1,9 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://scripts/machines/Cannon.gd" type="Script" id=1] [ext_resource path="res://sounds/explode.wav" type="AudioStream" id=2] +[ext_resource path="res://meshes/cannon_barrel.tres" type="ArrayMesh" id=3] +[ext_resource path="res://meshes/cannon_base.tres" type="ArrayMesh" id=4] [sub_resource type="PhysicsMaterial" id=8] rough = true @@ -9,23 +11,8 @@ rough = true [sub_resource type="BoxShape" id=1] extents = Vector3( 1, 0.5, 0.5 ) -[sub_resource type="SpatialMaterial" id=2] -albedo_color = Color( 0.333333, 0.25098, 0.0392157, 1 ) - -[sub_resource type="CubeMesh" id=3] -size = Vector3( 1.5, 0.25, 1 ) - -[sub_resource type="CubeMesh" id=4] -size = Vector3( 1.75, 0.3, 0.3 ) - -[sub_resource type="SpatialMaterial" id=5] -albedo_color = Color( 0, 0, 0, 1 ) -metallic = 1.0 -metallic_specular = 0.0 -roughness = 0.53 - [sub_resource type="BoxShape" id=6] -extents = Vector3( 0.2, 0.2, 0.2 ) +extents = Vector3( 0.2, 0.473253, 0.536751 ) [sub_resource type="CubeMesh" id=7] size = Vector3( 0.4, 0.4, 0.4 ) @@ -41,8 +28,7 @@ shape = SubResource( 1 ) [node name="MeshInstance" type="MeshInstance" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 0.125, 0 ) -material_override = SubResource( 2 ) -mesh = SubResource( 3 ) +mesh = ExtResource( 4 ) [node name="YawJoint" type="Spatial" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.368354, 0.499951, 0 ) @@ -51,26 +37,27 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.368354, 0.499951, 0 ) [node name="Barrel" type="MeshInstance" parent="YawJoint/PitchJoint"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.355227, 0, 0 ) -mesh = SubResource( 4 ) +mesh = ExtResource( 3 ) skeleton = NodePath("../..") -material/0 = SubResource( 5 ) [node name="Muzzle" type="Spatial" parent="YawJoint/PitchJoint"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.13452, 0, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1.30877, 0, 0 ) [node name="explosion_sound" type="AudioStreamPlayer3D" parent="YawJoint/PitchJoint/Muzzle"] stream = ExtResource( 2 ) unit_db = 9.0 [node name="CameraPoint" type="Spatial" parent="YawJoint/PitchJoint"] -transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.873605, 0.209748, 0.0103165 ) +transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.873605, 0.291723, 0.0103165 ) [node name="SteerArea" type="Area" parent="."] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.935472, 0.123637, 0 ) monitoring = false [node name="CollisionShape" type="CollisionShape" parent="SteerArea"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0778996, 0.339775, 0 ) shape = SubResource( 6 ) [node name="MeshInstance" type="MeshInstance" parent="SteerArea"] +visible = false mesh = SubResource( 7 ) -- cgit v1.2.3