divers changement dont la possibilite de changer la taille de la police de l'UI.

This commit is contained in:
osquallo 2018-07-28 10:28:50 +02:00
parent 8789cab0bb
commit 2ffe407827
12 changed files with 747 additions and 79 deletions

View file

@ -65,5 +65,6 @@ _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles A
[resource]
material = SubResource( 1 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )

View file

@ -61,6 +61,7 @@ _sections_unfolded = [ "Albedo", "Flags", "Parameters" ]
[resource]
material = SubResource( 1 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 1, 1 )
_sections_unfolded = [ "Albedo", "Flags", "Parameters" ]

View file

@ -61,6 +61,7 @@ _sections_unfolded = [ "Albedo", "Flags", "Parameters" ]
[resource]
material = SubResource( 1 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 1, 1 )
_sections_unfolded = [ "Albedo", "Flags", "Parameters" ]

View file

@ -61,6 +61,7 @@ _sections_unfolded = [ "Albedo", "Flags", "Parameters" ]
[resource]
material = SubResource( 1 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 1, 1 )
_sections_unfolded = [ "Albedo", "Flags", "Parameters" ]

View file

@ -61,6 +61,7 @@ _sections_unfolded = [ "Albedo", "Flags", "Parameters" ]
[resource]
material = SubResource( 1 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 1, 1 )
_sections_unfolded = [ "Albedo", "Flags", "Parameters" ]

View file

@ -88,4 +88,7 @@ func hide_menu():
$HUD.show()
$Help.show()
$HUD.modulate.a = 1.0
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
func _on_Settings_font_changed( value ):
$HUD.get_theme().default_font.size = value

View file

@ -1,12 +1,25 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://scenes/GUI/GUI.gd" type="Script" id=1]
[ext_resource path="res://scenes/GUI/HUD/HUD.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/GUI/Home/Home.tscn" type="PackedScene" id=3]
[ext_resource path="res://scenes/GUI/Settings/Settings.tscn" type="PackedScene" id=4]
[ext_resource path="res://scenes/GUI/Help/Help.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/GUI/fonts/ryzom.ttf" type="DynamicFontData" id=3]
[ext_resource path="res://scenes/GUI/Home/Home.tscn" type="PackedScene" id=4]
[ext_resource path="res://scenes/GUI/Settings/Settings.tscn" type="PackedScene" id=5]
[ext_resource path="res://scenes/GUI/Help/Help.tscn" type="PackedScene" id=6]
[node name="GUI" type="MarginContainer"]
[sub_resource type="DynamicFont" id=1]
size = 14
use_mipmaps = false
use_filter = false
font_data = ExtResource( 3 )
_sections_unfolded = [ "Font", "Settings" ]
[sub_resource type="Theme" id=2]
default_font = SubResource( 1 )
[node name="GUI" type="MarginContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.0
@ -33,8 +46,9 @@ margin_left = 4.0
margin_top = 4.0
margin_right = 1020.0
margin_bottom = 596.0
theme = SubResource( 2 )
[node name="Home" parent="." index="1" instance=ExtResource( 3 )]
[node name="Home" parent="." index="1" instance=ExtResource( 4 )]
visible = false
anchor_right = 0.0
@ -45,7 +59,7 @@ margin_right = 1020.0
margin_bottom = 596.0
_sections_unfolded = [ "Margin", "Size Flags", "Visibility", "custom_constants" ]
[node name="Settings" parent="." index="2" instance=ExtResource( 4 )]
[node name="Settings" parent="." index="2" instance=ExtResource( 5 )]
visible = false
anchor_right = 0.0
@ -56,7 +70,7 @@ margin_right = 1020.0
margin_bottom = 596.0
_sections_unfolded = [ "Margin", "Size Flags", "Theme", "custom_constants" ]
[node name="Help" parent="." index="3" instance=ExtResource( 5 )]
[node name="Help" parent="." index="3" instance=ExtResource( 6 )]
margin_left = 4.0
margin_top = 4.0
@ -67,6 +81,8 @@ margin_bottom = 86.0
[connection signal="setting_pressed" from="Home" to="." method="_on_Home_setting_pressed"]
[connection signal="font_changed" from="Settings" to="." method="_on_Settings_font_changed"]
[connection signal="return_pressed" from="Settings" to="." method="_on_Settings_return_pressed"]

View file

@ -1,7 +1,7 @@
extends Container
signal return_pressed
signal font_changed( value )
func _ready():
$Menus/TabContainer/Display/ScrollContainer/VBoxContainer/Fullscreen/CheckBox.pressed = ProjectSettings.get_setting( "display/window/size/fullscreen" )
@ -9,10 +9,12 @@ func _ready():
$Menus/TabContainer/Display/ScrollContainer/VBoxContainer/Resizable/CheckBox.pressed = ProjectSettings.get_setting( "display/window/size/resizable" )
$Menus/TabContainer/Display/ScrollContainer/VBoxContainer/CurrentScreen/SpinBox.value = OS.current_screen
#func _process(delta):
# # Called every frame. Delta is time since last frame.
# # Update game logic here.
# pass
$Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size/font_size_value.text = str( $Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size_bar.value )
func _on_font_size_bar_value_changed(value):
$Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size/font_size_value.text = str( value )
$Menus.get_theme().default_font.size = value
emit_signal( "font_changed", value )
func _on_ReturnButton_pressed():
emit_signal( "return_pressed" )

View file

@ -9,7 +9,7 @@
[sub_resource type="DynamicFont" id=1]
size = 18
size = 14
use_mipmaps = false
use_filter = false
extra_spacing_top = 8
@ -281,7 +281,7 @@ anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 940.0
margin_bottom = 264.0
margin_bottom = 239.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -619,6 +619,8 @@ _sections_unfolded = [ "Size Flags" ]
[node name="Controles" type="VBoxContainer" parent="Menus/TabContainer" index="1"]
editor/display_folded = true
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
@ -679,13 +681,12 @@ _sections_unfolded = [ "Hint", "Size Flags", "custom_colors", "custom_constants"
[node name="Jeu" type="VBoxContainer" parent="Menus/TabContainer/Controles/ScrollContainer/TabContainer" index="0"]
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 1.0
margin_top = 55.0
margin_top = 50.0
margin_right = -1.0
margin_bottom = -1.0
rect_pivot_offset = Vector2( 0, 0 )
@ -969,6 +970,7 @@ config_file = "user://input.cfg"
[node name="Deplacement" type="VBoxContainer" parent="Menus/TabContainer/Controles/ScrollContainer/TabContainer" index="2"]
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
@ -1267,12 +1269,11 @@ _sections_unfolded = [ "Size Flags" ]
[node name="Test" type="MarginContainer" parent="Menus/TabContainer" index="2"]
visible = false
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 54.0
margin_top = 49.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
@ -1294,7 +1295,7 @@ anchor_bottom = 0.0
margin_left = 42.0
margin_top = 42.0
margin_right = 982.0
margin_bottom = 403.0
margin_bottom = 408.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = true
mouse_filter = 0
@ -1314,9 +1315,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 342.0
margin_right = 598.0
margin_bottom = 454.0
margin_left = 336.0
margin_right = 592.0
margin_bottom = 446.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -1326,14 +1327,71 @@ size_flags_vertical = 3
alignment = 0
_sections_unfolded = [ "Size Flags" ]
[node name="HScrollBar" type="HScrollBar" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="0"]
[node name="font_size" type="HBoxContainer" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 256.0
margin_bottom = 12.0
margin_bottom = 33.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
alignment = 0
[node name="font_size_label" type="Label" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size" index="0"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_right = 67.0
margin_bottom = 33.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 4
text = "Font size:"
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
[node name="font_size_value" type="Label" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size" index="1"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 238.0
margin_right = 256.0
margin_bottom = 33.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
mouse_default_cursor_shape = 0
size_flags_horizontal = 10
size_flags_vertical = 4
text = "14"
percent_visible = 1.0
lines_skipped = 0
max_lines_visible = -1
_sections_unfolded = [ "Size Flags" ]
[node name="font_size_bar" type="HScrollBar" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="1"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 37.0
margin_right = 256.0
margin_bottom = 49.0
rect_min_size = Vector2( 256, 0 )
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
@ -1341,25 +1399,25 @@ mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 0
min_value = 0.0
max_value = 100.0
step = 0.0
min_value = 8.0
max_value = 22.0
step = 2.0
page = 0.0
value = 0.0
value = 14.0
exp_edit = false
rounded = false
custom_step = -1.0
_sections_unfolded = [ "Rect" ]
[node name="SpinBox" type="SpinBox" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="1"]
[node name="SpinBox" type="SpinBox" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="2"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 16.0
margin_top = 53.0
margin_right = 256.0
margin_bottom = 64.0
margin_bottom = 96.0
rect_min_size = Vector2( 256, 0 )
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
@ -1379,15 +1437,15 @@ prefix = "test"
suffix = "tset"
_sections_unfolded = [ "Rect", "Size Flags" ]
[node name="CheckBox" type="CheckBox" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="2"]
[node name="CheckBox" type="CheckBox" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="3"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 68.0
margin_top = 100.0
margin_right = 256.0
margin_bottom = 114.0
margin_bottom = 141.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
hint_tooltip = "Test de CheckBox"
@ -1405,15 +1463,15 @@ flat = false
align = 0
_sections_unfolded = [ "Focus", "Hint", "Mouse", "Size Flags", "Theme" ]
[node name="CheckBox2" type="CheckBox" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="3"]
[node name="CheckBox2" type="CheckBox" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="4"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 118.0
margin_top = 145.0
margin_right = 256.0
margin_bottom = 164.0
margin_bottom = 186.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
@ -1430,15 +1488,15 @@ flat = false
align = 0
_sections_unfolded = [ "Size Flags", "Theme" ]
[node name="TitleBox" type="HBoxContainer" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="4"]
[node name="TitleBox" type="HBoxContainer" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="5"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 168.0
margin_top = 190.0
margin_right = 256.0
margin_bottom = 216.0
margin_bottom = 233.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 1
@ -1454,8 +1512,8 @@ anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 5.0
margin_right = 51.0
margin_bottom = 43.0
margin_right = 40.0
margin_bottom = 38.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 2
@ -1473,9 +1531,9 @@ anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_left = 55.0
margin_left = 44.0
margin_right = 256.0
margin_bottom = 48.0
margin_bottom = 43.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
hint_tooltip = "Enter main window's title here."
@ -1492,15 +1550,15 @@ caret_blink_speed = 0.65
caret_position = 0
_sections_unfolded = [ "Hint", "Size Flags" ]
[node name="MenuButton" type="MenuButton" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="5"]
[node name="MenuButton" type="MenuButton" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="6"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 220.0
margin_top = 237.0
margin_right = 256.0
margin_bottom = 264.0
margin_bottom = 276.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
mouse_filter = 0
@ -1519,15 +1577,15 @@ items = [ ]
script = ExtResource( 5 )
_sections_unfolded = [ "custom_constants" ]
[node name="ColorPickerButton" type="ColorPickerButton" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="6"]
[node name="ColorPickerButton" type="ColorPickerButton" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="7"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 268.0
margin_top = 280.0
margin_right = 256.0
margin_bottom = 312.0
margin_bottom = 319.0
rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false
focus_mode = 2
@ -1544,7 +1602,10 @@ align = 1
color = Color( 1, 1, 1, 1 )
edit_alpha = true
[node name="Music" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="7" instance=ExtResource( 6 )]
[node name="Music" parent="Menus/TabContainer/Test/ScrollContainer/VBoxContainer" index="8" instance=ExtResource( 6 )]
margin_top = 323.0
margin_bottom = 446.0
[node name="Footer" type="HBoxContainer" parent="Menus" index="2"]
@ -1601,6 +1662,8 @@ _sections_unfolded = [ "Size Flags", "custom_fonts" ]
[connection signal="pressed" from="Menus/TabContainer/Controles/ResetButton" to="Menus/TabContainer/Controles" method="_on_ResetButton_pressed"]
[connection signal="value_changed" from="Menus/TabContainer/Test/ScrollContainer/VBoxContainer/font_size_bar" to="." method="_on_font_size_bar_value_changed"]
[connection signal="text_changed" from="Menus/TabContainer/Test/ScrollContainer/VBoxContainer/TitleBox/Title" to="." method="_on_Title_text_changed"]
[connection signal="pressed" from="Menus/Footer/ReturnButton" to="." method="_on_ReturnButton_pressed"]

View file

@ -0,0 +1,18 @@
extends HBoxContainer
signal font_changed
func _ready():
$font_size_value.text = str( get_node ( "../font_size_bar" ).value )
#func _process(delta):
# # Called every frame. Delta is time since last frame.
# # Update game logic here.
# pass
func _on_font_size_bar_value_changed(value):
$font_size_value.text = str( value )
var menus_node = get_node( "../../../../../" )
menus_node.get_theme().default_font.size = value
emit_signal( "font_changed" )

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=21 format=2]
[gd_scene load_steps=40 format=2]
[ext_resource path="res://scenes/Game/Character/Character.tscn" type="PackedScene" id=1]
[ext_resource path="res://scenes/Game/Terrain/Terrain.tscn" type="PackedScene" id=2]
@ -7,10 +7,11 @@
[ext_resource path="res://assets/Game/Brick08/Bricks08_disp.jpg" type="Texture" id=5]
[ext_resource path="res://assets/Game/Brick08/Bricks08_nrm.jpg" type="Texture" id=6]
[ext_resource path="res://assets/Game/Brick08/Bricks08_rgh.jpg" type="Texture" id=7]
[ext_resource path="res://scenes/Game/CubeShaderTest.tscn" type="PackedScene" id=8]
[ext_resource path="res://scenes/Game/firecamp.tscn" type="PackedScene" id=9]
[ext_resource path="res://assets/Game/textures/fire_01.png" type="Texture" id=10]
[ext_resource path="res://assets/Game/textures/fire_02.png" type="Texture" id=11]
[ext_resource path="res://scenes/Game/Box.gd" type="Script" id=8]
[ext_resource path="res://scenes/Game/CubeShaderTest.tscn" type="PackedScene" id=9]
[ext_resource path="res://scenes/Game/firecamp.tscn" type="PackedScene" id=10]
[ext_resource path="res://assets/Game/textures/fire_01.png" type="Texture" id=11]
[ext_resource path="res://assets/Game/textures/fire_02.png" type="Texture" id=12]
[sub_resource type="GDScript" id=1]
@ -20,7 +21,9 @@ func _on_Box_sleeping_state_changed():
if self.sleeping:
$MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 1.0, 0.0, 1 )
else:
$MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 0.0, 1.0, 1 )"
$MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 0.0, 1.0, 1 )
"
[sub_resource type="CubeMesh" id=2]
@ -99,16 +102,6 @@ _sections_unfolded = [ "Albedo", "Ambient Occlusion", "Clearcoat", "Depth", "Det
points = PoolVector3Array( -1, 1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, -1, 1, 1, -1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, 1, 1, -1, -1, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, 1, -1, -1 )
[sub_resource type="GDScript" id=5]
script/source = "extends RigidBody
func _on_Box_sleeping_state_changed():
if self.sleeping:
$MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 1.0, 0.0, 1 )
else:
$MeshInstance.get_surface_material(0).albedo_color = Color( 0.0, 0.0, 1.0, 1 )"
[sub_resource type="SpatialMaterial" id=6]
render_priority = 0
@ -136,7 +129,7 @@ particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 0.390625, 0.390625, 0.390625, 1 )
albedo_texture = ExtResource( 10 )
albedo_texture = ExtResource( 11 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
@ -202,7 +195,7 @@ particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 0.390625, 0.390625, 0.390625, 1 )
albedo_texture = ExtResource( 11 )
albedo_texture = ExtResource( 12 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
@ -213,7 +206,7 @@ emission = Color( 1, 0.886353, 0.617188, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
emission_texture = ExtResource( 11 )
emission_texture = ExtResource( 12 )
normal_enabled = false
rim_enabled = false
clearcoat_enabled = false
@ -242,7 +235,547 @@ material = SubResource( 8 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )
[node name="Game" type="Spatial" index="0"]
[sub_resource type="Curve" id=10]
min_value = -360.0
max_value = 360.0
bake_resolution = 100
_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.959245, 38.6719 ), 89.2918, 89.2918, 0, 0, Vector2( 1, 324.844 ), 17644.8, 0.0, 0, 0 ]
[sub_resource type="CurveTexture" id=11]
flags = 4
width = 2048
curve = SubResource( 10 )
[sub_resource type="Gradient" id=12]
offsets = PoolRealArray( 0, 0.0788644, 0.514196, 0.851735, 1 )
colors = PoolColorArray( 1, 1, 1, 0.359098, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0.911608, 1, 1, 1, 0 )
[sub_resource type="GradientTexture" id=13]
flags = 4
gradient = SubResource( 12 )
width = 2048
[sub_resource type="ParticlesMaterial" id=14]
render_priority = 0
trail_divisor = 1
emission_shape = 2
emission_box_extents = Vector3( 0.07, 0.07, 0.07 )
flag_align_y = false
flag_rotate_y = false
flag_disable_z = false
spread = 2.0
flatness = 0.0
gravity = Vector3( 0, 0.05, 0 )
initial_velocity = 0.0
initial_velocity_random = 0.0
angular_velocity = 35.0
angular_velocity_random = 1.0
angular_velocity_curve = SubResource( 11 )
linear_accel = 0.01
linear_accel_random = 0.0
radial_accel = 0.0
radial_accel_random = 0.0
tangential_accel = 0.0
tangential_accel_random = 0.06
damping = 0.0
damping_random = 0.0
angle = 10.0
angle_random = 0.0
scale = 1.0
scale_random = 0.0
color_ramp = SubResource( 13 )
hue_variation = 0.0
hue_variation_random = 0.0
anim_speed = 50.0
anim_speed_random = 0.0
anim_offset = 0.14
anim_offset_random = 0.0
anim_loop = true
_sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Radial Accel", "Resource", "Scale", "Spread", "Tangential Accel", "Trail" ]
[sub_resource type="SpatialMaterial" id=15]
render_priority = 0
flags_transparent = false
flags_unshaded = true
flags_vertex_lighting = false
flags_no_depth_test = false
flags_use_point_size = false
flags_world_triplanar = false
flags_fixed_size = false
flags_albedo_tex_force_srgb = false
vertex_color_use_as_albedo = false
vertex_color_is_srgb = false
params_diffuse_mode = 0
params_specular_mode = 0
params_blend_mode = 1
params_cull_mode = 2
params_depth_draw_mode = 0
params_line_width = 1.0
params_point_size = 1.0
params_billboard_mode = 3
params_grow = false
params_use_alpha_scissor = false
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 1, 1, 1, 1 )
albedo_texture = ExtResource( 11 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
roughness = 0.0
roughness_texture_channel = 0
emission_enabled = true
emission = Color( 1, 0.886353, 0.617188, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
normal_enabled = false
rim_enabled = false
clearcoat_enabled = false
anisotropy_enabled = false
ao_enabled = false
depth_enabled = false
subsurf_scatter_enabled = false
transmission_enabled = false
refraction_enabled = false
detail_enabled = false
uv1_scale = Vector3( 1, 1, 1 )
uv1_offset = Vector3( 0, 0, 0 )
uv1_triplanar = false
uv1_triplanar_sharpness = 1.0
uv2_scale = Vector3( 1, 1, 1 )
uv2_offset = Vector3( 0, 0, 0 )
uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ]
[sub_resource type="QuadMesh" id=16]
material = SubResource( 15 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )
[sub_resource type="SpatialMaterial" id=17]
render_priority = 0
flags_transparent = false
flags_unshaded = true
flags_vertex_lighting = false
flags_no_depth_test = false
flags_use_point_size = false
flags_world_triplanar = false
flags_fixed_size = false
flags_albedo_tex_force_srgb = false
vertex_color_use_as_albedo = false
vertex_color_is_srgb = false
params_diffuse_mode = 0
params_specular_mode = 0
params_blend_mode = 1
params_cull_mode = 2
params_depth_draw_mode = 0
params_line_width = 1.0
params_point_size = 1.0
params_billboard_mode = 3
params_grow = false
params_use_alpha_scissor = false
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 1, 1, 1, 1 )
albedo_texture = ExtResource( 12 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
roughness = 0.0
roughness_texture_channel = 0
emission_enabled = true
emission = Color( 1, 0.886353, 0.617188, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
emission_texture = ExtResource( 12 )
normal_enabled = false
rim_enabled = false
clearcoat_enabled = false
anisotropy_enabled = false
ao_enabled = false
depth_enabled = false
subsurf_scatter_enabled = false
transmission_enabled = false
refraction_enabled = false
detail_enabled = false
uv1_scale = Vector3( 1, 1, 1 )
uv1_offset = Vector3( 0, 0, 0 )
uv1_triplanar = false
uv1_triplanar_sharpness = 1.0
uv2_scale = Vector3( 1, 1, 1 )
uv2_offset = Vector3( 0, 0, 0 )
uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ]
[sub_resource type="QuadMesh" id=18]
material = SubResource( 17 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )
[sub_resource type="ParticlesMaterial" id=19]
render_priority = 0
trail_divisor = 1
emission_shape = 2
emission_box_extents = Vector3( 0.07, 0.07, 0.07 )
flag_align_y = false
flag_rotate_y = false
flag_disable_z = false
spread = 2.0
flatness = 0.0
gravity = Vector3( 0, 0.05, 0 )
initial_velocity = 0.0
initial_velocity_random = 0.0
angular_velocity = 35.0
angular_velocity_random = 1.0
angular_velocity_curve = SubResource( 11 )
linear_accel = 0.01
linear_accel_random = 0.0
radial_accel = 0.0
radial_accel_random = 0.0
tangential_accel = 0.0
tangential_accel_random = 0.06
damping = 0.0
damping_random = 0.0
angle = 10.0
angle_random = 0.0
scale = 1.0
scale_random = 0.0
color_ramp = SubResource( 13 )
hue_variation = 0.0
hue_variation_random = 0.0
anim_speed = 50.0
anim_speed_random = 0.0
anim_offset = 0.14
anim_offset_random = 0.0
anim_loop = true
_sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Radial Accel", "Resource", "Scale", "Spread", "Tangential Accel", "Trail" ]
[sub_resource type="SpatialMaterial" id=20]
render_priority = 0
flags_transparent = false
flags_unshaded = true
flags_vertex_lighting = false
flags_no_depth_test = false
flags_use_point_size = false
flags_world_triplanar = false
flags_fixed_size = false
flags_albedo_tex_force_srgb = false
vertex_color_use_as_albedo = false
vertex_color_is_srgb = false
params_diffuse_mode = 0
params_specular_mode = 0
params_blend_mode = 1
params_cull_mode = 2
params_depth_draw_mode = 0
params_line_width = 1.0
params_point_size = 1.0
params_billboard_mode = 3
params_grow = false
params_use_alpha_scissor = false
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 0.0078125, 0, 1, 1 )
albedo_texture = ExtResource( 11 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
roughness = 0.0
roughness_texture_channel = 0
emission_enabled = true
emission = Color( 1, 0.886353, 0.617188, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
normal_enabled = false
rim_enabled = false
clearcoat_enabled = false
anisotropy_enabled = false
ao_enabled = false
depth_enabled = false
subsurf_scatter_enabled = false
transmission_enabled = false
refraction_enabled = false
detail_enabled = false
uv1_scale = Vector3( 1, 1, 1 )
uv1_offset = Vector3( 0, 0, 0 )
uv1_triplanar = false
uv1_triplanar_sharpness = 1.0
uv2_scale = Vector3( 1, 1, 1 )
uv2_offset = Vector3( 0, 0, 0 )
uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ]
[sub_resource type="QuadMesh" id=21]
material = SubResource( 20 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )
[sub_resource type="SpatialMaterial" id=22]
render_priority = 0
flags_transparent = false
flags_unshaded = true
flags_vertex_lighting = false
flags_no_depth_test = false
flags_use_point_size = false
flags_world_triplanar = false
flags_fixed_size = false
flags_albedo_tex_force_srgb = false
vertex_color_use_as_albedo = false
vertex_color_is_srgb = false
params_diffuse_mode = 0
params_specular_mode = 0
params_blend_mode = 1
params_cull_mode = 2
params_depth_draw_mode = 0
params_line_width = 1.0
params_point_size = 1.0
params_billboard_mode = 3
params_grow = false
params_use_alpha_scissor = false
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 0, 0.015625, 1, 1 )
albedo_texture = ExtResource( 12 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
roughness = 0.0
roughness_texture_channel = 0
emission_enabled = true
emission = Color( 1, 0.886353, 0.617188, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
emission_texture = ExtResource( 12 )
normal_enabled = false
rim_enabled = false
clearcoat_enabled = false
anisotropy_enabled = false
ao_enabled = false
depth_enabled = false
subsurf_scatter_enabled = false
transmission_enabled = false
refraction_enabled = false
detail_enabled = false
uv1_scale = Vector3( 1, 1, 1 )
uv1_offset = Vector3( 0, 0, 0 )
uv1_triplanar = false
uv1_triplanar_sharpness = 1.0
uv2_scale = Vector3( 1, 1, 1 )
uv2_offset = Vector3( 0, 0, 0 )
uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ]
[sub_resource type="QuadMesh" id=23]
material = SubResource( 22 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )
[sub_resource type="ParticlesMaterial" id=24]
render_priority = 0
trail_divisor = 1
emission_shape = 2
emission_box_extents = Vector3( 0.07, 0.07, 0.07 )
flag_align_y = false
flag_rotate_y = false
flag_disable_z = false
spread = 2.0
flatness = 0.0
gravity = Vector3( 0, 0.05, 0 )
initial_velocity = 0.0
initial_velocity_random = 0.0
angular_velocity = 35.0
angular_velocity_random = 1.0
angular_velocity_curve = SubResource( 11 )
linear_accel = 0.01
linear_accel_random = 0.0
radial_accel = 0.0
radial_accel_random = 0.0
tangential_accel = 0.0
tangential_accel_random = 0.06
damping = 0.0
damping_random = 0.0
angle = 10.0
angle_random = 0.0
scale = 1.0
scale_random = 0.0
color_ramp = SubResource( 13 )
hue_variation = 0.0
hue_variation_random = 0.0
anim_speed = 50.0
anim_speed_random = 0.0
anim_offset = 0.14
anim_offset_random = 0.0
anim_loop = true
_sections_unfolded = [ "Angle", "Angular Velocity", "Animation", "Color", "Damping", "Emission Shape", "Flags", "Gravity", "Hue Variation", "Initial Velocity", "Linear Accel", "Radial Accel", "Resource", "Scale", "Spread", "Tangential Accel", "Trail" ]
[sub_resource type="SpatialMaterial" id=25]
render_priority = 0
flags_transparent = false
flags_unshaded = true
flags_vertex_lighting = false
flags_no_depth_test = false
flags_use_point_size = false
flags_world_triplanar = false
flags_fixed_size = false
flags_albedo_tex_force_srgb = false
vertex_color_use_as_albedo = false
vertex_color_is_srgb = false
params_diffuse_mode = 0
params_specular_mode = 0
params_blend_mode = 1
params_cull_mode = 2
params_depth_draw_mode = 0
params_line_width = 1.0
params_point_size = 1.0
params_billboard_mode = 3
params_grow = false
params_use_alpha_scissor = false
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 0.125, 1, 0, 1 )
albedo_texture = ExtResource( 11 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
roughness = 0.0
roughness_texture_channel = 0
emission_enabled = true
emission = Color( 1, 0.886353, 0.617188, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
normal_enabled = false
rim_enabled = false
clearcoat_enabled = false
anisotropy_enabled = false
ao_enabled = false
depth_enabled = false
subsurf_scatter_enabled = false
transmission_enabled = false
refraction_enabled = false
detail_enabled = false
uv1_scale = Vector3( 1, 1, 1 )
uv1_offset = Vector3( 0, 0, 0 )
uv1_triplanar = false
uv1_triplanar_sharpness = 1.0
uv2_scale = Vector3( 1, 1, 1 )
uv2_offset = Vector3( 0, 0, 0 )
uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ]
[sub_resource type="QuadMesh" id=26]
material = SubResource( 25 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )
[sub_resource type="SpatialMaterial" id=27]
render_priority = 0
flags_transparent = false
flags_unshaded = true
flags_vertex_lighting = false
flags_no_depth_test = false
flags_use_point_size = false
flags_world_triplanar = false
flags_fixed_size = false
flags_albedo_tex_force_srgb = false
vertex_color_use_as_albedo = false
vertex_color_is_srgb = false
params_diffuse_mode = 0
params_specular_mode = 0
params_blend_mode = 1
params_cull_mode = 2
params_depth_draw_mode = 0
params_line_width = 1.0
params_point_size = 1.0
params_billboard_mode = 3
params_grow = false
params_use_alpha_scissor = false
particles_anim_h_frames = 1
particles_anim_v_frames = 1
particles_anim_loop = 0
albedo_color = Color( 0.078125, 1, 0, 1 )
albedo_texture = ExtResource( 12 )
metallic = 0.0
metallic_specular = 0.5
metallic_texture_channel = 0
roughness = 0.0
roughness_texture_channel = 0
emission_enabled = true
emission = Color( 1, 0.886353, 0.617188, 1 )
emission_energy = 1.0
emission_operator = 0
emission_on_uv2 = false
emission_texture = ExtResource( 12 )
normal_enabled = false
rim_enabled = false
clearcoat_enabled = false
anisotropy_enabled = false
ao_enabled = false
depth_enabled = false
subsurf_scatter_enabled = false
transmission_enabled = false
refraction_enabled = false
detail_enabled = false
uv1_scale = Vector3( 1, 1, 1 )
uv1_offset = Vector3( 0, 0, 0 )
uv1_triplanar = false
uv1_triplanar_sharpness = 1.0
uv2_scale = Vector3( 1, 1, 1 )
uv2_offset = Vector3( 0, 0, 0 )
uv2_triplanar = false
uv2_triplanar_sharpness = 1.0
proximity_fade_enable = false
distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ]
[sub_resource type="QuadMesh" id=28]
material = SubResource( 27 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector2( 0.4, 0.4 )
[node name="Game" type="Spatial"]
_sections_unfolded = [ "Transform" ]
@ -532,7 +1065,7 @@ linear_velocity = Vector3( 0, 0, 0 )
linear_damp = -1.0
angular_velocity = Vector3( 0, 0, 0 )
angular_damp = -1.0
script = SubResource( 5 )
script = ExtResource( 8 )
_sections_unfolded = [ "Collision" ]
[node name="MeshInstance" type="MeshInstance" parent="World/Box2" index="0"]
@ -559,20 +1092,48 @@ shape = SubResource( 4 )
disabled = false
_sections_unfolded = [ "Transform" ]
[node name="CubeShaderTest" parent="World" index="7" instance=ExtResource( 8 )]
[node name="CubeShaderTest" parent="World" index="7" instance=ExtResource( 9 )]
editor/display_folded = true
transform = Transform( -0.471909, 0, -0.881647, 0, 1, 0, 0.881647, 0, -0.471909, 4, 2, 3.11353 )
friction = 0.2
bounce = 0.75
[node name="fire_01" parent="World" index="8" instance=ExtResource( 9 )]
[node name="fire_01" parent="World/CubeShaderTest" index="2" instance=ExtResource( 10 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.60514, 0.220215, -2.3728 )
transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, 0, 1.1836, 0 )
visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 )
draw_passes = 2
draw_pass_1 = SubResource( 7 )
draw_pass_2 = SubResource( 9 )
[node name="fire_02" parent="World/CubeShaderTest" index="3" instance=ExtResource( 10 )]
transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, -0.574282, 0.104018, -1.07291 )
visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 )
process_material = SubResource( 14 )
draw_passes = 2
draw_pass_1 = SubResource( 16 )
draw_pass_2 = SubResource( 18 )
[node name="fire_03" parent="World/CubeShaderTest" index="4" instance=ExtResource( 10 )]
transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, 0.573787, 0.104018, 1.07198 )
visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 )
process_material = SubResource( 19 )
draw_passes = 2
draw_pass_1 = SubResource( 21 )
draw_pass_2 = SubResource( 23 )
[node name="fire_04" parent="World/CubeShaderTest" index="5" instance=ExtResource( 10 )]
transform = Transform( -1.5494, 0, 2.89468, 0, 1, 0, -2.89468, 0, -1.5494, 0.00931859, -1.29484, 0.0174088 )
visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 )
process_material = SubResource( 24 )
draw_passes = 2
draw_pass_1 = SubResource( 26 )
draw_pass_2 = SubResource( 28 )
[connection signal="sleeping_state_changed" from="World/Box" to="World/Box" method="_on_Box_sleeping_state_changed"]
[connection signal="sleeping_state_changed" from="World/Box3" to="World/Box3" method="_on_Box_sleeping_state_changed"]

View file

@ -16,8 +16,8 @@ lod_min_hysteresis = 0.0
lod_max_distance = 0.0
lod_max_hysteresis = 0.0
emitting = true
amount = 16
lifetime = 5.0
amount = 50
lifetime = 2.0
one_shot = false
preprocess = 0.5
speed_scale = 4.5