test de rangement des assets et correction du perso

README.md

@@ -1,9 +1,11 @@
 # Ile De Test
 
-GODOT 4.2 DEV 5 (pas6)
+GODOT 4.2 DEV 5 (pas plus , plugin non à jour)
 TOUCHE:
 
-Direction: flèche du clavier ou (zqsd mais ça bug avec le clic droit camera)
+Direction: 
+flèche du clavier ou zqsd
+PageUP pour changer entre marcher et courrir
 
 Camera: clic droit souris
 

assets/creatures/CameraControllerMain.gd

@@ -5,7 +5,7 @@ extends Node3D
 
 # Mouse state
 var _mouse_position = Vector2(0.0, 0.0)
-var _total_pitch = 0.0
+#var _total_pitch = 0.0
 var _vel_multiplier = 4
 
 

assets/creatures/controller.gd

@@ -19,7 +19,6 @@ func _physics_process(delta):
 	var direction = Vector3.ZERO
 	var perso_y = perso.global_transform.basis.y
 	var perso_z = perso.global_transform.basis.z
-	#var perso_x = perso.global_transform.basis.x
 
 	if Input.is_action_pressed("ui_right"):
 		visuals.rotation -= perso_y * lent
@@ -37,16 +36,15 @@ func _physics_process(delta):
 		else:
 			direction += perso_z
 			animation_player.play( "raference_march")
-		if Input.is_action_pressed("ui_camera"):
-			$camerapivot/Camera3D.global_transform = perso.direction
 	if direction.x == 0 and direction.z == 0:
 		animation_player.play( "raference_idle")
 	if Input.is_action_pressed("ui_cancel"):
 		get_tree().quit()
-
+#TODO
-	#if direction != Vector3.ZERO:
+	#if Input.is_action_just_pressed("ui_camera_reset"):
-		#direction = direction.normalized()
+		#if direction != Vector3.ZERO:
-		#perso_y.look_at(position + direction, Vector3.UP)
+			#direction = perso_z.normalized()
+			#visuals.look_at(direction, Vector3.UP)
 
 	target_velocity.x = direction.x * speed_walk
 	target_velocity.z = direction.z * speed_walk

assets/objects/boat/delta_boat.gltf.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://drjcic3pap44x"
-path="res://.godot/imported/delta_boat.gltf-80b54065c457a0ef183438eb23d566cb.scn"
+path="res://.godot/imported/delta_boat.gltf-c95189054066ba8ba14e28ea059df255.scn"
 
 [deps]
 
-source_file="res://assets/objects/delta_boat.gltf"
+source_file="res://assets/objects/boat/delta_boat.gltf"
-dest_files=["res://.godot/imported/delta_boat.gltf-80b54065c457a0ef183438eb23d566cb.scn"]
+dest_files=["res://.godot/imported/delta_boat.gltf-c95189054066ba8ba14e28ea059df255.scn"]
 
 [params]
 

assets/objects/boat/delta_boat_2.tscn

@@ -1,5 +1,5 @@
 [gd_scene load_steps=2 format=3 uid="uid://d1kldif6arq4s"]
 
-[ext_resource type="PackedScene" uid="uid://drjcic3pap44x" path="res://assets/objects/delta_boat.gltf" id="1_b0bfq"]
+[ext_resource type="PackedScene" uid="uid://drjcic3pap44x" path="res://assets/objects/boat/delta_boat.gltf" id="1_b0bfq"]
 
 [node name="delta_boat_2" instance=ExtResource( "1_b0bfq" )]

assets/objects/cave/cave.gltf.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://dvlg6g0f5tuod"
+path="res://.godot/imported/cave.gltf-ff04d2950b560979e3756e214b290c3c.scn"
+
+[deps]
+
+source_file="res://assets/objects/cave/cave.gltf"
+dest_files=["res://.godot/imported/cave.gltf-ff04d2950b560979e3756e214b290c3c.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+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
+animation/trimming=false
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

assets/objects/cave/cave.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=3 uid="uid://cgwjhsmvp2tco"]
 
-[ext_resource type="PackedScene" uid="uid://b7bdyvlle2rx0" path="res://maps/imports/cave.gltf" id="1_i0v3y"]
+[ext_resource type="PackedScene" uid="uid://dvlg6g0f5tuod" path="res://assets/objects/cave/cave.gltf" id="1_i0v3y"]
-[ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://maps/materials/simple_grid_world.material" id="2_2hxq1"]
+[ext_resource type="Material" uid="uid://cdijyqa881tvv" path="res://assets/materials/simple_grid_world.material" id="2_2hxq1"]
 
 [node name="cave" instance=ExtResource("1_i0v3y")]
 

assets/objects/tree_aa.tscn

@@ -1,7 +1,5 @@
-[gd_scene load_steps=2 format=3 uid="uid://coeo82ibutr4x"]
+[gd_scene load_steps=2 format=3 uid="uid://8aljdwbvgxr4"]
 
-[ext_resource type="PackedScene" uid="uid://xh0tssqbg7t6" path="res://assets/objects/tree_aa/tree_aa.gltf" id="1_f0qpd"]
+[ext_resource type="PackedScene" uid="uid://xh0tssqbg7t6" path="res://assets/objects/tree_aa/tree_aa.gltf" id="1_jcabl"]
 
-[node name="Tree_aa" type="Node3D"]
+[node name="tree_aa" instance=ExtResource( "1_jcabl" )]
-
-[node name="tree_aa" parent="." instance=ExtResource("1_f0qpd")]

assets/objects/water/water-space.gltf.import

@@ -4,12 +4,12 @@ importer="scene"
 importer_version=1
 type="PackedScene"
 uid="uid://crnmkmvsqo3p3"
-path="res://.godot/imported/water-space.gltf-d8b08e434eb3400d7843d03c1b825811.scn"
+path="res://.godot/imported/water-space.gltf-eea1563e9651592423125446901204be.scn"
 
 [deps]
 
-source_file="res://assets/objects/water-space.gltf"
+source_file="res://assets/objects/water/water-space.gltf"
-dest_files=["res://.godot/imported/water-space.gltf-d8b08e434eb3400d7843d03c1b825811.scn"]
+dest_files=["res://.godot/imported/water-space.gltf-eea1563e9651592423125446901204be.scn"]
 
 [params]
 

assets/objects/water/water_space.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=3 uid="uid://ip4lkyho0gry"]
 
-[ext_resource type="PackedScene" uid="uid://crnmkmvsqo3p3" path="res://assets/objects/water-space.gltf" id="1_htkji"]
+[ext_resource type="PackedScene" uid="uid://crnmkmvsqo3p3" path="res://assets/objects/water/water-space.gltf" id="1_htkji"]
 
 [node name="water-space" instance=ExtResource( "1_htkji" )]
 

project.godot

@@ -10,14 +10,14 @@ config_version=5
 
 [application]
 
-config/name="Interfaces"
+config/name="Ile-de-test"
 run/main_scene="res://scenes/interface/page_login.tscn"
 config/features=PackedStringArray("4.2", "Forward Plus")
 config/icon="res://icon.png"
 
 [editor_plugins]
 
-enabled=PackedStringArray("res://addons/proton_scatter/plugin.cfg", "res://addons/waterways/plugin.cfg", "res://addons/zylann.hterrain/plugin.cfg")
+enabled=PackedStringArray("res://addons/zylann.hterrain/plugin.cfg")
 
 [input]
 
@@ -63,3 +63,13 @@ ui_jump={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"echo":false,"script":null)
 ]
 }
+ui_change_speed={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194323,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}
+ui_camera_reset={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194324,"key_label":0,"unicode":0,"echo":false,"script":null)
+]
+}

scenes/dispensaire_01.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=23 format=3 uid="uid://mdsxnqsijdqv"]
 
-[ext_resource type="PackedScene" uid="uid://b7vno4rkejrrg" path="res://scenes/objects/dispensaire_ground_2.tscn" id="3_i6vnn"]
+[ext_resource type="PackedScene" uid="uid://b7vno4rkejrrg" path="res://assets/objects/dispensaire/dispensaire_ground_2.tscn" id="3_i6vnn"]
-[ext_resource type="PackedScene" uid="uid://bhb14kr7dfg4y" path="res://scenes/objects/cliff_structure_result.tscn" id="3_wc10r"]
+[ext_resource type="PackedScene" uid="uid://bhb14kr7dfg4y" path="res://assets/objects/dispensaire/cliff_structure_result.tscn" id="3_wc10r"]
 [ext_resource type="Shader" path="res://assets/shaders/water.gdshader" id="5_luy84"]
 [ext_resource type="Texture2D" uid="uid://l7ac377jrl8d" path="res://assets/textures/water/water_normal_a.png" id="6_p78r6"]
 [ext_resource type="Texture2D" uid="uid://d38xjhxhgppi4" path="res://assets/textures/water/water_normal_b.png" id="7_3ineq"]

scenes/main.tscn

@@ -1,15 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://4mkv26qkaqrg"]
-
-[ext_resource type="PackedScene" uid="uid://kkwgk2l7gu4n" path="res://scenes/interface/page_login.tscn" id="1_f5nfs"]
-[ext_resource type="Script" path="res://script/main.gd" id="1_ym18p"]
-[ext_resource type="PackedScene" uid="uid://bcgyiblimtc1f" path="res://scenes/interface/loading_screen.tscn" id="3_c3u71"]
-
-[node name="main" type="Node3D"]
-script = ExtResource("1_ym18p")
-
-[node name="scene" type="Node3D" parent="."]
-
-[node name="main_menu" parent="." instance=ExtResource("1_f5nfs")]
-
-[node name="loading_screen" parent="." instance=ExtResource("3_c3u71")]
-visible = false

scenes/objects/panel-mega.gd

@@ -1,13 +0,0 @@
-extends Node3D
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(_delta):
-	$panel2/Node3D/SubViewport/VBoxContainer/Label.text = str(Common.get_time_only_text())
-
-
-func _on_button_pressed():
-	Common.msg_debug("Button Panel Meta pressed")

scenes/objects/panel-mega.tscn

@@ -1,46 +0,0 @@
-[gd_scene load_steps=4 format=3 uid="uid://b2vv2knvetbwf"]
-
-[ext_resource type="PackedScene" uid="uid://dwk6kjtpu1w07" path="res://maps/imports/panel.gltf" id="1_2vsan"]
-[ext_resource type="Script" path="res://maps/objects/panel-mega.gd" id="2_xmls6"]
-
-[sub_resource type="ViewportTexture" id="ViewportTexture_mq4m0"]
-viewport_path = NodePath("panel2/Node3D/SubViewport")
-
-[node name="panel_meta" instance=ExtResource("1_2vsan")]
-script = ExtResource("2_xmls6")
-
-[node name="Node3D" type="Node3D" parent="panel2" index="0"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.82178, 0)
-
-[node name="SubViewport" type="SubViewport" parent="panel2/Node3D" index="0"]
-own_world_3d = true
-transparent_bg = true
-gui_embed_subwindows = true
-size = Vector2i(140, 60)
-size_2d_override_stretch = true
-render_target_update_mode = 3
-
-[node name="VBoxContainer" type="VBoxContainer" parent="panel2/Node3D/SubViewport" index="0"]
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-
-[node name="Label" type="Label" parent="panel2/Node3D/SubViewport/VBoxContainer" index="0"]
-layout_mode = 2
-theme_override_colors/font_color = Color(0.858824, 0.619608, 0.12549, 1)
-theme_override_colors/font_shadow_color = Color(0.933333, 0, 0, 1)
-text = "Bonjour !!"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Button" type="Button" parent="panel2/Node3D/SubViewport/VBoxContainer" index="1"]
-layout_mode = 2
-text = "appuiez-moi"
-
-[node name="Sprite3D" type="Sprite3D" parent="panel2/Node3D" index="1"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.722021, 0.1028)
-texture = SubResource("ViewportTexture_mq4m0")
-
-[connection signal="pressed" from="panel2/Node3D/SubViewport/VBoxContainer/Button" to="." method="_on_button_pressed"]

scenes/objects/panel.tscn

@@ -1,31 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://damn2u4n5ien"]
-
-[ext_resource type="PackedScene" uid="uid://dwk6kjtpu1w07" path="res://maps/imports/panel.gltf" id="1_2vsan"]
-
-[sub_resource type="ViewportTexture" id="ViewportTexture_mq4m0"]
-viewport_path = NodePath("panel2/Node3D/SubViewport")
-
-[node name="panel" instance=ExtResource("1_2vsan")]
-
-[node name="Node3D" type="Node3D" parent="panel2" index="0"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.82178, 0)
-
-[node name="SubViewport" type="SubViewport" parent="panel2/Node3D" index="0"]
-own_world_3d = true
-size = Vector2i(140, 60)
-size_2d_override_stretch = true
-render_target_update_mode = 3
-
-[node name="Label" type="Label" parent="panel2/Node3D/SubViewport" index="0"]
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-text = "Bienvenu sur Khanat"
-horizontal_alignment = 1
-vertical_alignment = 1
-
-[node name="Sprite3D" type="Sprite3D" parent="panel2/Node3D" index="1"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.722021, 0.036835)
-texture = SubResource("ViewportTexture_mq4m0")

scenes/objects/panel_dummy.tscn

@@ -1,5 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://dxghflr1tlhai"]
-
-[ext_resource type="PackedScene" uid="uid://daifo8pcf26aq" path="res://maps/imports/panel_dummy.gltf" id="1_jau0f"]
-
-[node name="panel_dummy" instance=ExtResource( "1_jau0f" )]

scenes/objects/tree_aa.tscn

@@ -1,5 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://8aljdwbvgxr4"]
-
-[ext_resource type="PackedScene" uid="uid://xh0tssqbg7t6" path="res://assets/objects/tree_aa/tree_aa.gltf" id="1_jcabl"]
-
-[node name="tree_aa" instance=ExtResource( "1_jcabl" )]

scenes/water-zone.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=14 format=3 uid="uid://clmlpy36ghsio"]
 
-[ext_resource type="Script" path="res://scenes/objects/water-zone.gd" id="1_s4mf8"]
+[ext_resource type="Script" path="res://assets/objects/water-zone.gd" id="1_s4mf8"]
-[ext_resource type="PackedScene" uid="uid://duptl2212yaxs" path="res://scenes/objects/delta_boat.tscn" id="2_824w2"]
+[ext_resource type="PackedScene" uid="uid://duptl2212yaxs" path="res://assets/objects/boat/delta_boat.tscn" id="2_824w2"]
-[ext_resource type="PackedScene" uid="uid://d1kldif6arq4s" path="res://scenes/objects/delta_boat_2.tscn" id="3_mogta"]
+[ext_resource type="PackedScene" uid="uid://d1kldif6arq4s" path="res://assets/objects/boat/delta_boat_2.tscn" id="3_mogta"]
 [ext_resource type="Shader" path="res://assets/shaders/water.gdshader" id="4_k8kcr"]
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_08c7l"]

script/main.tscn

@@ -0,0 +1,15 @@
+[gd_scene load_steps=4 format=3 uid="uid://4mkv26qkaqrg"]
+
+[ext_resource type="Script" path="res://script/main.gd" id="1_71q6d"]
+[ext_resource type="PackedScene" uid="uid://kkwgk2l7gu4n" path="res://scenes/interface/page_login.tscn" id="2_ui8jv"]
+[ext_resource type="PackedScene" uid="uid://bcgyiblimtc1f" path="res://scenes/interface/loading_screen.tscn" id="3_gg42t"]
+
+[node name="main" type="Node3D"]
+script = ExtResource("1_71q6d")
+
+[node name="scene" type="Node3D" parent="."]
+
+[node name="main_menu" parent="." instance=ExtResource("2_ui8jv")]
+
+[node name="loading_screen" parent="." instance=ExtResource("3_gg42t")]
+visible = false