chindit/Ransom-s-wake
1
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat(cockpit): replace procedural cockpit with twelve scripted models
Quality Gate / Quality Gate (pull_request) Successful in 7m6s
Details

Browse Source 
Instance twelve Blender-scripted glTF models in the cockpit scene and
rebuild the cabin around them: gauge panel, sonar, switch panel, alert
box, speaker, porthole, hull wall, caged lamps, gas bottle, handrails
and side consoles. Presentation only; no domain, application or world
rule changes beyond enabling glow in the test environment.

- Needles, alert lamps and sonar screen are driven by the existing
  snapshots; the alert box now carries SYS/ATTN/ALRM.
- Depth dial reads percent of certified depth.
- Sonar display restyled as a turquoise holographic relief with a
  shader grid and height scale; SubViewport matches the glass (960x604).
- Cabin lighting retuned: warm pooled lamp light, cool porthole rim,
  lamp shadows, dial backlight.
- Procedural stand-ins removed (bulkhead, tanks, consoles, levers,
  indicator columns, placeholder pipe run, dial face PNGs).
- Tests adapted where nodes disappeared; one assertion removed
  (pipe_segment_count) until the pipe kit is placed.
- Model .glb files are committed without LFS; textures Godot extracts
  next to them at import are ignored.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
OlivierandClaude Opus 5.5 committed 2026-10-06 21:46:46 +02:00
1 parent 912123087f
commit 2c1ea50aba
45 files changed
+1353 -1603
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/presentation/cockpit/cockpit_interior.tscn
+88 -217
View File
@@ -1,8 +1,23 @@
[gd_scene load_steps=21 format=3]
[gd_scene load_steps=31 format=3]
[ext_resource type="Script" path="res://game/presentation/cockpit/cockpit_instrument_panel.gd" id="1_instruments"]
[ext_resource type="Script" path="res://game/presentation/cockpit/cockpit_detailing.gd" id="2_detailing"]
[ext_resource type="Script" path="res://game/presentation/cockpit/cockpit_pressure_bulkhead.gd" id="3_bulkhead"]
[ext_resource type="Script" path="res://game/presentation/cockpit/cockpit_analog_gauges.gd" id="4_gauges"]
[ext_resource type="Script" path="res://game/presentation/cockpit/cockpit_sonar_console.gd" id="5_sonar_console"]
[ext_resource type="Script" path="res://game/presentation/cockpit/cockpit_alert_box.gd" id="6_alert_box"]
[ext_resource type="Script" path="res://game/presentation/cockpit/cockpit_switch_panel.gd" id="7_switch_panel"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/gauge_panel.glb" id="8_gauge_panel_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/sonar.glb" id="9_sonar_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/switch_panel.glb" id="10_switch_panel_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/alert_box.glb" id="11_alert_box_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/speaker.glb" id="12_speaker_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/hull_wall.glb" id="13_hull_wall_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/porthole.glb" id="14_porthole_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/gas_bottle.glb" id="15_gas_bottle_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/handrail_l.glb" id="16_handrail_l_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/handrail_r.glb" id="17_handrail_r_model"]
[ext_resource type="PackedScene" path="res://game/presentation/cockpit/assets/models/side_console.glb" id="18_side_console_model"]
[sub_resource type="StandardMaterial3D" id="SteelMaterial"]
albedo_color = Color(0.055, 0.07, 0.07, 1)
@@ -23,13 +38,6 @@ roughness = 0.43
albedo_color = Color(0.018, 0.024, 0.025, 1)
roughness = 0.88
[sub_resource type="StandardMaterial3D" id="GlassMaterial"]
transparency = 1
albedo_color = Color(0.08, 0.29, 0.32, 0.12)
metallic = 0.05
roughness = 0.16
cull_mode = 2
[sub_resource type="StandardMaterial3D" id="ScreenMaterial"]
albedo_color = Color(0.006, 0.025, 0.028, 1)
metallic = 0.15
@@ -62,33 +70,9 @@ emission_energy_multiplier = 2.8
[sub_resource type="BoxMesh" id="UnitBoxMesh"]
size = Vector3(1, 1, 1)
[sub_resource type="TorusMesh" id="PortholeTorusMesh"]
inner_radius = 0.56
outer_radius = 0.71
rings = 48
ring_segments = 16
[sub_resource type="CylinderMesh" id="GlassCylinderMesh"]
top_radius = 0.56
bottom_radius = 0.56
height = 0.012
radial_segments = 64
[sub_resource type="CylinderMesh" id="BoltMesh"]
top_radius = 0.026
bottom_radius = 0.026
height = 0.045
radial_segments = 12
[sub_resource type="QuadMesh" id="ScreenQuadMesh"]
size = Vector2(1, 1)
[sub_resource type="CylinderMesh" id="LeverMesh"]
top_radius = 0.018
bottom_radius = 0.023
height = 0.24
radial_segments = 12
[sub_resource type="SphereMesh" id="KnobMesh"]
radius = 0.046
height = 0.092
@@ -111,20 +95,20 @@ script = ExtResource("2_detailing")
[node name="CabinShell" type="Node3D" parent="."]
[node name="LeftWall" type="MeshInstance3D" parent="CabinShell"]
position = Vector3(-1.03, 0.24, -0.15)
scale = Vector3(0.16, 1.82, 2.7)
position = Vector3(-1.25, 0.47, 0.53)
scale = Vector3(0.16, 2.62, 1.1)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("PaintedMaterial")
[node name="RightWall" type="MeshInstance3D" parent="CabinShell"]
position = Vector3(1.03, 0.24, -0.15)
scale = Vector3(0.16, 1.82, 2.7)
position = Vector3(1.25, 0.47, 0.53)
scale = Vector3(0.16, 2.62, 1.1)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("PaintedMaterial")
[node name="Ceiling" type="MeshInstance3D" parent="CabinShell"]
position = Vector3(0, 1.22, -0.2)
scale = Vector3(2.15, 0.16, 2.6)
position = Vector3(0, 1.72, 0.53)
scale = Vector3(2.66, 0.16, 1.1)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("SteelMaterial")
@@ -135,29 +119,11 @@ mesh = SubResource("UnitBoxMesh")
material_override = SubResource("RubberMaterial")
[node name="RearBulkhead" type="MeshInstance3D" parent="CabinShell"]
position = Vector3(0, 0.22, 1.08)
scale = Vector3(2.08, 1.75, 0.16)
position = Vector3(0, 0.47, 1.08)
scale = Vector3(2.66, 2.62, 0.16)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("SteelMaterial")
[node name="LeftRib" type="MeshInstance3D" parent="CabinShell"]
position = Vector3(-0.88, 0.26, -0.45)
scale = Vector3(0.11, 1.75, 0.18)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("BrassMaterial")
[node name="RightRib" type="MeshInstance3D" parent="CabinShell"]
position = Vector3(0.88, 0.26, -0.45)
scale = Vector3(0.11, 1.75, 0.18)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("BrassMaterial")
[node name="CeilingRib" type="MeshInstance3D" parent="CabinShell"]
position = Vector3(0, 1.05, -0.45)
scale = Vector3(1.82, 0.1, 0.18)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("BrassMaterial")
[node name="PortholeAssembly" type="Node3D" parent="."]
position = Vector3(0, 0.47, -1.32)
@@ -165,107 +131,15 @@ position = Vector3(0, 0.47, -1.32)
unique_name_in_owner = true
script = ExtResource("3_bulkhead")
[node name="LeftBulkhead" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(-0.94, 0, 0)
scale = Vector3(0.6, 1.82, 0.2)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("SteelMaterial")
[node name="HullWall" parent="PortholeAssembly/CurvedPressureBulkhead" instance=ExtResource("13_hull_wall_model")]
[node name="RightBulkhead" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0.94, 0, 0)
scale = Vector3(0.6, 1.82, 0.2)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("SteelMaterial")
[node name="TopBulkhead" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0, 0.91, 0)
scale = Vector3(1.55, 0.52, 0.2)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("SteelMaterial")
[node name="BottomBulkhead" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0, -0.91, 0)
scale = Vector3(1.55, 0.52, 0.2)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("SteelMaterial")
[node name="WindowFrame" type="MeshInstance3D" parent="PortholeAssembly"]
unique_name_in_owner = true
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("PortholeTorusMesh")
material_override = SubResource("BrassMaterial")
[node name="RubberSeal" type="MeshInstance3D" parent="PortholeAssembly"]
scale = Vector3(0.91, 0.91, 0.91)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("PortholeTorusMesh")
material_override = SubResource("RubberMaterial")
[node name="WindowGlass" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0, 0, -0.01)
rotation_degrees = Vector3(90, 0, 0)
cast_shadow = 0
mesh = SubResource("GlassCylinderMesh")
material_override = SubResource("GlassMaterial")
[node name="BoltTop" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0, 0.665, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="BoltBottom" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0, -0.665, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="BoltLeft" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(-0.665, 0, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="BoltRight" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0.665, 0, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="BoltUpperLeft" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(-0.47, 0.47, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="BoltUpperRight" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0.47, 0.47, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="BoltLowerLeft" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(-0.47, -0.47, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="BoltLowerRight" type="MeshInstance3D" parent="PortholeAssembly"]
position = Vector3(0.47, -0.47, 0.1)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("BoltMesh")
material_override = SubResource("SteelMaterial")
[node name="Porthole" parent="PortholeAssembly/CurvedPressureBulkhead" instance=ExtResource("14_porthole_model")]
[node name="Dashboard" type="Node3D" parent="."]
unique_name_in_owner = true
position = Vector3(0, 0.05, -1.22)
rotation_degrees = Vector3(-12, 0, 0)
[node name="MainPanel" type="MeshInstance3D" parent="Dashboard"]
scale = Vector3(1.56, 0.44, 0.14)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("PaintedMaterial")
[node name="ResourcesFrame" type="MeshInstance3D" parent="Dashboard"]
position = Vector3(-0.49, -0.115, 0.14)
scale = Vector3(0.34, 0.065, 0.025)
@@ -331,7 +205,7 @@ modulate = Color(0.76, 0.74, 0.6, 1)
[node name="ReturnLabel" type="Label3D" parent="Dashboard"]
unique_name_in_owner = true
position = Vector3(0.61, 0.245, 0.17)
position = Vector3(0.22, 0.266, 0.158)
pixel_size = 0.00062
font_size = 12
outline_size = 2
@@ -340,89 +214,86 @@ modulate = Color(1, 0.75, 0.2, 1)
[node name="StatusLabel" type="Label3D" parent="Dashboard"]
unique_name_in_owner = true
position = Vector3(-0.61, 0.245, 0.17)
position = Vector3(-0.36, 0.266, 0.158)
pixel_size = 0.00062
font_size = 12
outline_size = 2
text = "SYSTÈMES · NORMAL"
modulate = Color(0.45, 0.89, 0.9, 1)
[node name="LeftConsole" type="MeshInstance3D" parent="."]
position = Vector3(-0.82, -0.23, -1.19)
rotation_degrees = Vector3(-8, 18, 4)
scale = Vector3(0.32, 0.16, 0.56)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("PaintedMaterial")
[node name="AnalogGauges" type="Node3D" parent="Dashboard"]
position = Vector3(0, -0.06, 0.15)
script = ExtResource("4_gauges")
[node name="RightConsole" type="MeshInstance3D" parent="."]
position = Vector3(0.82, -0.23, -1.19)
rotation_degrees = Vector3(-8, -18, -4)
scale = Vector3(0.32, 0.16, 0.56)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("PaintedMaterial")
[node name="ThrottleLever" type="MeshInstance3D" parent="."]
position = Vector3(-0.79, -0.06, -1.13)
rotation_degrees = Vector3(18, 0, -10)
scale = Vector3(0.72, 0.72, 0.72)
mesh = SubResource("LeverMesh")
material_override = SubResource("SteelMaterial")
[node name="ThrottleKnob" type="MeshInstance3D" parent="."]
position = Vector3(-0.81, 0.025, -1.1)
scale = Vector3(0.72, 0.72, 0.72)
mesh = SubResource("KnobMesh")
material_override = SubResource("BrassMaterial")
[node name="VerticalLever" type="MeshInstance3D" parent="."]
position = Vector3(0.79, -0.06, -1.13)
rotation_degrees = Vector3(18, 0, 10)
scale = Vector3(0.72, 0.72, 0.72)
mesh = SubResource("LeverMesh")
material_override = SubResource("SteelMaterial")
[node name="VerticalKnob" type="MeshInstance3D" parent="."]
position = Vector3(0.81, 0.025, -1.1)
scale = Vector3(0.72, 0.72, 0.72)
mesh = SubResource("KnobMesh")
material_override = SubResource("BrassMaterial")
[node name="GaugePanelModel" parent="Dashboard/AnalogGauges" instance=ExtResource("8_gauge_panel_model")]
[node name="SonarMonitor" type="Node3D" parent="."]
position = Vector3(0.54, 0.59, -1.04)
position = Vector3(0.54, 0.48, -1.04)
rotation_degrees = Vector3(-5, -42, -2)
scale = Vector3(0.6, 0.6, 0.6)
script = ExtResource("5_sonar_console")
[node name="Housing" type="MeshInstance3D" parent="SonarMonitor"]
scale = Vector3(0.6, 0.37, 0.1)
mesh = SubResource("UnitBoxMesh")
material_override = SubResource("PaintedMaterial")
[node name="SonarScreen" type="MeshInstance3D" parent="SonarMonitor"]
unique_name_in_owner = true
position = Vector3(-0.025, 0.012, 0.06)
scale = Vector3(0.36, 0.235, 1)
mesh = SubResource("ScreenQuadMesh")
material_override = SubResource("ScreenMaterial")
[node name="SonarModel" parent="SonarMonitor" instance=ExtResource("9_sonar_model")]
scale = Vector3(0.31, 0.31, 0.31)
[node name="SonarPlaceholder" type="Label3D" parent="SonarMonitor"]
unique_name_in_owner = true
position = Vector3(-0.025, 0.012, 0.068)
pixel_size = 0.0009
position = Vector3(-0.0164, 0.002, 0.026)
pixel_size = 0.00054
font_size = 16
outline_size = 2
text = "SONAR\nMODULE EN ATTENTE"
text = "SONAR
MODULE EN ATTENTE"
modulate = Color(0.34, 0.6, 0.6, 1)
[node name="AlertBox" type="Node3D" parent="."]
position = Vector3(-0.86, 0.555, -1.214)
rotation_degrees = Vector3(0, 15, 0)
script = ExtResource("6_alert_box")
[node name="AlertBoxModel" parent="AlertBox" instance=ExtResource("11_alert_box_model")]
scale = Vector3(0.5, 0.5, 0.5)
[node name="SwitchPanel" type="Node3D" parent="."]
position = Vector3(-0.74, -0.125, -0.97)
rotation_degrees = Vector3(0, 30, 0)
script = ExtResource("7_switch_panel")
[node name="SwitchPanelModel" parent="SwitchPanel" instance=ExtResource("10_switch_panel_model")]
scale = Vector3(0.37, 0.37, 0.37)
[node name="Speaker" parent="." instance=ExtResource("12_speaker_model")]
position = Vector3(0.83, 0.84, -1.22)
rotation_degrees = Vector3(0, -15, 0)
scale = Vector3(0.56, 0.56, 0.56)
[node name="GasBottle" parent="." instance=ExtResource("15_gas_bottle_model")]
position = Vector3(-1.02, 0.36, -1.225)
rotation_degrees = Vector3(0, 53.3, 0)
scale = Vector3(0.65, 0.65, 0.65)
[node name="HandrailLeft" parent="." instance=ExtResource("16_handrail_l_model")]
position = Vector3(-0.6, 0.24, -1.1)
[node name="HandrailRight" parent="." instance=ExtResource("17_handrail_r_model")]
position = Vector3(0.6, 0.24, -1.1)
[node name="SideConsoleLeft" parent="." instance=ExtResource("18_side_console_model")]
position = Vector3(-0.632, -0.61, -1.215)
[node name="SideConsoleRight" parent="." instance=ExtResource("18_side_console_model")]
position = Vector3(0.632, -0.61, -1.215)
scale = Vector3(-1, 1, 1)
[node name="EmergencyDial" type="MeshInstance3D" parent="."]
position = Vector3(-0.7, 0.32, -1.15)
scale = Vector3(0.18, 0.18, 0.18)
position = Vector3(-0.845, 0.47, -1.283)
scale = Vector3(0.3, 0.3, 0.3)
rotation_degrees = Vector3(90, 0, 0)
mesh = SubResource("DialMesh")
material_override = SubResource("RedMaterial")
[node name="EmergencyLabel" type="Label3D" parent="."]
position = Vector3(-0.7, 0.275, -1.125)
pixel_size = 0.00072
position = Vector3(-0.845, 0.418, -1.28)
pixel_size = 0.0015
font_size = 12
outline_size = 2
text = "ÉJECTION · X"
@@ -449,15 +320,15 @@ material_override = SubResource("RedMaterial")
[node name="CabinLight" type="OmniLight3D" parent="."]
unique_name_in_owner = true
position = Vector3(0, 0.92, -0.28)
light_color = Color(0.36, 0.68, 0.69, 1)
light_energy = 1.25
light_color = Color(1, 0.7, 0.46, 1)
light_energy = 0.04
shadow_enabled = true
omni_range = 3.3
[node name="PanelLight" type="OmniLight3D" parent="."]
unique_name_in_owner = true
position = Vector3(0, 0.18, -0.63)
light_color = Color(0.23, 0.72, 0.76, 1)
light_energy = 0.58
light_color = Color(1, 0.72, 0.5, 1)
light_energy = 0.4
shadow_enabled = false
omni_range = 1.35
omni_range = 0.8