Adding a new interior map from Ryzom assets

.godot/imported/ryzom_matis_appartment.gltf-8b187635b21aae6197f0b41aaa537879.md5

@@ -0,0 +1,3 @@
+source_md5="bb22d1e2959370aec64aba6ef74a1493"
+dest_md5="78d155bf6149817f2d4ce0d4e8a417b6"
+

maps/basic_setup.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=25 format=3 uid="uid://b8p2h0rmwy7qn"]
+[gd_scene load_steps=26 format=3 uid="uid://b8p2h0rmwy7qn"]
 
 [ext_resource type="Material" uid="uid://dpegsmygxcfmv" path="res://maps/materials/basic_ground.material" id="1_lodye"]
 [ext_resource type="Shader" path="res://maps/shaders/khanat_sky.gdshader" id="1_mheqi"]
@@ -19,28 +19,29 @@
 [ext_resource type="PackedScene" uid="uid://bfo13c5k8xu0x" path="res://maps/natural_ground.tscn" id="12_r7x73"]
 [ext_resource type="PackedScene" uid="uid://mdsxnqsijdqv" path="res://maps/dispensaire_01.tscn" id="13_ald41"]
 [ext_resource type="PackedScene" uid="uid://uyxppgx6n0ws" path="res://maps/objects/ashtarie-bench.tscn" id="15_k5x3t"]
+[ext_resource type="PackedScene" uid="uid://b68g7ddc1uaw4" path="res://maps/ryzom_matis_appartment.tscn" id="20_66hq8"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_s2q0l"]
 shader = ExtResource("1_mheqi")
-zabr_position = Vector3(1.755, 0.599, 0.613)
-zabr_arc = 8.0
-zabr = ExtResource("3_bgghj")
-turbidity = 10.0
-sun_disk_scale = 1.0
-stigi_position = Vector3(1.209, 0.444, 0.332)
-stigi_arc = 8.381
-stigi = ExtResource("3_jqgsm")
-samayun_position = Vector3(2.038, 0.695, -0.237)
-samayun_arc = 45.681
-samayun = ExtResource("1_thm7k")
-rayleigh_color = Color(0.3, 0.405, 0.6, 1)
-rayleigh = 2.0
-mie_eccentricity = 0.8
-mie_color = Color(0.69, 0.729, 0.812, 1)
-mie = 0.005
-ground_color = Color(0.1, 0.07, 0.034, 1)
-exposure = 0.1
-dither_strength = 1.0
+shader_parameter/dither_strength = 1.0
+shader_parameter/exposure = 0.1
+shader_parameter/ground_color = Color(0.1, 0.07, 0.034, 1)
+shader_parameter/mie = 0.005
+shader_parameter/mie_color = Color(0.69, 0.729, 0.812, 1)
+shader_parameter/mie_eccentricity = 0.8
+shader_parameter/rayleigh = 2.0
+shader_parameter/rayleigh_color = Color(0.3, 0.405, 0.6, 1)
+shader_parameter/samayun = ExtResource("1_thm7k")
+shader_parameter/samayun_arc = 45.681
+shader_parameter/samayun_position = Vector3(2.038, 0.695, -0.237)
+shader_parameter/stigi = ExtResource("3_jqgsm")
+shader_parameter/stigi_arc = 8.381
+shader_parameter/stigi_position = Vector3(1.209, 0.444, 0.332)
+shader_parameter/sun_disk_scale = 1.0
+shader_parameter/turbidity = 10.0
+shader_parameter/zabr = ExtResource("3_bgghj")
+shader_parameter/zabr_arc = 8.0
+shader_parameter/zabr_position = Vector3(1.755, 0.599, 0.613)
 
 [sub_resource type="Sky" id="Sky_fa16p"]
 sky_material = SubResource("ShaderMaterial_s2q0l")
@@ -85,44 +86,64 @@ shape = SubResource("ConcavePolygonShape3D_lld3w")
 
 [node name="Blue - Zone names" type="Node3D" parent="labels"]
 
-[node name="BluePoint" type="Position3D" parent="labels/Blue - Zone names"]
+[node name="BluePoint" type="Marker3D" parent="labels/Blue - Zone names"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.2869, 4.21191, 10.6861)
 
 [node name="Plateforme mouvante" parent="labels/Blue - Zone names/BluePoint" instance=ExtResource("7_5rpqq")]
 modulate = Color(0.227451, 0.184314, 1, 1)
+layout_mode = 3
+anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 text = "Plateforme mouvante"
 
-[node name="BluePoint2" type="Position3D" parent="labels/Blue - Zone names"]
+[node name="BluePoint2" type="Marker3D" parent="labels/Blue - Zone names"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -82.0222, 4.78227, -4.13589)
 
 [node name="Zone aquatique" parent="labels/Blue - Zone names/BluePoint2" instance=ExtResource("7_5rpqq")]
 modulate = Color(0.227451, 0.184314, 1, 1)
+layout_mode = 3
+anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 text = "Zone aquatique"
 
-[node name="BluePoint3" type="Position3D" parent="labels/Blue - Zone names"]
+[node name="BluePoint3" type="Marker3D" parent="labels/Blue - Zone names"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.6298, 7.89366, -7.7856)
 
 [node name="Terrain irrégulier" parent="labels/Blue - Zone names/BluePoint3" instance=ExtResource("7_5rpqq")]
 modulate = Color(0.227451, 0.184314, 1, 1)
+layout_mode = 3
+anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 text = "Terrain irrégulier"
 
 [node name="Green - Informations" type="Node3D" parent="labels"]
 
-[node name="GreenPoint" type="Position3D" parent="labels/Green - Informations"]
+[node name="GreenPoint" type="Marker3D" parent="labels/Green - Informations"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5125, 5.69293, -8.2869)
 
 [node name="Tester ressenti des collisions selon angle de pente" parent="labels/Green - Informations/GreenPoint" instance=ExtResource("7_5rpqq")]
 modulate = Color(0.0196078, 1, 0, 1)
+layout_mode = 3
+anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 text = "Tester ressenti des collisions selon angle de pente"
 sticky = false
 
 [node name="Red - Important" type="Node3D" parent="labels"]
 
-[node name="RedPoint" type="Position3D" parent="labels/Red - Important"]
+[node name="RedPoint" type="Marker3D" parent="labels/Red - Important"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -78.3165, 1.80831, -3.74854)
 
 [node name="Nage non implémentée" parent="labels/Red - Important/RedPoint" instance=ExtResource("7_5rpqq")]
 modulate = Color(1, 0.192157, 0.156863, 1)
+layout_mode = 3
+anchors_preset = 15
+grow_horizontal = 2
+grow_vertical = 2
 text = "Nage implémentée"
 
 [node name="ramp-complex" parent="." instance=ExtResource("2_4eueh")]
@@ -166,3 +187,6 @@ transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107,
 
 [node name="ashtarie-bench2" parent="." instance=ExtResource("15_k5x3t")]
 transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, -17.8, 0, -4.1)
+
+[node name="ryzom_matis_appartment" parent="." instance=ExtResource("20_66hq8")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 52, 0, 25)

maps/imports/ryzom_matis_appartment.gltf.import

@@ -0,0 +1,82 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dkykwxrhvnl2o"
+path="res://.godot/imported/ryzom_matis_appartment.gltf-8b187635b21aae6197f0b41aaa537879.scn"
+
+[deps]
+
+source_file="res://maps/imports/ryzom_matis_appartment.gltf"
+dest_files=["res://.godot/imported/ryzom_matis_appartment.gltf-8b187635b21aae6197f0b41aaa537879.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+import_script/path=""
+_subresources={
+"nodes": {
+"PATH:ma_room": {
+"decomposition/advanced": true,
+"generate/physics": true,
+"physics/shape_type": 2
+},
+"PATH:ma_room_armoire_": {
+"generate/physics": true
+},
+"PATH:ma_room_banniere_00_": {
+"generate/physics": true
+},
+"PATH:ma_room_banniere_01_": {
+"generate/physics": true
+},
+"PATH:ma_room_banniere_02_": {
+"generate/physics": true
+},
+"PATH:ma_room_banniere_03_": {
+"generate/physics": true
+},
+"PATH:ma_room_banniere_04_": {
+"generate/physics": true
+},
+"PATH:ma_room_bed_": {
+"generate/physics": true
+},
+"PATH:ma_room_chair_00_": {
+"generate/physics": true
+},
+"PATH:ma_room_chair_01_": {
+"generate/physics": true
+},
+"PATH:ma_room_chair_02_": {
+"generate/physics": true
+},
+"PATH:ma_room_chest_": {
+"generate/physics": true
+},
+"PATH:ma_room_flower_": {
+"generate/physics": true
+},
+"PATH:ma_room_lance_": {
+"generate/physics": true
+},
+"PATH:ma_room_table_00_": {
+"generate/physics": true
+},
+"PATH:ma_room_table_01_": {
+"generate/physics": true
+}
+}
+}

maps/materials/ashtarie-bench_flower-side.tres

@@ -8,15 +8,15 @@ resource_local_to_scene = true
 resource_name = "bench_plant"
 render_priority = 0
 shader = ExtResource("1_i81qr")
-shader_param/base_color = Color(0.494118, 0.141176, 0.117647, 1)
-shader_param/decor_color = Color(0.862745, 0.6, 0.117647, 1)
-shader_param/point_size = 1.0
-shader_param/roughness = 0.5
-shader_param/metallic_texture_channel = Plane(1, 0, 0, 0)
-shader_param/specular = 0.5
-shader_param/metallic = 0.0
-shader_param/uv1_scale = Vector3(1, 1, 1)
-shader_param/uv1_offset = Vector3(0, 0.01, 0)
-shader_param/uv2_scale = Vector3(1, 1, 1)
-shader_param/uv2_offset = Vector3(0, 0, 0)
-shader_param/texture_albedo = ExtResource( "2_q832q" )
+shader_parameter/base_color = Color(0.494118, 0.141176, 0.117647, 1)
+shader_parameter/decor_color = Color(0.862745, 0.6, 0.117647, 1)
+shader_parameter/metallic = 0.0
+shader_parameter/metallic_texture_channel = Plane(1, 0, 0, 0)
+shader_parameter/point_size = 1.0
+shader_parameter/roughness = 0.5
+shader_parameter/specular = 0.5
+shader_parameter/texture_albedo = ExtResource("2_q832q")
+shader_parameter/uv1_offset = Vector3(0, 0.01, 0)
+shader_parameter/uv1_scale = Vector3(1, 1, 1)
+shader_parameter/uv2_offset = Vector3(0, 0, 0)
+shader_parameter/uv2_scale = Vector3(1, 1, 1)

maps/ryzom_matis_appartment.tscn

@@ -0,0 +1,14 @@
+[gd_scene load_steps=2 format=3 uid="uid://b68g7ddc1uaw4"]
+
+[ext_resource type="PackedScene" uid="uid://dkykwxrhvnl2o" path="res://maps/imports/ryzom_matis_appartment.gltf" id="1_01gqk"]
+
+[node name="ryzom_matis_appartment" instance=ExtResource("1_01gqk")]
+
+[node name="StaticBody3D" parent="ma_asc_porte_right_" index="0"]
+visible = false
+
+[node name="StaticBody3D" parent="ma_asc_porte_left_" index="0"]
+visible = false
+
+[node name="StaticBody3D" parent="ma_asc_porte_bas_" index="0"]
+visible = false