From e2db3853fa4465ff884771dfe118bbee0e2ea0e6 Mon Sep 17 00:00:00 2001 From: osquallo Date: Wed, 25 Jul 2018 11:04:20 +0200 Subject: [PATCH] remplacement de Character par une sphere volante. --- project.godot | 4 + scenes/GUI/GUI.tscn | 2 +- scenes/GUI/HUD/HUD.tscn | 5 +- scenes/Game/{ => Character}/Character.gd | 22 +- scenes/Game/Character/Character.tscn | 100 +++++++ scenes/Game/Game.tscn | 322 +++++++++-------------- scenes/Main.tscn | 2 +- 7 files changed, 249 insertions(+), 208 deletions(-) rename scenes/Game/{ => Character}/Character.gd (88%) create mode 100644 scenes/Game/Character/Character.tscn diff --git a/project.godot b/project.godot index 83b8f21..a0d0eaf 100644 --- a/project.godot +++ b/project.godot @@ -59,6 +59,10 @@ ui_debug_window=[ Object(InputEventKey,"resource_local_to_scene":false,"resource ] ui_music_controls=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"unicode":0,"echo":false,"script":null) ] +fly_up=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777359,"unicode":0,"echo":false,"script":null) + ] +fly_down=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777353,"unicode":0,"echo":false,"script":null) + ] [locale] diff --git a/scenes/GUI/GUI.tscn b/scenes/GUI/GUI.tscn index c2ca33d..e4734ed 100644 --- a/scenes/GUI/GUI.tscn +++ b/scenes/GUI/GUI.tscn @@ -6,7 +6,7 @@ [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] -[node name="GUI" type="MarginContainer" index="0"] +[node name="GUI" type="MarginContainer"] anchor_left = 0.0 anchor_top = 0.0 diff --git a/scenes/GUI/HUD/HUD.tscn b/scenes/GUI/HUD/HUD.tscn index 8b49ad8..8840d4e 100644 --- a/scenes/GUI/HUD/HUD.tscn +++ b/scenes/GUI/HUD/HUD.tscn @@ -9,7 +9,6 @@ [ext_resource path="res://assets/GUI/images/button_resize.png" type="Texture" id=7] [ext_resource path="res://scenes/GUI/MusicControls/MusicControls.tscn" type="PackedScene" id=8] - [node name="HUD" type="MarginContainer" index="0"] anchor_left = 0.0 @@ -139,6 +138,7 @@ _sections_unfolded = [ "Mouse", "Rect", "Size Flags", "custom_constants" ] [node name="HBoxContainer" type="HBoxContainer" parent="Windows/Test/VBoxContainer/Header" index="0"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 @@ -249,6 +249,7 @@ _sections_unfolded = [ "Hint", "Mouse", "Size Flags" ] [node name="Content" type="MarginContainer" parent="Windows/Test/VBoxContainer" index="1"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 @@ -300,6 +301,7 @@ _sections_unfolded = [ "BBCode", "Rect", "Size Flags" ] [node name="Footer" type="MarginContainer" parent="Windows/Test/VBoxContainer" index="2"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 @@ -363,6 +365,7 @@ _sections_unfolded = [ "Mouse", "Size Flags", "Textures" ] [node name="TestBorderless" type="MarginContainer" parent="Windows" index="1"] +editor/display_folded = true anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 diff --git a/scenes/Game/Character.gd b/scenes/Game/Character/Character.gd similarity index 88% rename from scenes/Game/Character.gd rename to scenes/Game/Character/Character.gd index bca1026..8f63873 100644 --- a/scenes/Game/Character.gd +++ b/scenes/Game/Character/Character.gd @@ -5,6 +5,7 @@ const GRAVITY = -24.8 var vel = Vector3() const MAX_SPEED = 20 const ACCEL= 4.5 +const FLY_SPEED = 7 const DEACCEL= 16 const MAX_SLOPE_ANGLE = 40 @@ -15,10 +16,6 @@ var camera var MOUSE_SENSITIVITY = 0.05 -# class member variables go here, for example: -# var a = 2 -# var b = "textvar" - func _ready(): camera_rotation = $Camera_rotation_helper camera = $Camera_rotation_helper/Camera @@ -34,13 +31,13 @@ func process_input(delta): dir = Vector3() var cam_xform = camera.get_global_transform() - var input_movement_vector = Vector2() + var input_movement_vector = Vector3() var cam_scroll = 0.0 if Input.is_action_pressed("move_up"): - input_movement_vector.y += 1 + input_movement_vector.z += 1 if Input.is_action_pressed("move_down"): - input_movement_vector.y -= 1 + input_movement_vector.z -= 1 if Input.is_action_pressed("move_left"): input_movement_vector.x -= 1 if Input.is_action_pressed("move_right"): @@ -48,16 +45,22 @@ func process_input(delta): input_movement_vector = input_movement_vector.normalized() - dir += -cam_xform.basis.z.normalized() * input_movement_vector.y + dir += -cam_xform.basis.z.normalized() * input_movement_vector.z dir += cam_xform.basis.x.normalized() * input_movement_vector.x + if Input.is_action_pressed("fly_up"): + vel.y = FLY_SPEED + elif Input.is_action_pressed("fly_down"): + vel.y = -FLY_SPEED + else: + vel.y = 0 func process_movement(delta): dir.y = 0 dir = dir.normalized() - vel.y += delta*GRAVITY +# vel.y += delta*GRAVITY var hvel = vel hvel.y = 0 @@ -76,6 +79,7 @@ func process_movement(delta): vel.z = hvel.z vel = move_and_slide(vel,Vector3(0,1,0), 0.05, 4, deg2rad(MAX_SLOPE_ANGLE)) + func _input(event): if event is InputEventMouseMotion and Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED: camera_rotation.rotate_x(deg2rad(event.relative.y * MOUSE_SENSITIVITY * -1)) diff --git a/scenes/Game/Character/Character.tscn b/scenes/Game/Character/Character.tscn new file mode 100644 index 0000000..0e59050 --- /dev/null +++ b/scenes/Game/Character/Character.tscn @@ -0,0 +1,100 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/Game/Character/Character.gd" type="Script" id=1] + +[sub_resource type="SphereMesh" id=1] + +custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) +radius = 1.0 +height = 2.0 +radial_segments = 64 +rings = 32 +is_hemisphere = false + +[sub_resource type="SphereShape" id=2] + +radius = 0.973349 + +[node name="Character" type="KinematicBody" index="0"] + +transform = Transform( 1, 0, 0, 0, 0.589355, 0, 0, 0, 1, -0.0409546, 1.06519, 6.02408 ) +input_ray_pickable = true +input_capture_on_drag = false +collision_layer = 1 +collision_mask = 1 +axis_lock_linear_x = false +axis_lock_linear_y = false +axis_lock_linear_z = false +axis_lock_angular_x = false +axis_lock_angular_y = false +axis_lock_angular_z = false +collision/safe_margin = 0.001 +script = ExtResource( 1 ) +_sections_unfolded = [ "Axis Lock", "collision" ] + +[node name="MeshInstance" type="MeshInstance" parent="." index="0"] + +transform = Transform( 0.573532, 0, 0, 0, 1, 0, 0, 0, 0.546204, 0.0433697, 4.3256, 0 ) +layers = 1 +material_override = null +cast_shadow = 1 +extra_cull_margin = 0.0 +use_in_baked_light = false +lod_min_distance = 0.0 +lod_min_hysteresis = 0.0 +lod_max_distance = 0.0 +lod_max_hysteresis = 0.0 +mesh = SubResource( 1 ) +skeleton = NodePath("..") +material/0 = null + +[node name="CollisionShape" type="CollisionShape" parent="." index="1"] + +transform = Transform( 0.784282, 0, 0, 0, -5.90296e-08, -1.35044, 0, 0.791087, -3.45795e-08, 0.0505983, 4.32164, 0 ) +shape = SubResource( 2 ) +disabled = false +_sections_unfolded = [ "Transform" ] + +[node name="Camera_rotation_helper" type="Spatial" parent="." index="2"] + +[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 ) +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="Flashlight" type="SpotLight" parent="Camera_rotation_helper/Camera" index="0"] + +visible = false +layers = 1 +light_color = Color( 1, 1, 1, 1 ) +light_energy = 2.0 +light_indirect_energy = 2.0 +light_negative = false +light_specular = 0.5 +light_bake_mode = 1 +light_cull_mask = -1 +shadow_enabled = true +shadow_color = Color( 0, 0, 0, 1 ) +shadow_bias = 0.15 +shadow_contact = 0.0 +shadow_reverse_cull_face = true +editor_only = false +spot_range = 7.5843 +spot_attenuation = 1.0 +spot_angle = 41.0327 +spot_angle_attenuation = 1.0 +_sections_unfolded = [ "Light", "Shadow" ] + + diff --git a/scenes/Game/Game.tscn b/scenes/Game/Game.tscn index c872897..303620e 100644 --- a/scenes/Game/Game.tscn +++ b/scenes/Game/Game.tscn @@ -1,29 +1,24 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=21 format=2] -[ext_resource path="res://scenes/Game/Character.gd" type="Script" id=1] -[ext_resource path="res://default_env.tres" type="Environment" id=2] -[ext_resource path="res://assets/Game/Brick08/Bricks08_col.jpg" type="Texture" id=3] -[ext_resource path="res://assets/Game/Brick08/Bricks08_AO.jpg" type="Texture" id=4] -[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/Character/Character.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/Game/Brick08/Bricks08_col.jpg" type="Texture" id=2] +[ext_resource path="res://assets/Game/Brick08/Bricks08_AO.jpg" type="Texture" id=3] +[ext_resource path="res://assets/Game/Brick08/Bricks08_disp.jpg" type="Texture" id=4] +[ext_resource path="res://assets/Game/Brick08/Bricks08_nrm.jpg" type="Texture" id=5] +[ext_resource path="res://assets/Game/Brick08/Bricks08_rgh.jpg" type="Texture" id=6] +[ext_resource path="res://scenes/Game/CubeShaderTest.tscn" type="PackedScene" id=7] +[ext_resource path="res://scenes/Game/firecamp.tscn" type="PackedScene" id=8] +[ext_resource path="res://assets/Game/textures/fire_01.png" type="Texture" id=9] +[ext_resource path="res://assets/Game/textures/fire_02.png" type="Texture" id=10] -[sub_resource type="CapsuleShape" id=1] - -radius = 0.938666 -height = 3.34992 - -[sub_resource type="PlaneMesh" id=2] +[sub_resource type="PlaneMesh" id=1] +custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 2, 2 ) subdivide_width = 0 subdivide_depth = 0 -[sub_resource type="SpatialMaterial" id=3] +[sub_resource type="SpatialMaterial" id=2] render_priority = 1 flags_transparent = false @@ -47,23 +42,23 @@ params_billboard_mode = 0 params_grow = false params_use_alpha_scissor = false albedo_color = Color( 1, 1, 1, 1 ) -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource( 2 ) metallic = 0.0 metallic_specular = 0.0 metallic_texture_channel = 0 roughness = 1.0 -roughness_texture = ExtResource( 7 ) +roughness_texture = ExtResource( 6 ) roughness_texture_channel = 3 emission_enabled = false normal_enabled = true normal_scale = 1.0 -normal_texture = ExtResource( 6 ) +normal_texture = ExtResource( 5 ) rim_enabled = false clearcoat_enabled = false anisotropy_enabled = false ao_enabled = true ao_light_affect = 0.0 -ao_texture = ExtResource( 4 ) +ao_texture = ExtResource( 3 ) ao_on_uv2 = false ao_texture_channel = 0 depth_enabled = true @@ -71,7 +66,7 @@ depth_scale = 0.05 depth_deep_parallax = true depth_min_layers = 8 depth_max_layers = 32 -depth_texture = ExtResource( 5 ) +depth_texture = ExtResource( 4 ) subsurf_scatter_enabled = false transmission_enabled = false refraction_enabled = false @@ -88,18 +83,19 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Ambient Occlusion", "Anisotropy", "Clearcoat", "Depth", "Detail", "Distance Fade", "Emission", "Flags", "Metallic", "NormalMap", "Parameters", "Proximity Fade", "Refraction", "Roughness", "Subsurf Scatter", "Transmission", "UV1", "UV2", "Vertex Color" ] -[sub_resource type="ConvexPolygonShape" id=4] +[sub_resource type="ConvexPolygonShape" id=3] points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1 ) -[sub_resource type="CubeMesh" id=5] +[sub_resource type="CubeMesh" id=4] +custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector3( 2, 2, 2 ) subdivide_width = 0 subdivide_height = 0 subdivide_depth = 0 -[sub_resource type="SpatialMaterial" id=6] +[sub_resource type="SpatialMaterial" id=5] render_priority = 0 flags_transparent = false @@ -123,23 +119,23 @@ params_billboard_mode = 0 params_grow = false params_use_alpha_scissor = false albedo_color = Color( 1, 1, 1, 1 ) -albedo_texture = ExtResource( 3 ) +albedo_texture = ExtResource( 2 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 roughness = 0.0 -roughness_texture = ExtResource( 7 ) +roughness_texture = ExtResource( 6 ) roughness_texture_channel = 0 emission_enabled = false normal_enabled = true normal_scale = 1.0 -normal_texture = ExtResource( 6 ) +normal_texture = ExtResource( 5 ) rim_enabled = false clearcoat_enabled = false anisotropy_enabled = false ao_enabled = true ao_light_affect = 0.0 -ao_texture = ExtResource( 4 ) +ao_texture = ExtResource( 3 ) ao_on_uv2 = false ao_texture_channel = 0 depth_enabled = true @@ -147,7 +143,7 @@ depth_scale = 0.05 depth_deep_parallax = true depth_min_layers = 8 depth_max_layers = 32 -depth_texture = ExtResource( 5 ) +depth_texture = ExtResource( 4 ) subsurf_scatter_enabled = false transmission_enabled = false refraction_enabled = false @@ -164,11 +160,77 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Ambient Occlusion", "Clearcoat", "Depth", "Detail", "Distance Fade", "Flags", "NormalMap", "Proximity Fade", "Rim", "Roughness", "Subsurf Scatter", "Transmission", "Vertex Color" ] -[sub_resource type="ConvexPolygonShape" id=7] +[sub_resource type="ConvexPolygonShape" id=6] 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="SpatialMaterial" id=8] +[sub_resource type="SpatialMaterial" id=7] + +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.390625, 0.390625, 0.390625, 1 ) +albedo_texture = ExtResource( 9 ) +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=8] + +material = SubResource( 7 ) +custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) +size = Vector2( 0.4, 0.4 ) + +[sub_resource type="SpatialMaterial" id=9] render_priority = 0 flags_transparent = false @@ -206,6 +268,7 @@ emission = Color( 1, 0.886353, 0.617188, 1 ) emission_energy = 1.0 emission_operator = 0 emission_on_uv2 = false +emission_texture = ExtResource( 10 ) normal_enabled = false rim_enabled = false clearcoat_enabled = false @@ -228,152 +291,19 @@ proximity_fade_enable = false distance_fade_enable = false _sections_unfolded = [ "Albedo", "Emission", "Flags", "Parameters", "Particles Anim" ] -[sub_resource type="QuadMesh" id=9] +[sub_resource type="QuadMesh" id=10] -material = SubResource( 8 ) -size = Vector2( 0.4, 0.4 ) - -[sub_resource type="SpatialMaterial" id=10] - -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.390625, 0.390625, 0.390625, 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 -emission_texture = ExtResource( 11 ) -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=11] - -material = SubResource( 10 ) +material = SubResource( 9 ) +custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) [node name="Game" type="Spatial"] -[node name="Character" type="KinematicBody" parent="." index="0"] - -transform = Transform( 1, 0, 0, 0, 0.589355, 0, 0, 0, 1, -0.0409546, 1.06519, 6.02408 ) -input_ray_pickable = true -input_capture_on_drag = false -collision_layer = 1 -collision_mask = 1 -axis_lock_linear_x = false -axis_lock_linear_y = false -axis_lock_linear_z = false -axis_lock_angular_x = false -axis_lock_angular_y = false -axis_lock_angular_z = false -collision/safe_margin = 0.001 -script = ExtResource( 1 ) - -[node name="CollisionShape" type="CollisionShape" parent="Character" index="0"] - -transform = Transform( 1.16184, 0, 0, 0, -5.07856e-08, -1.16184, 0, 1.16184, -5.07856e-08, 0, 2.33476, 0 ) -shape = SubResource( 1 ) -disabled = false -_sections_unfolded = [ "Transform" ] - -[node name="Camera_rotation_helper" type="Spatial" parent="Character" index="1"] - -[node name="Camera" type="Camera" parent="Character/Camera_rotation_helper" index="0"] - -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.01783, 0 ) -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="Flashlight" type="SpotLight" parent="Character/Camera_rotation_helper/Camera" index="0"] - -visible = false -layers = 1 -light_color = Color( 1, 1, 1, 1 ) -light_energy = 2.0 -light_indirect_energy = 2.0 -light_negative = false -light_specular = 0.5 -light_bake_mode = 1 -light_cull_mask = -1 -shadow_enabled = true -shadow_color = Color( 0, 0, 0, 1 ) -shadow_bias = 0.15 -shadow_contact = 0.0 -shadow_reverse_cull_face = true -editor_only = false -spot_range = 7.5843 -spot_attenuation = 1.0 -spot_angle = 41.0327 -spot_angle_attenuation = 1.0 -_sections_unfolded = [ "Light", "Shadow" ] +[node name="Character" parent="." index="0" instance=ExtResource( 1 )] [node name="World" type="Spatial" parent="." index="1"] -[node name="WorldEnvironment" type="WorldEnvironment" parent="World" index="0"] - -environment = ExtResource( 2 ) -_sections_unfolded = [ "Pause" ] - -[node name="Terrain" type="Spatial" parent="World" index="1"] +[node name="Terrain" type="Spatial" parent="World" index="0"] [node name="Ground" type="StaticBody" parent="World/Terrain" index="0"] @@ -398,15 +328,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 1 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 2 ) _sections_unfolded = [ "Transform", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Terrain/Ground" index="1"] transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 3 ) disabled = false [node name="Wall1" type="StaticBody" parent="World/Terrain" index="1"] @@ -434,15 +364,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 1 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 2 ) _sections_unfolded = [ "Transform", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Terrain/Wall1" index="1"] transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 3 ) disabled = false _sections_unfolded = [ "Transform" ] @@ -471,15 +401,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 1 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 2 ) _sections_unfolded = [ "Transform", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Terrain/Wall2" index="1"] transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 3 ) disabled = false [node name="Wall3" type="StaticBody" parent="World/Terrain" index="3"] @@ -507,15 +437,15 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 1 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 2 ) _sections_unfolded = [ "Transform", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Terrain/Wall3" index="1"] transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 3 ) disabled = false [node name="Wall4" type="StaticBody" parent="World/Terrain" index="4"] @@ -543,18 +473,18 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 2 ) +mesh = SubResource( 1 ) skeleton = NodePath("..") -material/0 = SubResource( 3 ) +material/0 = SubResource( 2 ) _sections_unfolded = [ "Transform", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Terrain/Wall4" index="1"] transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0 ) -shape = SubResource( 4 ) +shape = SubResource( 3 ) disabled = false -[node name="OmniLight" type="OmniLight" parent="World" index="2"] +[node name="OmniLight" type="OmniLight" parent="World" index="1"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.46929, 4.14904, -7.50301 ) layers = 1 @@ -577,7 +507,7 @@ omni_shadow_mode = 1 omni_shadow_detail = 1 _sections_unfolded = [ "Editor", "Light", "Omni", "Shadow", "Visibility" ] -[node name="Box" type="RigidBody" parent="World" index="3"] +[node name="Box" type="RigidBody" parent="World" index="2"] 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 @@ -618,28 +548,28 @@ lod_min_distance = 0.0 lod_min_hysteresis = 0.0 lod_max_distance = 0.0 lod_max_hysteresis = 0.0 -mesh = SubResource( 5 ) +mesh = SubResource( 4 ) skeleton = NodePath("..") -material/0 = SubResource( 6 ) +material/0 = SubResource( 5 ) _sections_unfolded = [ "Geometry", "LOD", "material" ] [node name="CollisionShape" type="CollisionShape" parent="World/Box" index="1"] transform = Transform( 1, 1.49012e-08, 0, 1.3411e-07, 1, 0, 2.98023e-08, -2.98023e-08, 1, 0, 0, 0 ) -shape = SubResource( 7 ) +shape = SubResource( 6 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="CubeShaderTest" parent="World" index="4" instance=ExtResource( 8 )] +[node name="CubeShaderTest" parent="World" index="3" instance=ExtResource( 7 )] transform = Transform( -0.471909, 0, -0.881647, 0, 1, 0, 0.881647, 0, -0.471909, 4, 2, 3.11353 ) -[node name="fire_01" parent="World" index="5" instance=ExtResource( 9 )] +[node name="fire_01" parent="World" index="4" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -4.60514, 0.220215, -2.3728 ) visibility_aabb = AABB( -4, -4.04395, -3.96729, 8, 8, 8 ) draw_passes = 2 -draw_pass_1 = SubResource( 9 ) -draw_pass_2 = SubResource( 11 ) +draw_pass_1 = SubResource( 8 ) +draw_pass_2 = SubResource( 10 ) diff --git a/scenes/Main.tscn b/scenes/Main.tscn index c2785fd..3b85a6e 100644 --- a/scenes/Main.tscn +++ b/scenes/Main.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://scenes/GUI/GUI.tscn" type="PackedScene" id=2] [ext_resource path="res://scenes/Game/Game.tscn" type="PackedScene" id=3] -[node name="Main" type="Node" index="0"] +[node name="Main" type="Node"] script = ExtResource( 1 ) _sections_unfolded = [ "Pause" ]