Adjust the terrain and fallback camera for bobup trials
Now there are two targets at 15 and 40 feet. The fallback camera has minimal FoV that still shows the instruments.
This commit is contained in:
parent
f6b002c718
commit
0514c64f02
4 changed files with 62 additions and 8 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
[gd_scene load_steps=204 format=3 uid="uid://bchcr54i3piaw"]
|
[gd_scene load_steps=205 format=3 uid="uid://bchcr54i3piaw"]
|
||||||
|
|
||||||
[ext_resource type="Texture2D" uid="uid://41mr2bbcbjpo" path="res://ads33-terrain/concrete_moss_diff_4k.jpg" id="1_ong3a"]
|
[ext_resource type="Texture2D" uid="uid://41mr2bbcbjpo" path="res://ads33-terrain/concrete_moss_diff_4k.jpg" id="1_ong3a"]
|
||||||
[ext_resource type="PackedScene" uid="uid://7tddcx4u26w4" path="res://assets/cone/cone.tscn" id="2_hj5f7"]
|
[ext_resource type="PackedScene" uid="uid://7tddcx4u26w4" path="res://assets/cone/cone.tscn" id="2_hj5f7"]
|
||||||
|
|
@ -79,7 +79,7 @@ size = Vector3(2.5, 0.244, 0.012)
|
||||||
|
|
||||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ohwyq"]
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ohwyq"]
|
||||||
shading_mode = 0
|
shading_mode = 0
|
||||||
albedo_color = Color(0.537255, 0.529412, 0.278431, 1)
|
albedo_color = Color(0.537255, 0.756863, 0.278431, 1)
|
||||||
|
|
||||||
[sub_resource type="BoxMesh" id="BoxMesh_rnkd2"]
|
[sub_resource type="BoxMesh" id="BoxMesh_rnkd2"]
|
||||||
size = Vector3(6, 0.3, 6)
|
size = Vector3(6, 0.3, 6)
|
||||||
|
|
@ -91,12 +91,15 @@ uv1_scale = Vector3(3, 3, 3)
|
||||||
[sub_resource type="CylinderMesh" id="CylinderMesh_ri5lb"]
|
[sub_resource type="CylinderMesh" id="CylinderMesh_ri5lb"]
|
||||||
top_radius = 0.3
|
top_radius = 0.3
|
||||||
bottom_radius = 0.3
|
bottom_radius = 0.3
|
||||||
height = 15.04
|
height = 24.5
|
||||||
|
|
||||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ugwq3"]
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ugwq3"]
|
||||||
albedo_texture = ExtResource("4_poywc")
|
albedo_texture = ExtResource("4_poywc")
|
||||||
uv1_scale = Vector3(3, 36, 3)
|
uv1_scale = Vector3(3, 36, 3)
|
||||||
|
|
||||||
|
[sub_resource type="BoxMesh" id="BoxMesh_tgb06"]
|
||||||
|
size = Vector3(6, 4.572, 6)
|
||||||
|
|
||||||
[sub_resource type="CylinderMesh" id="CylinderMesh_j01qt"]
|
[sub_resource type="CylinderMesh" id="CylinderMesh_j01qt"]
|
||||||
height = 0.001
|
height = 0.001
|
||||||
|
|
||||||
|
|
@ -705,7 +708,7 @@ shader_params/u_globalmap_blend_start = 0.0
|
||||||
shader_params/u_globalmap_blend_distance = 0.0
|
shader_params/u_globalmap_blend_distance = 0.0
|
||||||
shader_params/u_colormap_opacity_per_texture = Vector4(1, 1, 1, 1)
|
shader_params/u_colormap_opacity_per_texture = Vector4(1, 1, 1, 1)
|
||||||
shader_params/u_specular = 0.5
|
shader_params/u_specular = 0.5
|
||||||
metadata/_custom_type_script = ExtResource("6_1xj3b")
|
metadata/_custom_type_script = "uid://bov8uure5wkmf"
|
||||||
metadata/MaterialOverride = false
|
metadata/MaterialOverride = false
|
||||||
|
|
||||||
[node name="Flat_herbe" type="MeshInstance3D" parent="."]
|
[node name="Flat_herbe" type="MeshInstance3D" parent="."]
|
||||||
|
|
@ -717,7 +720,7 @@ surface_material_override/0 = SubResource("StandardMaterial3D_omy3l")
|
||||||
transform = Transform3D(0.305, 0, 0, 0, 0.305, 0, 0, 0, 0.305, 0, 0, 15)
|
transform = Transform3D(0.305, 0, 0, 0, 0.305, 0, 0, 0, 0.305, 0, 0, 15)
|
||||||
|
|
||||||
[node name="TargetHeightFeet" type="Node3D" parent="Table"]
|
[node name="TargetHeightFeet" type="Node3D" parent="Table"]
|
||||||
transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, 0, 25, 0)
|
transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, 0, 40, 0)
|
||||||
|
|
||||||
[node name="boule" type="MeshInstance3D" parent="Table/TargetHeightFeet"]
|
[node name="boule" type="MeshInstance3D" parent="Table/TargetHeightFeet"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.678, -1)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.678, -1)
|
||||||
|
|
@ -755,8 +758,47 @@ mesh = SubResource("BoxMesh_u22o6")
|
||||||
skeleton = NodePath("")
|
skeleton = NodePath("")
|
||||||
surface_material_override/0 = SubResource("StandardMaterial3D_ohwyq")
|
surface_material_override/0 = SubResource("StandardMaterial3D_ohwyq")
|
||||||
|
|
||||||
|
[node name="TargetHeightFeetLow" type="Node3D" parent="Table"]
|
||||||
|
transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, 0, 15, 0)
|
||||||
|
|
||||||
|
[node name="boule" type="MeshInstance3D" parent="Table/TargetHeightFeetLow"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.678, -1)
|
||||||
|
material_override = SubResource("StandardMaterial3D_io3gc")
|
||||||
|
mesh = SubResource("SphereMesh_x847j")
|
||||||
|
skeleton = NodePath("")
|
||||||
|
surface_material_override/0 = SubResource("StandardMaterial3D_sdjw4")
|
||||||
|
|
||||||
|
[node name="pied" type="MeshInstance3D" parent="Table/TargetHeightFeetLow/boule"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.851962, 0)
|
||||||
|
mesh = SubResource("CylinderMesh_x847j")
|
||||||
|
skeleton = NodePath("")
|
||||||
|
surface_material_override/0 = SubResource("StandardMaterial3D_6b770")
|
||||||
|
|
||||||
|
[node name="panneau1" type="MeshInstance3D" parent="Table/TargetHeightFeetLow"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.678, 2)
|
||||||
|
mesh = SubResource("BoxMesh_aqqlo")
|
||||||
|
skeleton = NodePath("")
|
||||||
|
surface_material_override/0 = SubResource("StandardMaterial3D_araq8")
|
||||||
|
|
||||||
|
[node name="Support" type="MeshInstance3D" parent="Table/TargetHeightFeetLow/panneau1"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.15, -1.25077, 0)
|
||||||
|
mesh = SubResource("BoxMesh_oo0l3")
|
||||||
|
skeleton = NodePath("")
|
||||||
|
surface_material_override/0 = SubResource("StandardMaterial3D_yo10o")
|
||||||
|
|
||||||
|
[node name="Support2" type="MeshInstance3D" parent="Table/TargetHeightFeetLow/panneau1"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.15, -1.25141, 0)
|
||||||
|
mesh = SubResource("BoxMesh_oo0l3")
|
||||||
|
skeleton = NodePath("")
|
||||||
|
surface_material_override/0 = SubResource("StandardMaterial3D_7icp3")
|
||||||
|
|
||||||
|
[node name="centrage" type="MeshInstance3D" parent="Table/TargetHeightFeetLow/panneau1"]
|
||||||
|
mesh = SubResource("BoxMesh_u22o6")
|
||||||
|
skeleton = NodePath("")
|
||||||
|
surface_material_override/0 = SubResource("StandardMaterial3D_ohwyq")
|
||||||
|
|
||||||
[node name="Top" type="MeshInstance3D" parent="Table"]
|
[node name="Top" type="MeshInstance3D" parent="Table"]
|
||||||
transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, 0, 24.5079, 0)
|
transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, 0, 40, 0)
|
||||||
mesh = SubResource("BoxMesh_rnkd2")
|
mesh = SubResource("BoxMesh_rnkd2")
|
||||||
surface_material_override/0 = SubResource("StandardMaterial3D_jm3fw")
|
surface_material_override/0 = SubResource("StandardMaterial3D_jm3fw")
|
||||||
|
|
||||||
|
|
@ -780,6 +822,12 @@ transform = Transform3D(3.281, 0, 0, 0, 3.281, 0, 0, 0, 3.281, -7.05415, -0.0012
|
||||||
mesh = SubResource("CylinderMesh_ri5lb")
|
mesh = SubResource("CylinderMesh_ri5lb")
|
||||||
surface_material_override/0 = SubResource("StandardMaterial3D_ugwq3")
|
surface_material_override/0 = SubResource("StandardMaterial3D_ugwq3")
|
||||||
|
|
||||||
|
[node name="Top2" type="MeshInstance3D" parent="Table"]
|
||||||
|
transform = Transform3D(3.28, 0, 0, 0, 3.28, 0, 0, 0, 3.28, 0, 7.60068, 0)
|
||||||
|
mesh = SubResource("BoxMesh_tgb06")
|
||||||
|
skeleton = NodePath("../Top")
|
||||||
|
surface_material_override/0 = SubResource("StandardMaterial3D_jm3fw")
|
||||||
|
|
||||||
[node name="Cercle" type="Node3D" parent="."]
|
[node name="Cercle" type="Node3D" parent="."]
|
||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 100, 0, 100)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 100, 0, 100)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.4, 0)
|
||||||
editor_description = "Target position for Local XR tracking"
|
editor_description = "Target position for Local XR tracking"
|
||||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.214, -0.7, 1.594)
|
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0.214, -0.7, 1.594)
|
||||||
script = ExtResource("3_gf6ud")
|
script = ExtResource("3_gf6ud")
|
||||||
|
use_mouse = false
|
||||||
|
|
||||||
[node name="PilotFloor" type="Node3D" parent="AttitudeRoot/PilotEyes"]
|
[node name="PilotFloor" type="Node3D" parent="AttitudeRoot/PilotEyes"]
|
||||||
editor_description = "Required for floor tracking
|
editor_description = "Required for floor tracking
|
||||||
|
|
@ -62,9 +63,11 @@ ignore_time_scale = true
|
||||||
|
|
||||||
[node name="FallbackCamera" type="Camera3D" parent="AttitudeRoot/PilotEyes"]
|
[node name="FallbackCamera" type="Camera3D" parent="AttitudeRoot/PilotEyes"]
|
||||||
transform = Transform3D(1, 0, 0, 0, 0.980955, 0.194234, 0, -0.194234, 0.980955, 0, 0, 0)
|
transform = Transform3D(1, 0, 0, 0, 0.980955, 0.194234, 0, -0.194234, 0.980955, 0, 0, 0)
|
||||||
|
fov = 60.0
|
||||||
|
|
||||||
[node name="Instruments" parent="AttitudeRoot" instance=ExtResource("3_5w717")]
|
[node name="Instruments" parent="AttitudeRoot" instance=ExtResource("3_5w717")]
|
||||||
transform = Transform3D(-0.5, -1.27582e-08, 7.43353e-08, 4.33325e-10, 0.4923, 0.0874084, -7.5421e-08, 0.0874084, -0.4923, 0.00724897, -1.1581, 2.40391)
|
transform = Transform3D(-0.5, -1.27582e-08, 7.43353e-08, 4.33325e-10, 0.4923, 0.0874084, -7.5421e-08, 0.0874084, -0.4923, 0.00724897, -1.1581, 2.40391)
|
||||||
|
lidia_hostname = "127.0.0.1"
|
||||||
|
|
||||||
[node name="MarshConnector" type="MarshConnector" parent="."]
|
[node name="MarshConnector" type="MarshConnector" parent="."]
|
||||||
hostname = "192.168.1.2"
|
hostname = "192.168.1.2"
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,8 @@ const CAMERA_MOUSE_ROTATION_SPEED := 0.001
|
||||||
const CAMERA_X_ROT_MIN := deg_to_rad(-85)
|
const CAMERA_X_ROT_MIN := deg_to_rad(-85)
|
||||||
const CAMERA_X_ROT_MAX := deg_to_rad(70)
|
const CAMERA_X_ROT_MAX := deg_to_rad(70)
|
||||||
|
|
||||||
|
@export var use_mouse: bool = true
|
||||||
|
|
||||||
var active: bool = false
|
var active: bool = false
|
||||||
var initial_rotation: Vector3
|
var initial_rotation: Vector3
|
||||||
|
|
||||||
|
|
@ -46,7 +48,7 @@ func _input(event):
|
||||||
(float(get_viewport().size.y) / get_viewport().get_visible_rect().size.y)
|
(float(get_viewport().size.y) / get_viewport().get_visible_rect().size.y)
|
||||||
)
|
)
|
||||||
|
|
||||||
if event is InputEventMouseMotion:
|
if use_mouse and event is InputEventMouseMotion:
|
||||||
var camera_speed_this_frame = CAMERA_MOUSE_ROTATION_SPEED
|
var camera_speed_this_frame = CAMERA_MOUSE_ROTATION_SPEED
|
||||||
rotate_camera(event.relative * camera_speed_this_frame * scale_factor)
|
rotate_camera(event.relative * camera_speed_this_frame * scale_factor)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@ config/icon="res://icon.svg"
|
||||||
|
|
||||||
[display]
|
[display]
|
||||||
|
|
||||||
|
window/size/viewport_width=1600
|
||||||
|
window/size/viewport_height=900
|
||||||
window/stretch/mode="viewport"
|
window/stretch/mode="viewport"
|
||||||
|
|
||||||
[editor_plugins]
|
[editor_plugins]
|
||||||
|
|
@ -36,7 +38,6 @@ anti_aliasing/quality/msaa_3d=1
|
||||||
|
|
||||||
[xr]
|
[xr]
|
||||||
|
|
||||||
openxr/enabled=true
|
|
||||||
openxr/reference_space=2
|
openxr/reference_space=2
|
||||||
openxr/foveation_level=3
|
openxr/foveation_level=3
|
||||||
shaders/enabled=true
|
shaders/enabled=true
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue