little update on boat model

This commit is contained in:
Lucas 2025-04-10 01:29:57 +02:00
parent 054292b5b8
commit bfb2b27d2a
No known key found for this signature in database
5 changed files with 117 additions and 28 deletions

2
Assets

@ -1 +1 @@
Subproject commit a6d255dfbf3475499e4ac345d9b9a5fad8d23e7f Subproject commit 672fa9b94ea72d6878f30b42df85dcbbf0cfba31

View file

@ -1,10 +1,14 @@
[gd_scene load_steps=8 format=3 uid="uid://bdfqifxsvpts4"] [gd_scene load_steps=12 format=3 uid="uid://bdfqifxsvpts4"]
[ext_resource type="Script" uid="uid://cjo6l2ykgvn4e" path="res://Boats/boat.gd" id="1_q76at"] [ext_resource type="Script" uid="uid://cjo6l2ykgvn4e" path="res://Boats/boat.gd" id="1_q76at"]
[ext_resource type="Script" uid="uid://cnfkxclrq0i0s" path="res://Boats/buyancy_probe.gd" id="3_dd4jx"] [ext_resource type="Script" uid="uid://cnfkxclrq0i0s" path="res://Boats/buyancy_probe.gd" id="3_dd4jx"]
[ext_resource type="ArrayMesh" uid="uid://dgma1pxsaqqc3" path="res://Assets/Kenney/Models/Pirate Kit/ship_parts/ship-large_ship-large.res" id="3_t04dj"]
[ext_resource type="ArrayMesh" uid="uid://63iwwqxggd3e" path="res://Assets/Kenney/Models/Pirate Kit/ship_parts/ship-large_sail-b.res" id="4_euq1n"]
[ext_resource type="ArrayMesh" uid="uid://dlqnfentppo0i" path="res://Assets/Kenney/Models/Pirate Kit/ship_parts/ship-large_sail-a.res" id="5_vxuru"]
[ext_resource type="ArrayMesh" uid="uid://ursbsi2e4hwd" path="res://Assets/Kenney/Models/Pirate Kit/ship_parts/ship-large_flag-a.res" id="8_4nawq"]
[sub_resource type="BoxShape3D" id="BoxShape3D_g5njt"] [sub_resource type="BoxShape3D" id="BoxShape3D_g5njt"]
size = Vector3(2, 0.35, 1) size = Vector3(2.5564, 0.64585, 1)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bmmu8"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bmmu8"]
albedo_color = Color(1, 0.172549, 0, 1) albedo_color = Color(1, 0.172549, 0, 1)
@ -20,56 +24,95 @@ size = Vector3(0.1, 2.5, 0.1)
[node name="Boat" type="RigidBody3D"] [node name="Boat" type="RigidBody3D"]
mass = 50.0 mass = 50.0
linear_damp_mode = 1
linear_damp = 0.8
angular_damp = 34.351
script = ExtResource("1_q76at") script = ExtResource("1_q76at")
max_thrust_force = 3000.0 max_thrust_force = 2000.0
max_steering = 10.0 max_steering = 20.0
debug = true debug = true
metadata/_custom_type_script = "uid://cjo6l2ykgvn4e" metadata/_custom_type_script = "uid://cjo6l2ykgvn4e"
[node name="BuyancyProbe" type="Marker3D" parent="."] [node name="BuyancyProbe" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, -0.0397125) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.53813, 0, -0.0397125)
gizmo_extents = 1.0 gizmo_extents = 1.0
script = ExtResource("3_dd4jx") script = ExtResource("3_dd4jx")
float_strength = 2.0 float_strength = 0.5
max_float_force = 3000.0 max_float_force = 3000.0
show_probe = true
metadata/_custom_type_script = "uid://cnfkxclrq0i0s" metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
[node name="BuyancyProbe2" type="Marker3D" parent="."] [node name="BuyancyProbe2" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0235078, 0, -0.5) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.738639, 0, -0.699151)
gizmo_extents = 1.0 gizmo_extents = 1.0
script = ExtResource("3_dd4jx") script = ExtResource("3_dd4jx")
float_strength = 0.5 float_strength = 0.35
max_float_force = 3000.0 max_float_force = 3000.0
show_probe = true
metadata/_custom_type_script = "uid://cnfkxclrq0i0s" metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
[node name="BuyancyProbe3" type="Marker3D" parent="."] [node name="BuyancyProbe3" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0674343, 0, 0.5) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.694713, 0, 0.687886)
gizmo_extents = 1.0
script = ExtResource("3_dd4jx")
float_strength = 0.35
max_float_force = 3000.0
show_probe = true
metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
[node name="BuyancyProbe5" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.74207, 0, -0.699151)
gizmo_extents = 1.0
script = ExtResource("3_dd4jx")
float_strength = 0.35
max_float_force = 3000.0
show_probe = true
metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
[node name="BuyancyProbe6" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.785997, 0, 0.687886)
gizmo_extents = 1.0
script = ExtResource("3_dd4jx")
float_strength = 0.35
max_float_force = 3000.0
show_probe = true
metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
[node name="BuyancyProbe7" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.133223, 0, -0.065601)
gizmo_extents = 1.0
script = ExtResource("3_dd4jx")
max_float_force = 3000.0
show_probe = true
metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
[node name="BuyancyProbe4" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.17025, 0, -0.0214682)
gizmo_extents = 1.0 gizmo_extents = 1.0
script = ExtResource("3_dd4jx") script = ExtResource("3_dd4jx")
float_strength = 0.5 float_strength = 0.5
max_float_force = 3000.0 max_float_force = 3000.0
metadata/_custom_type_script = "uid://cnfkxclrq0i0s" show_probe = true
[node name="BuyancyProbe4" type="Marker3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, -0.0214682)
gizmo_extents = 1.0
script = ExtResource("3_dd4jx")
float_strength = 2.0
max_float_force = 3000.0
metadata/_custom_type_script = "uid://cnfkxclrq0i0s" metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
[node name="CollisionShape3D" type="CollisionShape3D" parent="."] [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.08, 0, 0)
shape = SubResource("BoxShape3D_g5njt") shape = SubResource("BoxShape3D_g5njt")
[node name="CamRoot" type="Node3D" parent="."] [node name="CamRoot" type="Node3D" parent="."]
transform = Transform3D(0.0223035, 0, -0.999751, 0, 1, 0, 0.999751, 0, 0.0223035, 0, 0, 0) transform = Transform3D(0.0223035, 0, -0.999751, 0, 1, 0, 0.999751, 0, 0.0223035, 0, 0, 0)
[node name="Camera3D" type="Camera3D" parent="CamRoot"] [node name="Camera3D" type="Camera3D" parent="CamRoot"]
transform = Transform3D(0.999961, 0.00871108, 0.00177106, -0.00871108, 0.920573, 0.390473, 0.00177106, -0.390473, 0.920613, -0.0666215, 2.29821, 2.9863) transform = Transform3D(1, 0, 0, 0, 0.791224, 0.611527, 0, -0.611527, 0.791224, 0, 2.5, 2)
h_offset = 2.0
current = true current = true
fov = 90.0
near = 0.002
far = 1000.0
[node name="MeshInstance3D" type="MeshInstance3D" parent="."] [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.131158, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.131158, 0)
visible = false
material_override = SubResource("StandardMaterial3D_bmmu8") material_override = SubResource("StandardMaterial3D_bmmu8")
mesh = SubResource("BoxMesh_bmmu8") mesh = SubResource("BoxMesh_bmmu8")
@ -77,3 +120,42 @@ mesh = SubResource("BoxMesh_bmmu8")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.467696, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.467696, 0)
material_override = SubResource("StandardMaterial3D_dd4jx") material_override = SubResource("StandardMaterial3D_dd4jx")
mesh = SubResource("BoxMesh_dd4jx") mesh = SubResource("BoxMesh_dd4jx")
[node name="ship_model" type="Node3D" parent="."]
transform = Transform3D(0.235, 0, 0, 0, 0.235, 0, 0, 0, 0.235, 0, -0.44733, 0)
[node name="ship-large" type="MeshInstance3D" parent="ship_model"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.07576, 0.0369781, 0)
gi_mode = 2
mesh = ExtResource("3_t04dj")
skeleton = NodePath("")
[node name="sail-b" type="MeshInstance3D" parent="ship_model/ship-large"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.88765e-15, 4.54746, -5.35727)
gi_mode = 2
mesh = ExtResource("4_euq1n")
skeleton = NodePath("")
[node name="sail-a" type="MeshInstance3D" parent="ship_model/ship-large"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.77529e-15, 3.13852, -0.35634)
gi_mode = 2
mesh = ExtResource("5_vxuru")
skeleton = NodePath("")
[node name="flag-c" type="MeshInstance3D" parent="ship_model/ship-large"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.77529e-15, 8.23797, -5.35727)
gi_mode = 2
mesh = ExtResource("8_4nawq")
skeleton = NodePath("")
[node name="flag-b" type="MeshInstance3D" parent="ship_model/ship-large"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.73259e-14, 8.83798, -0.342734)
gi_mode = 2
mesh = ExtResource("8_4nawq")
skeleton = NodePath("")
[node name="flag-a" type="MeshInstance3D" parent="ship_model/ship-large"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.15506e-14, 5.68097, 4.21532)
gi_mode = 2
mesh = ExtResource("8_4nawq")
skeleton = NodePath("")

View file

@ -45,16 +45,16 @@ shader_parameter/albedo = Color(0, 0.32, 0.43, 1)
shader_parameter/albedo2 = Color(0, 0.47, 0.76, 1) shader_parameter/albedo2 = Color(0, 0.47, 0.76, 1)
shader_parameter/color_deep = Color(0.11, 0.29, 0.33, 1) shader_parameter/color_deep = Color(0.11, 0.29, 0.33, 1)
shader_parameter/color_shallow = Color(1, 1, 1, 1) shader_parameter/color_shallow = Color(1, 1, 1, 1)
shader_parameter/shore_fade = 0.165 shader_parameter/shore_fade = 0.115
shader_parameter/shore_intensity = 0.7 shader_parameter/shore_intensity = 1.0
shader_parameter/metallic = 0.0 shader_parameter/metallic = 0.031
shader_parameter/roughness = 0.02 shader_parameter/roughness = 0.154
shader_parameter/water_alpha_fade = 4.407 shader_parameter/water_alpha_fade = 1.85
shader_parameter/water_alpha_max = 15.0 shader_parameter/water_alpha_max = 1.661
shader_parameter/texture_normal = SubResource("NoiseTexture2D_d50os") shader_parameter/texture_normal = SubResource("NoiseTexture2D_d50os")
shader_parameter/texture_normal2 = SubResource("NoiseTexture2D_ca8p6") shader_parameter/texture_normal2 = SubResource("NoiseTexture2D_ca8p6")
shader_parameter/wave = SubResource("NoiseTexture2D_cuet1") shader_parameter/wave = SubResource("NoiseTexture2D_cuet1")
shader_parameter/wave_time = 13.1719 shader_parameter/wave_time = 215.425
shader_parameter/wave_direction = Vector2(2, 0) shader_parameter/wave_direction = Vector2(2, 0)
shader_parameter/wave_2_direction = Vector2(0, 0.9) shader_parameter/wave_2_direction = Vector2(0, 0.9)
shader_parameter/time_scale = 0.02 shader_parameter/time_scale = 0.02

View file

@ -2174,5 +2174,6 @@ metadata/_custom_type_script = "uid://cnfkxclrq0i0s"
script = ExtResource("6_kisq7") script = ExtResource("6_kisq7")
[node name="Boat" parent="." groups=["Boats"] instance=ExtResource("7_0g14k")] [node name="Boat" parent="." groups=["Boats"] instance=ExtResource("7_0g14k")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.13393, 0.319639, -0.448954) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.134, 0.037, -0.449)
max_steering = 5.0 max_thrust_force = 5000.0
max_steering = 15.0

View file

@ -100,3 +100,9 @@ jolt_physics_3d/simulation/sleep_velocity_threshold=0.1
3d/sleep_threshold_angular=0.174533 3d/sleep_threshold_angular=0.174533
common/physics_interpolation=true common/physics_interpolation=true
common/enable_object_picking=false common/enable_object_picking=false
[rendering]
global_illumination/gi/use_half_resolution=true
global_illumination/voxel_gi/quality=1
environment/ssao/quality=3