diff --git a/scenes/GUI/GUI.gd b/scenes/GUI/GUI.gd index 8ca4047..6de5702 100644 --- a/scenes/GUI/GUI.gd +++ b/scenes/GUI/GUI.gd @@ -58,7 +58,6 @@ func recursive_release_focus( control ): if len(control.get_children()) > 0: for child in control.get_children(): recursive_release_focus( child ) -# if control.has_method( "release_focus" ): control.release_focus() func pause(): diff --git a/scenes/GUI/GUI.tscn b/scenes/GUI/GUI.tscn index ef7b0b3..a4c6885 100644 --- a/scenes/GUI/GUI.tscn +++ b/scenes/GUI/GUI.tscn @@ -19,7 +19,7 @@ _sections_unfolded = [ "Font", "Settings" ] default_font = SubResource( 1 ) -[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.gd b/scenes/GUI/HUD/HUD.gd index 6f1f3d3..e8541b5 100644 --- a/scenes/GUI/HUD/HUD.gd +++ b/scenes/GUI/HUD/HUD.gd @@ -18,7 +18,6 @@ func _input( event ): func _on_SaveHUD_pressed(): - var config_file = ConfigFile.new() var err = config_file.load( HUD_config_file ) if err: @@ -29,15 +28,13 @@ func _on_SaveHUD_pressed(): config_file.save( HUD_config_file ) - func _on_Windows_gui_input( event ): if event is InputEventMouseButton \ and Input.get_mouse_mode() == Input.MOUSE_MODE_VISIBLE \ and event.is_action_pressed( "ui_free_cursor" ): Input.set_mouse_mode( Input.MOUSE_MODE_CAPTURED ) - elif event is InputEventMouseButton \ and Input.get_mouse_mode() == Input.MOUSE_MODE_CAPTURED \ and event.is_action_pressed( "ui_free_cursor" ): - Input.set_mouse_mode( Input.MOUSE_MODE_VISIBLE ) + Input.set_mouse_mode( Input.MOUSE_MODE_VISIBLE ) \ No newline at end of file diff --git a/scenes/Game/Game.tscn b/scenes/Game/Game.tscn index 707b205..18b79a5 100644 --- a/scenes/Game/Game.tscn +++ b/scenes/Game/Game.tscn @@ -1,18 +1,18 @@ [gd_scene load_steps=41 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] -[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/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] -[ext_resource path="res://scenes/Game/jukebox/jukebox.tscn" type="PackedScene" id=13] +[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/Box.gd" type="Script" 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/jukebox/jukebox.tscn" type="PackedScene" id=12] +[ext_resource path="res://scenes/Game/Terrain/gridmaps/GridMaps.tscn" type="PackedScene" id=13] [sub_resource type="GDScript" id=1] @@ -58,23 +58,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 = 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 @@ -82,7 +82,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 @@ -130,7 +130,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( 10 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -196,7 +196,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( 12 ) +albedo_texture = ExtResource( 11 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -207,7 +207,7 @@ emission = Color( 1, 0.886353, 0.617188, 1 ) emission_energy = 1.0 emission_operator = 0 emission_on_uv2 = false -emission_texture = ExtResource( 12 ) +emission_texture = ExtResource( 11 ) normal_enabled = false rim_enabled = false clearcoat_enabled = false @@ -326,7 +326,7 @@ 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 ) +albedo_texture = ExtResource( 10 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -392,7 +392,7 @@ 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 ) +albedo_texture = ExtResource( 11 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -403,7 +403,7 @@ emission = Color( 1, 0.886353, 0.617188, 1 ) emission_energy = 1.0 emission_operator = 0 emission_on_uv2 = false -emission_texture = ExtResource( 12 ) +emission_texture = ExtResource( 11 ) normal_enabled = false rim_enabled = false clearcoat_enabled = false @@ -498,7 +498,7 @@ 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 ) +albedo_texture = ExtResource( 10 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -564,7 +564,7 @@ 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 ) +albedo_texture = ExtResource( 11 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -575,7 +575,7 @@ emission = Color( 1, 0.886353, 0.617188, 1 ) emission_energy = 1.0 emission_operator = 0 emission_on_uv2 = false -emission_texture = ExtResource( 12 ) +emission_texture = ExtResource( 11 ) normal_enabled = false rim_enabled = false clearcoat_enabled = false @@ -670,7 +670,7 @@ 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 ) +albedo_texture = ExtResource( 10 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -736,7 +736,7 @@ 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 ) +albedo_texture = ExtResource( 11 ) metallic = 0.0 metallic_specular = 0.5 metallic_texture_channel = 0 @@ -747,7 +747,7 @@ emission = Color( 1, 0.886353, 0.617188, 1 ) emission_energy = 1.0 emission_operator = 0 emission_on_uv2 = false -emission_texture = ExtResource( 12 ) +emission_texture = ExtResource( 11 ) normal_enabled = false rim_enabled = false clearcoat_enabled = false @@ -776,7 +776,7 @@ material = SubResource( 26 ) custom_aabb = AABB( 0, 0, 0, 0, 0, 0 ) size = Vector2( 0.4, 0.4 ) -[node name="Game" type="Spatial"] +[node name="Game" type="Spatial" index="0"] _sections_unfolded = [ "Transform" ] @@ -784,14 +784,9 @@ _sections_unfolded = [ "Transform" ] [node name="World" type="Spatial" parent="." index="1"] -editor/display_folded = true _sections_unfolded = [ "Transform", "Visibility" ] -[node name="Terrain" parent="World" index="0" instance=ExtResource( 2 )] - -_sections_unfolded = [ "Transform" ] - -[node name="OmniLight" type="OmniLight" parent="World" index="1"] +[node name="OmniLight" type="OmniLight" parent="World" index="0"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.46929, 4.14904, -7.50301 ) layers = 1 @@ -814,7 +809,7 @@ omni_shadow_mode = 1 omni_shadow_detail = 1 _sections_unfolded = [ "Editor", "Light", "Omni", "Shadow", "Visibility" ] -[node name="Box" type="RigidBody" parent="World" index="2"] +[node name="Box" type="RigidBody" parent="World" index="1"] editor/display_folded = true transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, 1.68693, 3.13013, -6.48976 ) @@ -870,7 +865,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box3" type="RigidBody" parent="World" index="3"] +[node name="Box3" type="RigidBody" parent="World" index="2"] editor/display_folded = true transform = Transform( 1, 0, -0.00107956, 0, 1, 0, 0.00107956, 0, 0.999999, 8.55614, 1.10185, -4.11165 ) @@ -926,7 +921,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box5" type="RigidBody" parent="World" index="4"] +[node name="Box5" type="RigidBody" parent="World" index="3"] editor/display_folded = true transform = Transform( 1, 0, -0.00107956, 0, 1, 0, 0.00107956, 0, 0.999999, 6.54047, 1.10185, -4.11382 ) @@ -982,7 +977,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box4" type="RigidBody" parent="World" index="5"] +[node name="Box4" type="RigidBody" parent="World" index="4"] editor/display_folded = true transform = Transform( 1, 0, -0.00107956, 0, 1, 0, 0.00107956, 0, 0.999999, 8.55614, 3.13749, -4.11165 ) @@ -1038,7 +1033,7 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="Box2" type="RigidBody" parent="World" index="6"] +[node name="Box2" type="RigidBody" parent="World" index="5"] editor/display_folded = true transform = Transform( 0.640199, 0.768209, 0, -0.650662, 0.542239, -0.531616, -0.408393, 0.34034, 0.846985, -3.00203, 8.74323, -4.47902 ) @@ -1067,7 +1062,7 @@ linear_velocity = Vector3( 0, 0, 0 ) linear_damp = -1.0 angular_velocity = Vector3( 0, 0, 0 ) angular_damp = -1.0 -script = ExtResource( 8 ) +script = ExtResource( 7 ) _sections_unfolded = [ "Collision" ] [node name="MeshInstance" type="MeshInstance" parent="World/Box2" index="0"] @@ -1094,14 +1089,14 @@ shape = SubResource( 4 ) disabled = false _sections_unfolded = [ "Transform" ] -[node name="CubeShaderTest" parent="World" index="7" instance=ExtResource( 9 )] +[node name="CubeShaderTest" parent="World" index="6" instance=ExtResource( 8 )] 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/CubeShaderTest" index="2" instance=ExtResource( 10 )] +[node name="fire_01" parent="World/CubeShaderTest" index="2" instance=ExtResource( 9 )] 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 ) @@ -1109,7 +1104,7 @@ draw_passes = 2 draw_pass_1 = SubResource( 6 ) draw_pass_2 = SubResource( 8 ) -[node name="fire_02" parent="World/CubeShaderTest" index="3" instance=ExtResource( 10 )] +[node name="fire_02" parent="World/CubeShaderTest" index="3" instance=ExtResource( 9 )] 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 ) @@ -1118,7 +1113,7 @@ draw_passes = 2 draw_pass_1 = SubResource( 15 ) draw_pass_2 = SubResource( 17 ) -[node name="fire_03" parent="World/CubeShaderTest" index="4" instance=ExtResource( 10 )] +[node name="fire_03" parent="World/CubeShaderTest" index="4" instance=ExtResource( 9 )] 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 ) @@ -1127,7 +1122,7 @@ draw_passes = 2 draw_pass_1 = SubResource( 20 ) draw_pass_2 = SubResource( 22 ) -[node name="fire_04" parent="World/CubeShaderTest" index="5" instance=ExtResource( 10 )] +[node name="fire_04" parent="World/CubeShaderTest" index="5" instance=ExtResource( 9 )] 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 ) @@ -1136,10 +1131,14 @@ draw_passes = 2 draw_pass_1 = SubResource( 25 ) draw_pass_2 = SubResource( 27 ) -[node name="jukebox" parent="World" index="8" instance=ExtResource( 13 )] +[node name="jukebox" parent="World" index="7" instance=ExtResource( 12 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -7.67816, 0, 0 ) +[node name="GridMaps" parent="World" index="8" instance=ExtResource( 13 )] + +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.66248, 0 ) + [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"] diff --git a/scenes/Game/Terrain/gridmaps/GridMaps.tscn b/scenes/Game/Terrain/gridmaps/GridMaps.tscn new file mode 100644 index 0000000..c065816 --- /dev/null +++ b/scenes/Game/Terrain/gridmaps/GridMaps.tscn @@ -0,0 +1,68 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://scenes/Game/Terrain/gridmaps/ceilling.meshlib" type="MeshLibrary" id=1] +[ext_resource path="res://scenes/Game/Terrain/gridmaps/wall.meshlib" type="MeshLibrary" id=2] +[ext_resource path="res://scenes/Game/Terrain/gridmaps/ground.meshlib" type="MeshLibrary" id=3] + +[node name="GridMaps" type="Spatial"] + +[node name="ceilling" type="GridMap" parent="." index="0"] + +theme = ExtResource( 1 ) +cell_size = Vector3( 2, 4, 2 ) +cell_octant_size = 8 +cell_center_x = true +cell_center_y = true +cell_center_z = true +cell_scale = 1.0 +collision_layer = 1 +collision_mask = 1 +data = { +"cells": PoolIntArray( ) +} +_sections_unfolded = [ "Cell" ] +__meta__ = { +"_editor_clip_": 0, +"_editor_floor_": Vector3( 0, 0, 0 ) +} + +[node name="wall" type="GridMap" parent="." index="1"] + +theme = ExtResource( 2 ) +cell_size = Vector3( 2, 4, 2 ) +cell_octant_size = 8 +cell_center_x = true +cell_center_y = true +cell_center_z = true +cell_scale = 1.0 +collision_layer = 1 +collision_mask = 1 +data = { +"cells": PoolIntArray( 7, 0, 1441795, 65528, 0, 1048579, 7, 1, 1441795, 65528, 1, 1048579, 7, 2, 1441795, 65528, 2, 1048579, 7, 3, 1441795, 65528, 3, 1048579, 7, 4, 538312707, 65528, 4, 1048579, 7, 5, 538312707, 65528, 5, 537919491, 7, 6, 538312707, 65528, 6, 1048579, 0, 7, 655363, 1, 7, 1074397187, 2, 7, 655363, 3, 7, 1074397187, 4, 7, 655363, 5, 7, 655363, 6, 7, 655363, 7, 7, 655362, 65528, 7, 1048578, 65529, 7, 655363, 65530, 7, 655363, 65531, 7, 537526275, 65532, 7, 655363, 65533, 7, 537526275, 65534, 7, 1074397187, 65535, 7, 537526275, 0, 65528, 1073741827, 1, 65528, 536870915, 2, 65528, 1073741827, 3, 65528, 3, 4, 65528, 3, 5, 65528, 3, 6, 65528, 3, 7, 65528, 1441794, 65528, 65528, 2, 65529, 65528, 3, 65530, 65528, 3, 65531, 65528, 3, 65532, 65528, 3, 65533, 65528, 3, 65534, 65528, 3, 65535, 65528, 3, 7, 65529, 1441795, 65528, 65529, 1048579, 7, 65530, 1441795, 65528, 65530, 1048579, 7, 65531, 1441795, 65528, 65531, 1048579, 7, 65532, 1441795, 65528, 65532, 1048579, 7, 65533, 1441795, 65528, 65533, 1048579, 7, 65534, 1441795, 65528, 65534, 1048579, 7, 65535, 1441795, 65528, 65535, 1048579 ) +} +_sections_unfolded = [ "Cell", "Transform" ] +__meta__ = { +"_editor_clip_": 0, +"_editor_floor_": Vector3( 0, 0, 0 ) +} + +[node name="Ground" type="GridMap" parent="." index="2"] + +theme = ExtResource( 3 ) +cell_size = Vector3( 2, 4, 2 ) +cell_octant_size = 8 +cell_center_x = true +cell_center_y = true +cell_center_z = true +cell_scale = 1.0 +collision_layer = 1 +collision_mask = 1 +data = { +"cells": PoolIntArray( 0, 0, 655360, 1, 0, 1074397184, 2, 0, 655360, 3, 0, 1074397184, 4, 0, 1074397184, 5, 0, 1074397184, 6, 0, -1609957376, 7, 0, -1609957376, 65528, 0, 1074397184, 65529, 0, 655360, 65530, 0, 1074397184, 65531, 0, 1074397184, 65532, 0, 537526272, 65533, 0, 655360, 65534, 0, -1609957376, 65535, 0, 1074397184, 0, 1, 1074397184, 1, 1, 1074397184, 2, 1, -1609957376, 3, 1, 1074397184, 4, 1, -1609957376, 5, 1, 1074397184, 6, 1, 1074397184, 7, 1, 1074397184, 65528, 1, 1074397184, 65529, 1, 655360, 65530, 1, 655360, 65531, 1, 1074397184, 65532, 1, 537526272, 65533, 1, 1074397184, 65534, 1, 1074397184, 65535, 1, 1074397184, 0, 2, 1074397184, 1, 2, 1074397184, 2, 2, 655360, 3, 2, 655360, 4, 2, 655360, 5, 2, 655360, 6, 2, 655360, 7, 2, 655360, 65528, 2, -1609957376, 65529, 2, 655360, 65530, 2, -1609957376, 65531, 2, 1074397184, 65532, 2, -1609957376, 65533, 2, 655360, 65534, 2, 655360, 65535, 2, 655360, 0, 3, 655360, 1, 3, 655360, 2, 3, 1074397184, 3, 3, 655360, 4, 3, 655360, 5, 3, 655360, 6, 3, 537526272, 7, 3, 655360, 65528, 3, 1074397184, 65529, 3, 655360, 65530, 3, -1609957376, 65531, 3, 655360, 65532, 3, 655360, 65533, 3, -1609957376, 65534, 3, 655360, 65535, 3, 655360, 0, 4, 655360, 1, 4, 655360, 2, 4, 655360, 3, 4, 655360, 4, 4, -1609957376, 5, 4, 655360, 6, 4, 655360, 7, 4, 655360, 65528, 4, 655360, 65529, 4, 655360, 65530, 4, 655360, 65531, 4, 655360, 65532, 4, 655360, 65533, 4, 655360, 65534, 4, 655360, 65535, 4, 655360, 0, 5, 655360, 1, 5, -1609957376, 2, 5, 655360, 3, 5, 655360, 4, 5, 655360, 5, 5, 655360, 6, 5, 655360, 7, 5, 655360, 65528, 5, 655360, 65529, 5, 655360, 65530, 5, 655360, 65531, 5, 655360, 65532, 5, 655360, 65533, 5, 655360, 65534, 5, 655360, 65535, 5, 655360, 0, 6, -1609957376, 1, 6, 655360, 2, 6, 655360, 3, 6, 655360, 4, 6, 655360, 5, 6, 655360, 6, 6, 655360, 7, 6, 655360, 65528, 6, 655360, 65529, 6, 655360, 65530, 6, 655360, 65531, 6, 655360, 65532, 6, 1074397184, 65533, 6, 655360, 65534, 6, 655360, 65535, 6, -1609957376, 0, 7, -1609957376, 1, 7, 655360, 2, 7, 655360, 3, 7, -1609957376, 4, 7, 655360, 5, 7, 655360, 6, 7, 655360, 7, 7, -1609957376, 65528, 7, -1609957376, 65529, 7, 655360, 65530, 7, -1609957376, 65531, 7, 655360, 65532, 7, 655360, 65533, 7, 537526272, 65534, 7, -1609957376, 65535, 7, 1074397184, 0, 65528, 655360, 1, 65528, -1609957376, 2, 65528, 655360, 3, 65528, 1074397184, 4, 65528, 655360, 5, 65528, 655360, 6, 65528, -1609957376, 7, 65528, 655360, 65528, 65528, -1609957376, 65529, 65528, 655360, 65530, 65528, -1609957376, 65531, 65528, 655360, 65532, 65528, -1609957376, 65533, 65528, 1074397184, 65534, 65528, 537526272, 65535, 65528, 1074397184, 0, 65529, 655360, 1, 65529, 1074397184, 2, 65529, 1074397184, 3, 65529, 1074397184, 4, 65529, 655360, 5, 65529, 1074397184, 6, 65529, 1074397184, 7, 65529, 655360, 65528, 65529, 655360, 65529, 65529, 655360, 65530, 65529, 655360, 65531, 65529, 655360, 65532, 65529, 655360, 65533, 65529, 1074397184, 65534, 65529, 655360, 65535, 65529, 1074397184, 0, 65530, 537526272, 1, 65530, 655360, 2, 65530, 655360, 3, 65530, -1609957376, 4, 65530, 655360, 5, 65530, 655360, 6, 65530, 655360, 7, 65530, 655360, 65528, 65530, 655360, 65529, 65530, 1074397184, 65530, 65530, 1074397184, 65531, 65530, 655360, 65532, 65530, 655360, 65533, 65530, 655360, 65534, 65530, 655360, 65535, 65530, 655360, 0, 65531, 655360, 1, 65531, 655360, 2, 65531, 1074397184, 3, 65531, 1074397184, 4, 65531, 655360, 5, 65531, 655360, 6, 65531, 1074397184, 7, 65531, 1074397184, 65528, 65531, 655360, 65529, 65531, 655360, 65530, 65531, 1074397184, 65531, 65531, 1074397184, 65532, 65531, 655360, 65533, 65531, 1074397184, 65534, 65531, 655360, 65535, 65531, 1074397184, 0, 65532, 655360, 1, 65532, 655360, 2, 65532, 655360, 3, 65532, 655360, 4, 65532, 655360, 5, 65532, 655360, 6, 65532, 655360, 7, 65532, 655360, 65528, 65532, 655360, 65529, 65532, 655360, 65530, 65532, 655360, 65531, 65532, 655360, 65532, 65532, 537526272, 65533, 65532, 655360, 65534, 65532, 655360, 65535, 65532, 655360, 0, 65533, 655360, 1, 65533, 655360, 2, 65533, 655360, 3, 65533, 655360, 4, 65533, 655360, 5, 65533, 655360, 6, 65533, 655360, 7, 65533, 655360, 65528, 65533, 655360, 65529, 65533, 655360, 65530, 65533, 655360, 65531, 65533, 655360, 65532, 65533, 537526272, 65533, 65533, 655360, 65534, 65533, 655360, 65535, 65533, 655360, 0, 65534, 655360, 1, 65534, 655360, 2, 65534, 655360, 3, 65534, 655360, 4, 65534, 655360, 5, 65534, 655360, 6, 65534, 655360, 7, 65534, 655360, 65528, 65534, 655360, 65529, 65534, 655360, 65530, 65534, 655360, 65531, 65534, 655360, 65532, 65534, 655360, 65533, 65534, 655360, 65534, 65534, 655360, 65535, 65534, 655360, 0, 65535, 655360, 1, 65535, 655360, 2, 65535, 655360, 3, 65535, 655360, 4, 65535, 655360, 5, 65535, 655360, 6, 65535, 655360, 7, 65535, 655360, 65528, 65535, 655360, 65529, 65535, 655360, 65530, 65535, 655360, 65531, 65535, 655360, 65532, 65535, 655360, 65533, 65535, 655360, 65534, 65535, 655360, 65535, 65535, 655360 ) +} +_sections_unfolded = [ "Cell" ] +__meta__ = { +"_editor_clip_": 0 +} + + diff --git a/scenes/Game/Terrain/gridmaps/ceilling.escn b/scenes/Game/Terrain/gridmaps/ceilling.escn new file mode 100644 index 0000000..8a83b62 --- /dev/null +++ b/scenes/Game/Terrain/gridmaps/ceilling.escn @@ -0,0 +1,27 @@ +[gd_scene load_steps=1 format=2] + +[sub_resource id=1 type="ArrayMesh"] + +surfaces/0 = { + "primitive":4, + "arrays":[ + Vector3Array(1.0, 4.0, -1.0, -1.0, 4.0, 1.0, -1.0, 4.0, -1.0, 1.0, 4.0, 1.0), + Vector3Array(0.0, -1.0, 0.0, 0.0, -1.0, 0.0, 0.0, -1.0, 0.0, 0.0, -1.0, 0.0), + null, ; No Tangents, + null, ; no Vertex Colors, + null, ; No UV1, + null, ; No UV2, + null, ; No Bones, + null, ; No Weights, + IntArray(0, 2, 1, 0, 1, 3) + ], + "morph_arrays":[] +} +[node type="Spatial" name="Scene"] + + +[node name="Plane" type="MeshInstance" parent="."] + +mesh = SubResource(1) +visible = true +transform = Transform(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0) diff --git a/scenes/Game/Terrain/gridmaps/ceilling.meshlib b/scenes/Game/Terrain/gridmaps/ceilling.meshlib new file mode 100644 index 0000000..01068c2 Binary files /dev/null and b/scenes/Game/Terrain/gridmaps/ceilling.meshlib differ diff --git a/scenes/Game/Terrain/gridmaps/ground.escn b/scenes/Game/Terrain/gridmaps/ground.escn new file mode 100644 index 0000000..aa5df5e --- /dev/null +++ b/scenes/Game/Terrain/gridmaps/ground.escn @@ -0,0 +1,27 @@ +[gd_scene load_steps=1 format=2] + +[sub_resource id=1 type="ArrayMesh"] + +surfaces/0 = { + "primitive":4, + "arrays":[ + Vector3Array(1.0, 0.0, 1.0, -1.0, 0.0, -1.0, -1.0, 0.0, 1.0, 1.0, 0.0, -1.0), + Vector3Array(0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0), + null, ; No Tangents, + null, ; no Vertex Colors, + null, ; No UV1, + null, ; No UV2, + null, ; No Bones, + null, ; No Weights, + IntArray(0, 2, 1, 0, 1, 3) + ], + "morph_arrays":[] +} +[node type="Spatial" name="Scene"] + + +[node name="Plane" type="MeshInstance" parent="."] + +mesh = SubResource(1) +visible = true +transform = Transform(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0) diff --git a/scenes/Game/Terrain/gridmaps/ground.meshlib b/scenes/Game/Terrain/gridmaps/ground.meshlib new file mode 100644 index 0000000..7a49695 Binary files /dev/null and b/scenes/Game/Terrain/gridmaps/ground.meshlib differ diff --git a/scenes/Game/Terrain/gridmaps/wall.escn b/scenes/Game/Terrain/gridmaps/wall.escn new file mode 100644 index 0000000..c0cab42 --- /dev/null +++ b/scenes/Game/Terrain/gridmaps/wall.escn @@ -0,0 +1,71 @@ +[gd_scene load_steps=1 format=2] + +[sub_resource id=1 type="ArrayMesh"] + +surfaces/0 = { + "primitive":4, + "arrays":[ + Vector3Array(1.0, 0.0, -1.0, -1.0, 2.0, -1.0, -1.0, 0.0, -1.0, 1.0, 2.0, -1.0, -1.0, 4.0, -1.0, -1.0, 2.0, -1.0, -1.0, 0.0, 1.0, -1.0, 0.0, -1.0, -1.0, 4.0, -1.0, -1.0, 2.0, 1.0, 1.0, 4.0, -1.0, -1.0, 4.0, 1.0), + Vector3Array(0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0), + null, ; No Tangents, + null, ; no Vertex Colors, + null, ; No UV1, + null, ; No UV2, + null, ; No Bones, + null, ; No Weights, + IntArray(0, 2, 1, 3, 1, 4, 5, 7, 6, 8, 5, 9, 0, 1, 3, 3, 4, 10, 5, 6, 9, 8, 9, 11) + ], + "morph_arrays":[] +} + +[sub_resource id=2 type="ArrayMesh"] + +surfaces/0 = { + "primitive":4, + "arrays":[ + Vector3Array(1.0, 0.0, -1.0, -1.0, 2.0, -1.0, -1.0, 0.0, -1.0, 1.0, 2.0, -1.0, -1.0, 4.0, -1.0, 1.0, 4.0, -1.0), + Vector3Array(0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0), + null, ; No Tangents, + null, ; no Vertex Colors, + null, ; No UV1, + null, ; No UV2, + null, ; No Bones, + null, ; No Weights, + IntArray(0, 2, 1, 3, 1, 4, 0, 1, 3, 3, 4, 5) + ], + "morph_arrays":[] +} +[node type="Spatial" name="Scene"] + + +[node name="Plane001" type="MeshInstance" parent="."] + +mesh = SubResource(1) +visible = true +transform = Transform(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 3.0, 0.0, 0.0) + +[node name="Plane" type="MeshInstance" parent="."] + +mesh = SubResource(2) +visible = true +transform = Transform(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0) + +[node name="Lamp" type="OmniLight" parent="."] + +light_specular = 1.0 +light_energy = 1.0 +light_color = Color(1.0, 1.0, 1.0, 1.0) +shadow_color = Color(0.0, 0.0, 0.0, 1.0) +omni_range = 30.0 +transform = Transform(-0.290865, -0.771101, 0.566393, -0.0551891, 0.604525, 0.794672, -0.955171, 0.199883, -0.218391, 4.07625, 5.90386, -1.00545) +shadow_enabled = true +light_negative = false + +[node name="Camera" type="Camera" parent="."] + +far = 100.0 +near = 0.1 +size = 7.31429 +projection = 0 +fov = 49.1343 +transform = Transform(0.685921, -0.324014, 0.651558, 0.0, 0.895396, 0.445271, -0.727676, -0.305421, 0.61417, 7.48113, 5.34367, 6.50764) diff --git a/scenes/Game/Terrain/gridmaps/wall.meshlib b/scenes/Game/Terrain/gridmaps/wall.meshlib new file mode 100644 index 0000000..62b669e Binary files /dev/null and b/scenes/Game/Terrain/gridmaps/wall.meshlib differ