WIP bordelification à grande echelle, devellopement d'un systeme de chargement/changement de map.
This commit is contained in:
parent
52b098c309
commit
ddf8472b9a
20 changed files with 113 additions and 65 deletions
|
@ -12,7 +12,7 @@ func _ready():
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.connect( "logout_button_pressed", global, "_on_logout_button_pressed" )
|
# self.connect( "logout_button_pressed", global, "_on_logout_button_pressed" )
|
||||||
|
|
||||||
func _process(delta):
|
func _process(delta):
|
||||||
pass
|
pass
|
||||||
|
@ -29,6 +29,6 @@ func change_title():
|
||||||
OS.set_window_title( title )
|
OS.set_window_title( title )
|
||||||
|
|
||||||
|
|
||||||
func _on_GUI_logout_button_pressed():
|
#func _on_GUI_logout_button_pressed():
|
||||||
emit_signal( "logout_button_pressed" )
|
# emit_signal( "logout_button_pressed" )
|
||||||
# global.goto_scene_loading( "res://login_scene/login_scene.tscn" )
|
# global.goto_scene_loading( "res://login_scene/login_scene.tscn" )
|
||||||
|
|
|
@ -17,6 +17,4 @@ _sections_unfolded = [ "Pause" ]
|
||||||
|
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.5671, 0, 0 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11.5671, 0, 0 )
|
||||||
|
|
||||||
[connection signal="logout_button_pressed" from="GUI" to="." method="_on_GUI_logout_button_pressed"]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
41
global.gd
41
global.gd
|
@ -2,12 +2,13 @@ extends Node
|
||||||
|
|
||||||
const WINDOW_TITLE_INPUT = "GUI/Settings/Menus/TabContainer/Test/ScrollContainer/VBoxContainer/TitleBox/Title"
|
const WINDOW_TITLE_INPUT = "GUI/Settings/Menus/TabContainer/Test/ScrollContainer/VBoxContainer/TitleBox/Title"
|
||||||
|
|
||||||
|
#### Character
|
||||||
var character_name = "player"
|
var character_name = "player"
|
||||||
var character_color = null
|
var character_color = null
|
||||||
var character_gender = null
|
var character_gender = null
|
||||||
var character_slot = null
|
var character_slot = null
|
||||||
|
|
||||||
# BG loader
|
#### BG loader
|
||||||
onready var progress_texture = $background_loader/center_container/texture_progress
|
onready var progress_texture = $background_loader/center_container/texture_progress
|
||||||
var loader
|
var loader
|
||||||
var wait_frames
|
var wait_frames
|
||||||
|
@ -15,6 +16,7 @@ var time_max = 10 # msec
|
||||||
var current_scene = null
|
var current_scene = null
|
||||||
var old_scene = null
|
var old_scene = null
|
||||||
var parent_scene = null
|
var parent_scene = null
|
||||||
|
var current_map = null
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
var root = get_tree().get_root()
|
var root = get_tree().get_root()
|
||||||
|
@ -24,6 +26,9 @@ func _ready():
|
||||||
get_tree().get_root().connect("size_changed", self, "on_window_size_changed")
|
get_tree().get_root().connect("size_changed", self, "on_window_size_changed")
|
||||||
|
|
||||||
# change_level( "res://login_scene/login_scene.tscn", get_tree().get_root() )
|
# change_level( "res://login_scene/login_scene.tscn", get_tree().get_root() )
|
||||||
|
|
||||||
|
character.get_node( "infos_spatial" ).hide()
|
||||||
|
|
||||||
########
|
########
|
||||||
#### change title ####
|
#### change title ####
|
||||||
func on_window_size_changed():
|
func on_window_size_changed():
|
||||||
|
@ -81,21 +86,26 @@ func change_level( p_next_scene_path, p_parent_next_scene = null, p_old_scene =
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
wait_frames = 1
|
wait_frames = 10
|
||||||
|
|
||||||
########
|
########
|
||||||
|
|
||||||
|
|
||||||
func _process( time ):
|
func _process( time ):
|
||||||
|
print("process1")
|
||||||
|
########
|
||||||
|
#### LOADER
|
||||||
if loader == null:
|
if loader == null:
|
||||||
# no need to process anymore
|
# no need to process anymore
|
||||||
set_process(false)
|
set_process(false)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
print("process2")
|
||||||
if wait_frames > 0: # wait for frames to let the "loading" animation to show up
|
if wait_frames > 0: # wait for frames to let the "loading" animation to show up
|
||||||
wait_frames -= 1
|
wait_frames -= 1
|
||||||
return
|
return
|
||||||
|
|
||||||
|
print("process3")
|
||||||
var t = OS.get_ticks_msec()
|
var t = OS.get_ticks_msec()
|
||||||
while OS.get_ticks_msec() < t + time_max: # use "time_max" to control how much time we block this thread
|
while OS.get_ticks_msec() < t + time_max: # use "time_max" to control how much time we block this thread
|
||||||
# poll your loader
|
# poll your loader
|
||||||
|
@ -115,18 +125,28 @@ func _process( time ):
|
||||||
show_error()
|
show_error()
|
||||||
loader = null
|
loader = null
|
||||||
break
|
break
|
||||||
|
########
|
||||||
|
print("process4")
|
||||||
|
|
||||||
|
func _input( event ):
|
||||||
|
|
||||||
|
if event is InputEventKey :
|
||||||
|
if event.is_action_pressed("test_change_map_1"):
|
||||||
|
global.change_level( "res://test_scene/test_scene.tscn", null, current_map )
|
||||||
|
elif event.is_action_pressed("test_change_map_2"):
|
||||||
|
global.change_level( "res://test_grid_map/test_grid_map.tscn", null, current_map )
|
||||||
|
elif event.is_action_pressed("test_change_map_3"):
|
||||||
|
global.change_level( "res://game_scene/game_scene.tscn", null, current_map )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func update_progress():
|
func update_progress():
|
||||||
# var progress_texture = get_node("background_loader/center_container/texture_progress")
|
|
||||||
var progress = (float(loader.get_stage()) / loader.get_stage_count()) * progress_texture.max_value
|
var progress = (float(loader.get_stage()) / loader.get_stage_count()) * progress_texture.max_value
|
||||||
|
|
||||||
progress_texture.value = progress
|
progress_texture.value = progress
|
||||||
|
|
||||||
|
|
||||||
func set_new_scene( scene_resource ):
|
func set_new_scene( scene_resource ):
|
||||||
# var progress_texture = get_node("background_loader/center_container/texture_progress")
|
|
||||||
|
|
||||||
progress_texture.value = 0
|
progress_texture.value = 0
|
||||||
|
|
||||||
var scene = scene_resource.instance()
|
var scene = scene_resource.instance()
|
||||||
|
@ -138,6 +158,7 @@ func set_new_scene( scene_resource ):
|
||||||
|
|
||||||
if scene.has_node("start_position"):
|
if scene.has_node("start_position"):
|
||||||
character.update( scene.get_node("start_position") )
|
character.update( scene.get_node("start_position") )
|
||||||
|
current_map = scene
|
||||||
|
|
||||||
get_node("background_loader").hide()
|
get_node("background_loader").hide()
|
||||||
character.show()
|
character.show()
|
||||||
|
@ -153,13 +174,11 @@ func _on_login_scene_character_creation_finished():
|
||||||
config_file.set_value(str(global.character_slot), "color", global.character_color)
|
config_file.set_value(str(global.character_slot), "color", global.character_color)
|
||||||
|
|
||||||
config_file.save( "user://player.cfg" )
|
config_file.save( "user://player.cfg" )
|
||||||
# global.goto_scene_loading( "res://game_scene/game_scene.tscn" )
|
global.change_level( "res://game_scene/game_scene.tscn", null, get_tree().get_root().get_node("login_scene") )
|
||||||
# global.change_level( "res://game_scene/game_scene.tscn", null, get_tree().get_root().get_node("login_scene") )
|
character.show_third_person_camera()
|
||||||
# global.change_level( "res://test_scene/test_scene.tscn", null, get_tree().get_root().get_node("login_scene") )
|
# character.get_node( "infos_spatial" ).show()
|
||||||
global.change_level( "res://test_grid_map/test_grid_map.tscn", null, get_tree().get_root().get_node("login_scene") )
|
|
||||||
|
|
||||||
func _on_logout_button_pressed():
|
func _on_logout_button_pressed():
|
||||||
# global.goto_scene_loading( "res://login_scene/login_scene.tscn" )
|
global.change_level( "res://login_scene/login_scene.tscn", null, current_map )
|
||||||
global.change_level( "res://login_scene/login_scene.tscn", null, get_tree().get_root().get_node("game_scene") )
|
|
||||||
get_tree().paused = false
|
get_tree().paused = false
|
||||||
########
|
########
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
[ext_resource path="res://global.gd" type="Script" id=1]
|
[ext_resource path="res://global.gd" type="Script" id=1]
|
||||||
[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]
|
||||||
|
|
||||||
[node name="global" type="Node"]
|
[node name="global" type="Node" index="0"]
|
||||||
|
|
||||||
pause_mode = 2
|
pause_mode = 2
|
||||||
script = ExtResource( 1 )
|
script = ExtResource( 1 )
|
||||||
|
|
|
@ -72,9 +72,7 @@ func update_character_slots():
|
||||||
create_new_characer_button.connect( "pressed", self, "_on_create_pressed", [next_slot] )
|
create_new_characer_button.connect( "pressed", self, "_on_create_pressed", [next_slot] )
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
|
character_mesh = character.get_node("MeshInstance")
|
||||||
$viewport/character_preview.show()
|
|
||||||
character_mesh = $viewport/character_preview/character/MeshInstance
|
|
||||||
name_input = $h_box_container/character_creation_box/margin_container/v_box_container/name_box/line_edit
|
name_input = $h_box_container/character_creation_box/margin_container/v_box_container/name_box/line_edit
|
||||||
|
|
||||||
update_character_slots()
|
update_character_slots()
|
||||||
|
@ -118,7 +116,7 @@ func update_preview():
|
||||||
if err:
|
if err:
|
||||||
print("Error code when loading player config file: ", err)
|
print("Error code when loading player config file: ", err)
|
||||||
if config_file.has_section( str(slot) ):
|
if config_file.has_section( str(slot) ):
|
||||||
$viewport/character_preview/character/MeshInstance.get_surface_material(0).set_shader_param("albedo", config_file.get_value( str(slot), "color" ) )
|
$viewport/character_preview/MeshInstance.get_surface_material(0).set_shader_param("albedo", config_file.get_value( str(slot), "color" ) )
|
||||||
|
|
||||||
|
|
||||||
func _on_character_creation_box_gender_value_changed(value):
|
func _on_character_creation_box_gender_value_changed(value):
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
[gd_scene load_steps=7 format=2]
|
[gd_scene load_steps=7 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://login_scene/character_selection_menu.gd" type="Script" id=1]
|
[ext_resource path="res://login_scene/character_selection_menu.gd" type="Script" id=1]
|
||||||
[ext_resource path="res://login_scene/character_preview.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://scenes/Game/Character/Character.tscn" type="PackedScene" id=2]
|
||||||
[ext_resource path="res://assets/GUI/images/new_launcher_bg_0-1.png" type="Texture" id=3]
|
[ext_resource path="res://assets/GUI/images/new_launcher_bg_0-1.png" type="Texture" id=3]
|
||||||
[ext_resource path="res://login_scene/character_slots.tscn" type="PackedScene" id=4]
|
[ext_resource path="res://login_scene/character_slots.tscn" type="PackedScene" id=4]
|
||||||
[ext_resource path="res://login_scene/character_creation_box.tscn" type="PackedScene" id=5]
|
[ext_resource path="res://login_scene/character_creation_box.tscn" type="PackedScene" id=5]
|
||||||
|
@ -55,8 +55,6 @@ _sections_unfolded = [ "Render Target", "Rendering" ]
|
||||||
|
|
||||||
[node name="character_preview" parent="viewport" index="0" instance=ExtResource( 2 )]
|
[node name="character_preview" parent="viewport" index="0" instance=ExtResource( 2 )]
|
||||||
|
|
||||||
visible = false
|
|
||||||
|
|
||||||
[node name="texture_rect" type="TextureRect" parent="." index="1"]
|
[node name="texture_rect" type="TextureRect" parent="." index="1"]
|
||||||
|
|
||||||
anchor_left = 0.0
|
anchor_left = 0.0
|
||||||
|
|
|
@ -81,6 +81,12 @@ ui_hide_all=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_nam
|
||||||
]
|
]
|
||||||
ui_hide_hud=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777248,"unicode":0,"echo":false,"script":null)
|
ui_hide_hud=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777248,"unicode":0,"echo":false,"script":null)
|
||||||
]
|
]
|
||||||
|
test_change_map_1=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777249,"unicode":0,"echo":false,"script":null)
|
||||||
|
]
|
||||||
|
test_change_map_2=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777250,"unicode":0,"echo":false,"script":null)
|
||||||
|
]
|
||||||
|
test_change_map_3=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777251,"unicode":0,"echo":false,"script":null)
|
||||||
|
]
|
||||||
|
|
||||||
[locale]
|
[locale]
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ signal logout_button_pressed
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
pause()
|
pause()
|
||||||
|
self.connect( "logout_button_pressed", global, "_on_logout_button_pressed" )
|
||||||
|
|
||||||
func _on_Home_setting_pressed():
|
func _on_Home_setting_pressed():
|
||||||
$Home.hide()
|
$Home.hide()
|
||||||
|
|
|
@ -49,6 +49,7 @@ theme = SubResource( 2 )
|
||||||
|
|
||||||
[node name="Home" parent="." index="1" instance=ExtResource( 4 )]
|
[node name="Home" parent="." index="1" instance=ExtResource( 4 )]
|
||||||
|
|
||||||
|
visible = false
|
||||||
anchor_right = 0.0
|
anchor_right = 0.0
|
||||||
anchor_bottom = 0.0
|
anchor_bottom = 0.0
|
||||||
margin_right = 1024.0
|
margin_right = 1024.0
|
||||||
|
@ -66,7 +67,6 @@ _sections_unfolded = [ "Mouse", "Size Flags", "Theme", "custom_constants" ]
|
||||||
|
|
||||||
[node name="Help" parent="." index="3" instance=ExtResource( 6 )]
|
[node name="Help" parent="." index="3" instance=ExtResource( 6 )]
|
||||||
|
|
||||||
visible = false
|
|
||||||
margin_right = 256.0
|
margin_right = 256.0
|
||||||
margin_bottom = 256.0
|
margin_bottom = 256.0
|
||||||
_sections_unfolded = [ "Margin", "Mouse", "Size Flags", "custom_constants" ]
|
_sections_unfolded = [ "Margin", "Mouse", "Size Flags", "custom_constants" ]
|
||||||
|
|
|
@ -4,8 +4,8 @@ extends MarginContainer
|
||||||
# var a = 2
|
# var a = 2
|
||||||
# var b = "textvar"
|
# var b = "textvar"
|
||||||
|
|
||||||
const ACTION_LIST = [ "ui_debug_window", "ui_music_controls", "hide_char", "ui_hide_all", "move_up", "move_down", "move_left", "move_right", "fly_up", "fly_down","game_flashlight", "ui_pause", "ui_reload", "ui_free_cursor", "ui_quit" ]
|
const ACTION_LIST = [ "ui_debug_window", "ui_music_controls", "hide_char", "ui_hide_all", "move_up", "move_down", "move_left", "move_right", "fly_up", "fly_down","game_flashlight", "ui_pause", "ui_reload", "ui_free_cursor", "ui_quit", "test_change_map_1", "test_change_map_2" ]
|
||||||
const ACTION_TEXT = [ "show/hide debug", "show/hide music", "Hide/show character", "hide/show UI", "move up", "move down", "move left", "move right", "fly up", "fly down", "on/off flashlight", "pause/play", "reload the scene", "free/capture mouse cursor", "quit" ]
|
const ACTION_TEXT = [ "show/hide debug", "show/hide music", "Hide/show character", "hide/show UI", "move up", "move down", "move left", "move right", "fly up", "fly down", "on/off flashlight", "pause/play", "reload the scene", "free/capture mouse cursor", "quit", "test scene", "test grid map" ]
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
_on_Refresh_pressed()
|
_on_Refresh_pressed()
|
||||||
|
|
|
@ -14,7 +14,7 @@ flags = 4
|
||||||
gradient = SubResource( 1 )
|
gradient = SubResource( 1 )
|
||||||
width = 2048
|
width = 2048
|
||||||
|
|
||||||
[node name="Help" type="MarginContainer" index="0"]
|
[node name="Help" type="MarginContainer"]
|
||||||
|
|
||||||
anchor_left = 0.0
|
anchor_left = 0.0
|
||||||
anchor_top = 0.0
|
anchor_top = 0.0
|
||||||
|
|
|
@ -27,8 +27,8 @@ func set_info_billboard_position():
|
||||||
player_infos_billboard.rect_position = (unprojected_translation + offset)
|
player_infos_billboard.rect_position = (unprojected_translation + offset)
|
||||||
|
|
||||||
func _ready():
|
func _ready():
|
||||||
camera.make_current()
|
# camera.make_current()
|
||||||
|
show_face_camera()
|
||||||
set_info_billboard_position()
|
set_info_billboard_position()
|
||||||
|
|
||||||
#func _enter_tree():
|
#func _enter_tree():
|
||||||
|
@ -165,7 +165,6 @@ func _input(event):
|
||||||
else:
|
else:
|
||||||
self.show()
|
self.show()
|
||||||
|
|
||||||
|
|
||||||
func hide():
|
func hide():
|
||||||
self.visible = false
|
self.visible = false
|
||||||
$infos_spatial/character_infos_billboard.hide()
|
$infos_spatial/character_infos_billboard.hide()
|
||||||
|
@ -173,3 +172,10 @@ func show():
|
||||||
self.visible = true
|
self.visible = true
|
||||||
$infos_spatial/character_infos_billboard.show()
|
$infos_spatial/character_infos_billboard.show()
|
||||||
|
|
||||||
|
########
|
||||||
|
#### Cameras
|
||||||
|
func show_face_camera():
|
||||||
|
$Camera_rotation_helper/face_camera.make_current()
|
||||||
|
func show_third_person_camera():
|
||||||
|
$Camera_rotation_helper/Camera.make_current()
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
[gd_scene load_steps=8 format=2]
|
[gd_scene load_steps=9 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://scenes/Game/Character/Character.gd" type="Script" id=1]
|
[ext_resource path="res://scenes/Game/Character/Character.gd" type="Script" id=1]
|
||||||
[ext_resource path="res://game_scene/suzanne/suzanne.obj" type="ArrayMesh" id=2]
|
[ext_resource path="res://game_scene/suzanne/suzanne.obj" type="ArrayMesh" id=2]
|
||||||
[ext_resource path="res://game_scene/suzanne/suzanne_albedo.png" type="Texture" id=3]
|
[ext_resource path="res://game_scene/suzanne/suzanne_albedo.png" type="Texture" id=3]
|
||||||
[ext_resource path="res://game_scene/character_infos_billboard.tscn" type="PackedScene" id=4]
|
[ext_resource path="res://scenes/Game/Character/infos_spatial.gd" type="Script" id=4]
|
||||||
|
[ext_resource path="res://game_scene/character_infos_billboard.tscn" type="PackedScene" id=5]
|
||||||
|
|
||||||
[sub_resource type="Shader" id=2]
|
[sub_resource type="Shader" id=1]
|
||||||
|
|
||||||
code = "shader_type spatial;
|
code = "shader_type spatial;
|
||||||
render_mode blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx;
|
render_mode blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx;
|
||||||
|
@ -44,10 +45,10 @@ void fragment() {
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
|
|
||||||
[sub_resource type="ShaderMaterial" id=3]
|
[sub_resource type="ShaderMaterial" id=2]
|
||||||
|
|
||||||
render_priority = 0
|
render_priority = 0
|
||||||
shader = SubResource( 2 )
|
shader = SubResource( 1 )
|
||||||
shader_param/albedo = Color( 1, 1, 1, 1 )
|
shader_param/albedo = Color( 1, 1, 1, 1 )
|
||||||
shader_param/specular = 0.5
|
shader_param/specular = 0.5
|
||||||
shader_param/metallic = 0.0
|
shader_param/metallic = 0.0
|
||||||
|
@ -62,7 +63,7 @@ shader_param/uv2_offset = Vector3( 0, 0, 0 )
|
||||||
shader_param/texture_albedo = ExtResource( 3 )
|
shader_param/texture_albedo = ExtResource( 3 )
|
||||||
_sections_unfolded = [ "shader_param" ]
|
_sections_unfolded = [ "shader_param" ]
|
||||||
|
|
||||||
[sub_resource type="SphereShape" id=4]
|
[sub_resource type="SphereShape" id=3]
|
||||||
|
|
||||||
radius = 0.520354
|
radius = 0.520354
|
||||||
|
|
||||||
|
@ -85,8 +86,6 @@ _sections_unfolded = [ "Axis Lock", "Transform", "collision" ]
|
||||||
|
|
||||||
[node name="Camera_rotation_helper" type="Spatial" parent="." index="0"]
|
[node name="Camera_rotation_helper" type="Spatial" parent="." index="0"]
|
||||||
|
|
||||||
editor/display_folded = true
|
|
||||||
|
|
||||||
[node name="Camera" type="Camera" parent="Camera_rotation_helper" index="0"]
|
[node name="Camera" type="Camera" parent="Camera_rotation_helper" index="0"]
|
||||||
|
|
||||||
transform = Transform( 1, 0, 0, 0, 0.972208, 0.397244, 0, -0.137979, 0.972208, 0, 6.00296, 1.22667 )
|
transform = Transform( 1, 0, 0, 0, 0.972208, 0.397244, 0, -0.137979, 0.972208, 0, 6.00296, 1.22667 )
|
||||||
|
@ -104,6 +103,23 @@ near = 0.05
|
||||||
far = 100.0
|
far = 100.0
|
||||||
_sections_unfolded = [ "Transform" ]
|
_sections_unfolded = [ "Transform" ]
|
||||||
|
|
||||||
|
[node name="face_camera" type="Camera" parent="Camera_rotation_helper" index="1"]
|
||||||
|
|
||||||
|
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 0, 4.27531, -0.805639 )
|
||||||
|
keep_aspect = 1
|
||||||
|
cull_mask = 1048575
|
||||||
|
environment = null
|
||||||
|
h_offset = 0.0
|
||||||
|
v_offset = 0.0
|
||||||
|
doppler_tracking = 0
|
||||||
|
projection = 0
|
||||||
|
current = false
|
||||||
|
fov = 70.0
|
||||||
|
size = 1.0
|
||||||
|
near = 0.05
|
||||||
|
far = 100.0
|
||||||
|
_sections_unfolded = [ "Transform" ]
|
||||||
|
|
||||||
[node name="MeshInstance" type="MeshInstance" parent="." index="1"]
|
[node name="MeshInstance" type="MeshInstance" parent="." index="1"]
|
||||||
|
|
||||||
transform = Transform( -0.281766, 0, -2.3459e-008, 0, 0.491282, 0, 2.46328e-008, 0, -0.26834, 0.0433697, 4.3256, 4.76837e-007 )
|
transform = Transform( -0.281766, 0, -2.3459e-008, 0, 0.491282, 0, 2.46328e-008, 0, -0.26834, 0.0433697, 4.3256, 4.76837e-007 )
|
||||||
|
@ -118,7 +134,7 @@ lod_max_distance = 0.0
|
||||||
lod_max_hysteresis = 0.0
|
lod_max_hysteresis = 0.0
|
||||||
mesh = ExtResource( 2 )
|
mesh = ExtResource( 2 )
|
||||||
skeleton = NodePath("..")
|
skeleton = NodePath("..")
|
||||||
material/0 = SubResource( 3 )
|
material/0 = SubResource( 2 )
|
||||||
_sections_unfolded = [ "Transform", "material" ]
|
_sections_unfolded = [ "Transform", "material" ]
|
||||||
|
|
||||||
[node name="Flashlight" type="SpotLight" parent="MeshInstance" index="0"]
|
[node name="Flashlight" type="SpotLight" parent="MeshInstance" index="0"]
|
||||||
|
@ -146,17 +162,19 @@ _sections_unfolded = [ "Light", "Shadow" ]
|
||||||
|
|
||||||
[node name="infos_spatial" type="Spatial" parent="." index="2"]
|
[node name="infos_spatial" type="Spatial" parent="." index="2"]
|
||||||
|
|
||||||
transform = Transform( 0.281766, 0, 0, 0, 0.491282, 0, 0, 0, 0.26834, 0.0433697, 5.31268, 0 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5.20802, 0 )
|
||||||
|
script = ExtResource( 4 )
|
||||||
|
|
||||||
[node name="character_infos_billboard" parent="infos_spatial" index="0" instance=ExtResource( 4 )]
|
[node name="character_infos_billboard" parent="infos_spatial" index="0" instance=ExtResource( 5 )]
|
||||||
|
|
||||||
|
visible = false
|
||||||
mouse_default_cursor_shape = 2
|
mouse_default_cursor_shape = 2
|
||||||
_sections_unfolded = [ "Mouse", "Rect", "Size Flags", "Visibility" ]
|
_sections_unfolded = [ "Mouse", "Rect", "Size Flags", "Visibility" ]
|
||||||
|
|
||||||
[node name="collision_shape" type="CollisionShape" parent="." index="3"]
|
[node name="collision_shape" type="CollisionShape" parent="." index="3"]
|
||||||
|
|
||||||
transform = Transform( 0.754381, 0, 0, 0, 0.927224, 0, 0, 0, 0.540596, 0.0499596, 4.35001, -0.0363884 )
|
transform = Transform( 0.754381, 0, 0, 0, 0.927224, 0, 0, 0, 0.540596, 0.0499596, 4.35001, -0.0363884 )
|
||||||
shape = SubResource( 4 )
|
shape = SubResource( 3 )
|
||||||
disabled = false
|
disabled = false
|
||||||
|
|
||||||
|
|
||||||
|
|
7
scenes/Game/Character/infos_spatial.gd
Normal file
7
scenes/Game/Character/infos_spatial.gd
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
extends Spatial
|
||||||
|
|
||||||
|
func show():
|
||||||
|
$character_infos_billboard.show()
|
||||||
|
|
||||||
|
func hide():
|
||||||
|
$character_infos_billboard.hide()
|
|
@ -3,7 +3,7 @@
|
||||||
[ext_resource path="res://assets/kits/kit_test/kit_test.meshlib" type="MeshLibrary" id=1]
|
[ext_resource path="res://assets/kits/kit_test/kit_test.meshlib" type="MeshLibrary" id=1]
|
||||||
[ext_resource path="res://scenes/GUI/GUI.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://scenes/GUI/GUI.tscn" type="PackedScene" id=2]
|
||||||
|
|
||||||
[node name="test_grid_map" type="GridMap" index="0"]
|
[node name="test_grid_map" type="GridMap"]
|
||||||
|
|
||||||
theme = ExtResource( 1 )
|
theme = ExtResource( 1 )
|
||||||
cell_size = Vector3( 2, 3, 2 )
|
cell_size = Vector3( 2, 3, 2 )
|
||||||
|
@ -15,7 +15,7 @@ cell_scale = 1.0
|
||||||
collision_layer = 1
|
collision_layer = 1
|
||||||
collision_mask = 1
|
collision_mask = 1
|
||||||
data = {
|
data = {
|
||||||
"cells": PoolIntArray( 0, 0, 3, 1, 0, 3, 2, 0, 1441794, 65533, 0, 1048578, 65534, 0, -1610612733, 65535, 0, 3, 0, 1, 3, 1, 1, 3, 2, 1, 1441794, 65533, 1, 1048578, 65534, 1, 3, 65535, 1, 3, 0, 2, 3, 1, 2, 3, 2, 2, 1441794, 65533, 2, 537919490, 65534, 2, 3, 65535, 2, 3, 0, 3, 655362, 1, 3, 655362, 2, 3, 1441796, 65533, 3, 655364, 65534, 3, 655362, 65535, 3, 655362, 3, 65527, -1609564160, 2, 65528, 1048580, 3, 65528, 1075183618, 0, 65529, 1048580, 1, 65529, 536870913, 2, 65529, 3, 3, 65529, 1441794, 0, 65530, 537919489, 2, 65530, 655364, 3, 65530, 1441794, 0, 65531, 1048577, 3, 65531, 1441792, 0, 65532, -1609564159, 0, 65533, 1048577, 0, 65534, 1074790403, 1, 65534, 2, 2, 65534, 1073741828, 65533, 65534, 1048580, 65534, 65534, 2, 65535, 65534, 1073741826, 0, 65535, 3, 1, 65535, 3, 2, 65535, 1441794, 65533, 65535, 1048578, 65534, 65535, 3, 65535, 65535, 3 )
|
"cells": PoolIntArray( 0, 0, 3, 1, 0, 3, 2, 0, 1441794, 65533, 0, -1609564158, 65534, 0, 3, 65535, 0, 3, 0, 1, 536870915, 1, 1, 1073741827, 2, 1, 1441794, 65533, 1, -1609564158, 65534, 1, 3, 65535, 1, 3, 0, 2, 3, 1, 2, 3, 2, 2, 1441794, 65533, 2, 1048578, 65534, 2, 3, 65535, 2, 3, 0, 3, 655362, 1, 3, 655362, 2, 3, 538312708, 65533, 3, 655364, 65534, 3, 655362, 65535, 3, 655362, 3, 65527, 1048576, 2, 65528, 1048580, 3, 65528, 538312706, 0, 65529, 1048580, 1, 65529, 1, 2, 65529, 3, 3, 65529, 1441794, 0, 65530, 1048577, 2, 65530, 655364, 3, 65530, 1441794, 0, 65531, 1048577, 3, 65531, 1441792, 0, 65532, 1048577, 0, 65533, 1048577, 0, 65534, 1048579, 1, 65534, 2, 2, 65534, 4, 65533, 65534, 1048580, 65534, 65534, 2, 65535, 65534, 2, 0, 65535, 3, 1, 65535, 3, 2, 65535, 1441794, 65533, 65535, 1048578, 65534, 65535, 3, 65535, 65535, 3 )
|
||||||
}
|
}
|
||||||
_sections_unfolded = [ "Cell" ]
|
_sections_unfolded = [ "Cell" ]
|
||||||
__meta__ = {
|
__meta__ = {
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 3, -1, 1, 0, -1, -1, 0, -1, -1, 3, 1, -1, 0, 1, 1, 3, 1, 1, 3, 1, -1, 0, 1, 1, 0, 1, 1, 3, 1, 1, 0, 1, 1, 3, -1, 1, 3, -1, 1, 0, 1, 1, 0, -1 )
|
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 3, -1, 1, 0, -1, -1, 0, -1, -1, 3, 1, -1, 0, 1, 1, 3, 1, 1, 3, 1, -1, 0, 1, 1, 0, 1, 1, 3, 1, 1, 0, 1, 1, 3, -1, 1, 3, -1, 1, 0, 1, 1, 0, -1 )
|
||||||
|
|
||||||
[node name="kit_test_1way" type="Spatial" index="0"]
|
[node name="kit_test_1way" type="Spatial"]
|
||||||
|
|
||||||
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 3, -1, 1, 0, -1, -1, 0, -1, -1, 3, 1, -1, 0, 1, 1, 3, 1, 1, 3, 1, -1, 0, 1, 1, 0, 1 )
|
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 3, -1, 1, 0, -1, -1, 0, -1, -1, 3, 1, -1, 0, 1, 1, 3, 1, 1, 3, 1, -1, 0, 1, 1, 0, 1 )
|
||||||
|
|
||||||
[node name="kit_test_2way" type="Spatial" index="0"]
|
[node name="kit_test_2way" type="Spatial"]
|
||||||
|
|
||||||
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 3, -1, 1, 0, -1, -1, 0, -1 )
|
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1, 1, 3, -1, 1, 0, -1, -1, 3, -1, -1, 3, -1, 1, 0, -1, -1, 0, -1 )
|
||||||
|
|
||||||
[node name="kit_test_3way" type="Spatial" index="0"]
|
[node name="kit_test_3way" type="Spatial"]
|
||||||
|
|
||||||
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1 )
|
data = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0, -1, 1, 3, -1, -1, 3, -1, 1, 3, 1, 1, 3, 1, -1, 3, -1, -1, 3, 1 )
|
||||||
|
|
||||||
[node name="kit_test_4way" type="Spatial" index="0"]
|
[node name="kit_test_4way" type="Spatial"]
|
||||||
|
|
||||||
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
[node name="mesh_instance" type="MeshInstance" parent="." index="0"]
|
||||||
|
|
||||||
|
|
|
@ -112,37 +112,37 @@ transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 5, -1
|
||||||
|
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 13, -1, -1 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 13, -1, -1 )
|
||||||
|
|
||||||
[node name="kit_test_2way4" parent="terrain" index="24" instance=ExtResource( 5 )]
|
[node name="kit_test_corner6" parent="terrain" index="24" instance=ExtResource( 4 )]
|
||||||
|
|
||||||
|
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 7 )
|
||||||
|
|
||||||
|
[node name="kit_test_2way4" parent="terrain" index="25" instance=ExtResource( 5 )]
|
||||||
|
|
||||||
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 1 )
|
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 1 )
|
||||||
|
|
||||||
[node name="kit_test_2way5" parent="terrain" index="25" instance=ExtResource( 5 )]
|
[node name="kit_test_2way5" parent="terrain" index="26" instance=ExtResource( 5 )]
|
||||||
|
|
||||||
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 3 )
|
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 3 )
|
||||||
|
|
||||||
[node name="kit_test_2way6" parent="terrain" index="26" instance=ExtResource( 5 )]
|
[node name="kit_test_2way6" parent="terrain" index="27" instance=ExtResource( 5 )]
|
||||||
|
|
||||||
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 5 )
|
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 5 )
|
||||||
|
|
||||||
[node name="kit_test_corner6" parent="terrain" index="27" instance=ExtResource( 4 )]
|
|
||||||
|
|
||||||
transform = Transform( -4.37114e-008, 0, -1, 0, 1, 0, 1, 0, -4.37114e-008, 13, -1, 6 )
|
|
||||||
|
|
||||||
[node name="kit_test_4way8" parent="terrain" index="28" instance=ExtResource( 2 )]
|
[node name="kit_test_4way8" parent="terrain" index="28" instance=ExtResource( 2 )]
|
||||||
|
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11, -1, 6 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11, -1, 7 )
|
||||||
|
|
||||||
[node name="kit_test_1way" parent="terrain" index="29" instance=ExtResource( 6 )]
|
[node name="kit_test_1way" parent="terrain" index="29" instance=ExtResource( 6 )]
|
||||||
|
|
||||||
transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 11, -1, 4 )
|
transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 11, -1, 5 )
|
||||||
|
|
||||||
[node name="kit_test_1way2" parent="terrain" index="30" instance=ExtResource( 6 )]
|
[node name="kit_test_1way2" parent="terrain" index="30" instance=ExtResource( 6 )]
|
||||||
|
|
||||||
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 9, -1, 6 )
|
transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, 9, -1, 7 )
|
||||||
|
|
||||||
[node name="kit_test_1way3" parent="terrain" index="31" instance=ExtResource( 6 )]
|
[node name="kit_test_1way3" parent="terrain" index="31" instance=ExtResource( 6 )]
|
||||||
|
|
||||||
transform = Transform( 1.31134e-007, 0, -1, 0, 1, 0, 1, 0, 1.31134e-007, 11, -1, 8 )
|
transform = Transform( 1.31134e-007, 0, -1, 0, 1, 0, 1, 0, 1.31134e-007, 11, -1, 9 )
|
||||||
|
|
||||||
[node name="start_position" type="Spatial" parent="." index="1"]
|
[node name="start_position" type="Spatial" parent="." index="1"]
|
||||||
|
|
||||||
|
@ -151,7 +151,4 @@ _sections_unfolded = [ "Transform" ]
|
||||||
|
|
||||||
[node name="GUI" parent="." index="2" instance=ExtResource( 7 )]
|
[node name="GUI" parent="." index="2" instance=ExtResource( 7 )]
|
||||||
|
|
||||||
pause_mode = 2
|
|
||||||
_sections_unfolded = [ "Margin", "Mouse", "Pause", "Size Flags", "Theme", "custom_constants" ]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue