Godot-sandbox/test-client-godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

correction des position de depart et ajout d'un marker en forme de fleche pour mieux les visualiser dans l'editeur.

Browse source
This commit is contained in:
osquallo 2018-09-22 10:44:07 +02:00
parent 649ba9523c
commit 081c22329f
11 changed files with 100 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
assets/Game/markers/arrow_z.escn Normal file
View file

File diff suppressed because one or more lines are too long

20
dispensaire_gridmap/dispensaire_gridmap.tscn
View file

@ -1,7 +1,8 @@
[gd_scene load_steps=4 format=2] [gd_scene load_steps=5 format=2]
[ext_resource path="res://assets/Game/basekits/Kit_dispensaire.meshlib" type="MeshLibrary" id=1] [ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=1]
[ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/Game/basekits/Kit_dispensaire.meshlib" type="MeshLibrary" id=2]
[ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=3]
[sub_resource type="Environment" id=1] [sub_resource type="Environment" id=1]
@ -81,17 +82,17 @@ adjustment_brightness = 1.0
adjustment_contrast = 1.0 adjustment_contrast = 1.0
adjustment_saturation = 1.0 adjustment_saturation = 1.0
[node name="dispensaire_gridmap" type="Node" index="0"] [node name="dispensaire_gridmap" type="Node"]
[node name="start_position" type="Spatial" parent="." index="0"] [node name="start_position" parent="." index="0" instance=ExtResource( 1 )]
transform = Transform( 0.999997, 0, -0.002267, 0, 1, 0, 0.002267, 0, 0.999997, -1.73618, 2.22498, -1.84151 ) transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, -1.75272, 2, -1.32621 )
[node name="world" type="Spatial" parent="." index="1"] [node name="world" type="Spatial" parent="." index="1"]
[node name="grid_map" type="GridMap" parent="world" index="0"] [node name="grid_map" type="GridMap" parent="world" index="0"]
theme = ExtResource( 1 ) theme = ExtResource( 2 )
cell_size = Vector3( 3.5, 3.5, 3.5 ) cell_size = Vector3( 3.5, 3.5, 3.5 )
cell_octant_size = 8 cell_octant_size = 8
cell_center_x = true cell_center_x = true
@ -101,17 +102,18 @@ cell_scale = 1.0
collision_layer = 1 collision_layer = 1
collision_mask = 1 collision_mask = 1
data = { data = {
"cells": PoolIntArray( 3, 0, 655361, 5, 0, 655361, 65535, 0, 537919491, 2, 65534, 1, 4, 65534, 1, 0, 65535, 538312709, 1, 65535, 1441797, 2, 65535, 1441798, 3, 65535, 1048582, 4, 65535, 1441798, 5, 65535, 1048582, 6, 65535, 1441793, 65535, 65535, 1048578 ) "cells": PoolIntArray( 3, 0, 655361, 5, 0, 655361, 65535, 0, 1048579, 2, 65534, 1, 4, 65534, 1, 0, 65535, 1441797, 1, 65535, 1441797, 2, 65535, 1441798, 3, 65535, 1048582, 4, 65535, 1441798, 5, 65535, 1048582, 6, 65535, 1441793, 65535, 65535, 1048578 )
} }
_sections_unfolded = [ "Cell" ] _sections_unfolded = [ "Cell" ]
__meta__ = { __meta__ = {
"_editor_clip_": 0 "_editor_clip_": 0
} }
[node name="portail" parent="world" index="1" instance=ExtResource( 2 )] [node name="portail" parent="world" index="1" instance=ExtResource( 3 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.65801, 0, 3.40425 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.65801, 0, 3.40425 )
scene_path = NodePath("res://game_scene/Game/Game.tscn") scene_path = NodePath("res://game_scene/Game/Game.tscn")
start_position_path = NodePath("start_position_gridmap")
[node name="world_environment" type="WorldEnvironment" parent="world" index="2"] [node name="world_environment" type="WorldEnvironment" parent="world" index="2"]

17
dispensaire_scenes/dispensaire_scenes.tscn
View file

@ -1,10 +1,11 @@
[gd_scene load_steps=7 format=2] [gd_scene load_steps=8 format=2]
[ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor1wDoLRAA01.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor1wDoLRAA01.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor2wDoLAA01.tscn" type="PackedScene" id=2] [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor2wDoLAA01.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor1wAA01.tscn" type="PackedScene" id=3] [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor1wAA01.tscn" type="PackedScene" id=3]
[ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor2wDoLRAA01.tscn" type="PackedScene" id=4] [ext_resource path="res://assets/Game/basekits/dispensaire_scenes/DisCor2wDoLRAA01.tscn" type="PackedScene" id=4]
[ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=5] [ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=5]
[ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=6]
[sub_resource type="Environment" id=1] [sub_resource type="Environment" id=1]
@ -89,6 +90,8 @@ _sections_unfolded = [ "Ambient Light", "Background" ]
[node name="world" type="Spatial" parent="." index="0"] [node name="world" type="Spatial" parent="." index="0"]
editor/display_folded = true
[node name="DisCor1wDoLRAA01" parent="world" index="0" instance=ExtResource( 1 )] [node name="DisCor1wDoLRAA01" parent="world" index="0" instance=ExtResource( 1 )]
editor/display_folded = true editor/display_folded = true
@ -219,14 +222,14 @@ omni_shadow_detail = 1
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 0.679648, -1, 2.97083e-008 ) transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 0.679648, -1, 2.97083e-008 )
scene_path = NodePath("res://game_scene/Game/Game.tscn") scene_path = NodePath("res://game_scene/Game/Game.tscn")
start_position_path = NodePath("World/portail_scenes/start_position") start_position_path = NodePath("start_position_scenes")
[node name="start_position" type="Spatial" parent="." index="2"] [node name="world_environment" type="WorldEnvironment" parent="." index="2"]
transform = Transform( -1, 0, -1.50996e-007, 0, 1, 0, 1.50996e-007, 0, -1, -4.98969, 0, 0 )
[node name="world_environment" type="WorldEnvironment" parent="." index="3"]
environment = SubResource( 1 ) environment = SubResource( 1 )
[node name="start_position" parent="." index="3" instance=ExtResource( 6 )]
transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.18818, 0.000976563, -0.765998 )

3
game_scene/Game/Character/Character.gd
View file

@ -60,6 +60,9 @@ func set_default_values():
func update( start_position = null ): func update( start_position = null ):
if start_position: if start_position:
# self.translation = start_position.to_global( start_position.translation )
# self.translation = Vector3( 0, 0, 0 )
# self.translate( start_position.translation )
self.translation = start_position.translation self.translation = start_position.translation
self.rotation = start_position.rotation self.rotation = start_position.rotation

7
game_scene/Game/Character/Character.tscn
View file

@ -12,8 +12,7 @@ height = 1.0
[node name="character" type="KinematicBody"] [node name="character" type="KinematicBody"]
transform = Transform( 0.371345, 0, 0, 0, 0.218854, 0, 0, 0, 0.371345, -0.00167466, 0.0124722, 6.02408 ) transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
visible = false
input_ray_pickable = false input_ray_pickable = false
input_capture_on_drag = false input_capture_on_drag = false
collision_layer = 1 collision_layer = 1
@ -80,7 +79,7 @@ _sections_unfolded = [ "Transform" ]
[node name="suzanne" parent="." index="2" instance=ExtResource( 4 )] [node name="suzanne" parent="." index="2" instance=ExtResource( 4 )]
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 1.41059, -0.180126 ) transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 1.2572, -0.180126 )
[node name="flashlight" type="SpotLight" parent="suzanne" index="1"] [node name="flashlight" type="SpotLight" parent="suzanne" index="1"]
@ -107,7 +106,7 @@ _sections_unfolded = [ "Light", "Shadow" ]
[node name="collision_shape" type="CollisionShape" parent="." index="3"] [node name="collision_shape" type="CollisionShape" parent="." index="3"]
transform = Transform( 0.425419, 0, 0, 0, 1.26042, 0, 0, 0, 0.294585, 0.00823072, 1.1894, -0.356263 ) transform = Transform( 0.430205, 0, 0, 0, 0.906621, 0, 0, 0, 0.294585, 0.00823072, 0.942657, -0.356263 )
shape = SubResource( 1 ) shape = SubResource( 1 )
disabled = false disabled = false

22
game_scene/Game/Game.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=50 format=2] [gd_scene load_steps=51 format=2]
[ext_resource path="res://game_scene/Game/WorldEnvironment.gd" type="Script" id=1] [ext_resource path="res://game_scene/Game/WorldEnvironment.gd" type="Script" id=1]
[ext_resource path="res://assets/test/sky_box.jpg" type="Texture" id=2] [ext_resource path="res://assets/test/sky_box.jpg" type="Texture" id=2]
@ -14,6 +14,7 @@
[ext_resource path="res://assets/Game/textures/fire_02.png" type="Texture" id=12] [ext_resource path="res://assets/Game/textures/fire_02.png" type="Texture" id=12]
[ext_resource path="res://game_scene/Game/jukebox/jukebox.tscn" type="PackedScene" id=13] [ext_resource path="res://game_scene/Game/jukebox/jukebox.tscn" type="PackedScene" id=13]
[ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=14] [ext_resource path="res://game_scene/Game/portail/portail.tscn" type="PackedScene" id=14]
[ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=15]
[sub_resource type="ProceduralSky" id=1] [sub_resource type="ProceduralSky" id=1]
@ -1012,7 +1013,7 @@ material = SubResource( 34 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 ) size = Vector2( 0.4, 0.4 )
[node name="Game" type="Spatial"] [node name="Game" type="Spatial" index="0"]
_sections_unfolded = [ "Transform" ] _sections_unfolded = [ "Transform" ]
@ -1147,7 +1148,7 @@ interior_ambient_contrib = 0.0
[node name="ground" type="MeshInstance" parent="World" index="4"] [node name="ground" type="MeshInstance" parent="World" index="4"]
editor/display_folded = true editor/display_folded = true
transform = Transform( 28.4792, 0, 0, 0, 28.4792, 0, 0, 0, 28.4792, 0, 0.0258336, 0 ) transform = Transform( 28.4792, 0, 0, 0, 28.4792, 0, 0, 0, 28.4792, 0, -0.00120497, 0 )
layers = 1 layers = 1
material_override = null material_override = null
cast_shadow = 1 cast_shadow = 1
@ -1179,6 +1180,7 @@ disabled = false
[node name="Box" type="RigidBody" parent="World" index="5"] [node name="Box" type="RigidBody" parent="World" index="5"]
editor/display_folded = true
transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, 1.68693, 3.13013, -6.48976 ) transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, 1.68693, 3.13013, -6.48976 )
input_ray_pickable = true input_ray_pickable = true
input_capture_on_drag = false input_capture_on_drag = false
@ -1234,6 +1236,7 @@ _sections_unfolded = [ "Transform" ]
[node name="Box2" type="RigidBody" parent="World" index="6"] [node name="Box2" type="RigidBody" parent="World" index="6"]
editor/display_folded = true
transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, -3.00203, 8.74323, -4.47902 ) transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, -3.00203, 8.74323, -4.47902 )
input_ray_pickable = true input_ray_pickable = true
input_capture_on_drag = false input_capture_on_drag = false
@ -1344,10 +1347,17 @@ scene_path = NodePath("res://dispensaire_scenes/dispensaire_scenes.tscn")
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.01158, 0, 12.1976 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.01158, 0, 12.1976 )
scene_path = NodePath("res://dispensaire_gridmap/dispensaire_gridmap.tscn") scene_path = NodePath("res://dispensaire_gridmap/dispensaire_gridmap.tscn")
[node name="start_position" type="Spatial" parent="World" index="11"] [node name="start_position" parent="." index="1" instance=ExtResource( 15 )]
transform = Transform( -2.8213e-007, 0, 1, 0, 1, 0, -1, 0, -2.8213e-007, 0.045612, 2.34225, 8.73855 ) transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, -15.0515 )
_sections_unfolded = [ "Transform" ]
[node name="start_position_scenes" parent="." index="2" instance=ExtResource( 15 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 8.15871 )
[node name="start_position_gridmap" parent="." index="3" instance=ExtResource( 15 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 0, 8.15871 )
[connection signal="sleeping_state_changed" from="World/Box" to="World/Box" method="_on_Box_sleeping_state_changed"] [connection signal="sleeping_state_changed" from="World/Box" to="World/Box" method="_on_Box_sleeping_state_changed"]

7
game_scene/game_scene.tscn
View file

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=2] [gd_scene load_steps=4 format=2]
[ext_resource path="res://game_scene/game_scene.gd" type="Script" id=1] [ext_resource path="res://game_scene/game_scene.gd" type="Script" id=1]
[ext_resource path="res://game_scene/Game/Game.tscn" type="PackedScene" id=2] [ext_resource path="res://game_scene/Game/Game.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/Game/marker/arrow_z.tscn" type="PackedScene" id=3]
[node name="game_scene" type="Node"] [node name="game_scene" type="Node"]
@ -10,8 +11,8 @@ _sections_unfolded = [ "Pause" ]
[node name="Game" parent="." index="0" instance=ExtResource( 2 )] [node name="Game" parent="." index="0" instance=ExtResource( 2 )]
[node name="start_position" type="Spatial" parent="." index="1"] [node name="start_position" parent="." index="1" instance=ExtResource( 3 )]
transform = Transform( -0.750826, 0, -0.660501, 0, 1, 0, 0.660501, 0, -0.750826, -3.30032, 0, -21.351 ) transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 0, -15 )

2
global.tscn
View file

@ -4,7 +4,7 @@
[ext_resource path="res://background_loader_scene/background_loader.tscn" type="PackedScene" id=2] [ext_resource path="res://background_loader_scene/background_loader.tscn" type="PackedScene" id=2]
[ext_resource path="res://gui_scene/GUI/GUI.tscn" type="PackedScene" id=3] [ext_resource path="res://gui_scene/GUI/GUI.tscn" type="PackedScene" id=3]
[node name="global" type="Node" index="0"] [node name="global" type="Node"]
pause_mode = 2 pause_mode = 2
script = ExtResource( 1 ) script = ExtResource( 1 )

2
login_scene/login_scene.tscn
View file

@ -4,7 +4,7 @@
[ext_resource path="res://login_scene/character_selection_menu.tscn" type="PackedScene" id=2] [ext_resource path="res://login_scene/character_selection_menu.tscn" type="PackedScene" id=2]
[ext_resource path="res://gui_scene/GUI/login/login_menu.tscn" type="PackedScene" id=3] [ext_resource path="res://gui_scene/GUI/login/login_menu.tscn" type="PackedScene" id=3]
[node name="login_scene" type="Node" index="0"] [node name="login_scene" type="Node"]
script = ExtResource( 1 ) script = ExtResource( 1 )

4
scenes/Game/marker/arrow_z.gd Normal file
View file

@ -0,0 +1,4 @@
extends Spatial
func _ready():
self.hide()

10
scenes/Game/marker/arrow_z.tscn Normal file
View file

@ -0,0 +1,10 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://assets/Game/markers/arrow_z.escn" type="PackedScene" id=1]
[ext_resource path="res://scenes/Game/marker/arrow_z.gd" type="Script" id=2]
[node name="arrow_z" instance=ExtResource( 1 )]
script = ExtResource( 2 )