diff --git a/Maps/gym.tscn b/Maps/gym.tscn index 063429c..b379b35 100644 --- a/Maps/gym.tscn +++ b/Maps/gym.tscn @@ -1,26 +1,26 @@ [gd_scene load_steps=30 format=3 uid="uid://dnmetcwb14svi"] -[ext_resource type="Material" uid="uid://chag8j6kyegq0" path="res://Packs/Kaykit-Proto/materials/floor.tres" id="1_b53sv"] -[ext_resource type="PackedScene" uid="uid://qbceryqqfoum" path="res://Packs/Kaykit-Proto/obj/dummy.tscn" id="2_40027"] -[ext_resource type="ArrayMesh" uid="uid://cii0xstywuncw" path="res://Packs/Kaykit-Proto/obj/Barrel_A.obj" id="3_afokq"] -[ext_resource type="ArrayMesh" uid="uid://ctwlo3t2cvi42" path="res://Packs/Kaykit-Proto/obj/Box_A.obj" id="4_mqp7f"] -[ext_resource type="ArrayMesh" uid="uid://dj5nhomlun7km" path="res://Packs/Kaykit-Proto/obj/Box_B.obj" id="5_ipipj"] -[ext_resource type="Texture2D" uid="uid://bsnc11pwypbny" path="res://Packs/Kaykit-Proto/obj/prototypebits_texture.png" id="6_anror"] -[ext_resource type="ArrayMesh" uid="uid://clfdc3wo1fn0c" path="res://Packs/Kaykit-Proto/obj/Cube_Prototype_Small.obj" id="7_f8cpb"] +[ext_resource type="Material" uid="uid://chag8j6kyegq0" path="res://packs/Kaykit-Proto/materials/floor.tres" id="1_b53sv"] +[ext_resource type="PackedScene" uid="uid://qbceryqqfoum" path="res://packs/Kaykit-Proto/obj/dummy.tscn" id="2_40027"] +[ext_resource type="ArrayMesh" uid="uid://cii0xstywuncw" path="res://packs/Kaykit-Proto/obj/Barrel_A.obj" id="3_afokq"] +[ext_resource type="ArrayMesh" uid="uid://ctwlo3t2cvi42" path="res://packs/Kaykit-Proto/obj/Box_A.obj" id="4_mqp7f"] +[ext_resource type="ArrayMesh" uid="uid://dj5nhomlun7km" path="res://packs/Kaykit-Proto/obj/Box_B.obj" id="5_ipipj"] +[ext_resource type="Texture2D" uid="uid://bsnc11pwypbny" path="res://packs/Kaykit-Proto/obj/prototypebits_texture.png" id="6_anror"] +[ext_resource type="ArrayMesh" uid="uid://clfdc3wo1fn0c" path="res://packs/Kaykit-Proto/obj/Cube_Prototype_Small.obj" id="7_f8cpb"] [ext_resource type="PackedScene" uid="uid://djj1fc8qm10t6" path="res://core/player.tscn" id="8_mqp7f"] [ext_resource type="VoxelGIData" uid="uid://cubwphu04tyr4" path="res://generated/gym.VoxelGI_data.res" id="9_ipipj"] -[ext_resource type="ArrayMesh" uid="uid://c0uahqnc6dx6r" path="res://Packs/Kaykit-Proto/obj/Box_C.obj" id="10_iyjuv"] -[ext_resource type="ArrayMesh" uid="uid://bde4cc1kjchsk" path="res://Packs/Kaykit-Proto/obj/Door_A_Decorated.obj" id="11_gfgny"] -[ext_resource type="ArrayMesh" uid="uid://d4n0x5r84ss2i" path="res://Packs/Kaykit-Proto/obj/Pallet_Large.obj" id="12_aw2pe"] -[ext_resource type="ArrayMesh" uid="uid://bv17be80qoceb" path="res://Packs/Kaykit-Proto/obj/Pallet_Small.obj" id="13_t4e8t"] -[ext_resource type="ArrayMesh" uid="uid://c7djvycyt44is" path="res://Packs/Kaykit-Proto/obj/Primitive_Slope.obj" id="14_86fmv"] -[ext_resource type="ArrayMesh" uid="uid://cm3on062k620s" path="res://Packs/Kaykit-Proto/obj/Primitive_Stairs.obj" id="15_v6mjl"] -[ext_resource type="ArrayMesh" uid="uid://74kfatfops1y" path="res://Packs/Kaykit-Proto/obj/Primitive_Stairs_Half.obj" id="16_kvtwj"] -[ext_resource type="ArrayMesh" uid="uid://b4mntq3ejtcuo" path="res://Packs/Kaykit-Proto/obj/Primitive_Wall.obj" id="17_26j3w"] -[ext_resource type="ArrayMesh" uid="uid://c0hlbrieabc2g" path="res://Packs/Kaykit-Proto/obj/Primitive_Window.obj" id="18_kjqju"] -[ext_resource type="ArrayMesh" uid="uid://b368b7vyej1fk" path="res://Packs/Kaykit-Proto/obj/table_medium_Decorated.obj" id="19_fypju"] -[ext_resource type="ArrayMesh" uid="uid://wcyh5hwirci" path="res://Packs/Kaykit-Proto/obj/Wall_Doorway.obj" id="20_j11kn"] -[ext_resource type="ArrayMesh" uid="uid://di584vn1afti7" path="res://Packs/Kaykit-Proto/obj/Primitive_Floor.obj" id="21_unwmg"] +[ext_resource type="ArrayMesh" uid="uid://c0uahqnc6dx6r" path="res://packs/Kaykit-Proto/obj/Box_C.obj" id="10_iyjuv"] +[ext_resource type="ArrayMesh" uid="uid://bde4cc1kjchsk" path="res://packs/Kaykit-Proto/obj/Door_A_Decorated.obj" id="11_gfgny"] +[ext_resource type="ArrayMesh" uid="uid://d4n0x5r84ss2i" path="res://packs/Kaykit-Proto/obj/Pallet_Large.obj" id="12_aw2pe"] +[ext_resource type="ArrayMesh" uid="uid://bv17be80qoceb" path="res://packs/Kaykit-Proto/obj/Pallet_Small.obj" id="13_t4e8t"] +[ext_resource type="ArrayMesh" uid="uid://c7djvycyt44is" path="res://packs/Kaykit-Proto/obj/Primitive_Slope.obj" id="14_86fmv"] +[ext_resource type="ArrayMesh" uid="uid://cm3on062k620s" path="res://packs/Kaykit-Proto/obj/Primitive_Stairs.obj" id="15_v6mjl"] +[ext_resource type="ArrayMesh" uid="uid://74kfatfops1y" path="res://packs/Kaykit-Proto/obj/Primitive_Stairs_Half.obj" id="16_kvtwj"] +[ext_resource type="ArrayMesh" uid="uid://b4mntq3ejtcuo" path="res://packs/Kaykit-Proto/obj/Primitive_Wall.obj" id="17_26j3w"] +[ext_resource type="ArrayMesh" uid="uid://c0hlbrieabc2g" path="res://packs/Kaykit-Proto/obj/Primitive_Window.obj" id="18_kjqju"] +[ext_resource type="ArrayMesh" uid="uid://b368b7vyej1fk" path="res://packs/Kaykit-Proto/obj/table_medium_Decorated.obj" id="19_fypju"] +[ext_resource type="ArrayMesh" uid="uid://wcyh5hwirci" path="res://packs/Kaykit-Proto/obj/Wall_Doorway.obj" id="20_j11kn"] +[ext_resource type="ArrayMesh" uid="uid://di584vn1afti7" path="res://packs/Kaykit-Proto/obj/Primitive_Floor.obj" id="21_unwmg"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_vkxe1"] sky_top_color = Color(0.299981, 0.701967, 0.743086, 1) @@ -36,6 +36,7 @@ sky_material = SubResource("ProceduralSkyMaterial_vkxe1") resource_name = "gym_env" background_mode = 2 sky = SubResource("Sky_607fo") +ambient_light_sky_contribution = 0.26 tonemap_mode = 2 ssao_enabled = true glow_enabled = true @@ -71,7 +72,7 @@ points = PackedVector3Array(-0.953959, 0.0770701, -0.923111, 0.995482, 1.90217, environment = SubResource("Environment_lefpg") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.866025, -0.433013, 0.25, 0, 0.5, 0.866025, -0.5, 0.75, -0.433013, 0, 0, 0) +transform = Transform3D(-0.8660253, -0.4330129, 0.2500001, 0, 0.49999994, 0.86602545, -0.50000024, 0.74999994, -0.43301257, 0, 11.697451, 0) light_energy = 1.3 shadow_enabled = true directional_shadow_max_distance = 500.0 diff --git a/Maps/gym.tscn.depren b/Maps/gym.tscn.depren index 94e857d..b32747e 100644 --- a/Maps/gym.tscn.depren +++ b/Maps/gym.tscn.depren @@ -7,7 +7,7 @@ [ext_resource type="ArrayMesh" uid="uid://dj5nhomlun7km" path="res://packs/Kaykit-Proto/obj/Box_B.obj" id="5_ipipj"] [ext_resource type="Texture2D" uid="uid://bsnc11pwypbny" path="res://packs/Kaykit-Proto/obj/prototypebits_texture.png" id="6_anror"] [ext_resource type="ArrayMesh" uid="uid://clfdc3wo1fn0c" path="res://packs/Kaykit-Proto/obj/Cube_Prototype_Small.obj" id="7_f8cpb"] -[ext_resource type="PackedScene" uid="uid://djj1fc8qm10t6" path="res://core/player.tscn" id="8_mqp7f"] +[ext_resource type="PackedScene" uid="uid://djj1fc8qm10t6" path="res://core/base-classes/player.tscn" id="8_mqp7f"] [ext_resource type="VoxelGIData" uid="uid://cubwphu04tyr4" path="res://generated/gym.VoxelGI_data.res" id="9_ipipj"] [ext_resource type="ArrayMesh" uid="uid://c0uahqnc6dx6r" path="res://packs/Kaykit-Proto/obj/Box_C.obj" id="10_iyjuv"] [ext_resource type="ArrayMesh" uid="uid://bde4cc1kjchsk" path="res://packs/Kaykit-Proto/obj/Door_A_Decorated.obj" id="11_gfgny"] @@ -36,6 +36,7 @@ sky_material = SubResource("ProceduralSkyMaterial_vkxe1") resource_name = "gym_env" background_mode = 2 sky = SubResource("Sky_607fo") +ambient_light_sky_contribution = 0.26 tonemap_mode = 2 ssao_enabled = true glow_enabled = true @@ -71,7 +72,7 @@ points = PackedVector3Array(-0.953959, 0.0770701, -0.923111, 0.995482, 1.90217, environment = SubResource("Environment_lefpg") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] -transform = Transform3D(-0.866025, -0.433013, 0.25, 0, 0.5, 0.866025, -0.5, 0.75, -0.433013, 0, 0, 0) +transform = Transform3D(-0.8660253, -0.4330129, 0.2500001, 0, 0.49999994, 0.86602545, -0.50000024, 0.74999994, -0.43301257, 0, 11.697451, 0) light_energy = 1.3 shadow_enabled = true directional_shadow_max_distance = 500.0 diff --git a/Core/player.tscn b/core/base-classes/player.tscn similarity index 93% rename from Core/player.tscn rename to core/base-classes/player.tscn index e7d79f3..bd756e3 100644 --- a/Core/player.tscn +++ b/core/base-classes/player.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://djj1fc8qm10t6"] -[ext_resource type="Script" uid="uid://c23s1syo7wjm8" path="res://core/player.gd" id="1_e571r"] -[ext_resource type="Script" uid="uid://d2f3kt810ncsa" path="res://core/cursor_behaviour.gd" id="2_ipmo0"] +[ext_resource type="Script" uid="uid://c23s1syo7wjm8" path="res://core/scripts/player.gd" id="1_e571r"] +[ext_resource type="Script" uid="uid://d2f3kt810ncsa" path="res://core/scripts/cursor_behaviour.gd" id="2_ipmo0"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e571r"] blend_mode = 1 diff --git a/Core/cursor_behaviour.gd b/core/scripts/cursor_behaviour.gd similarity index 100% rename from Core/cursor_behaviour.gd rename to core/scripts/cursor_behaviour.gd diff --git a/Core/cursor_behaviour.gd.uid b/core/scripts/cursor_behaviour.gd.uid similarity index 100% rename from Core/cursor_behaviour.gd.uid rename to core/scripts/cursor_behaviour.gd.uid diff --git a/Core/player.gd b/core/scripts/player.gd similarity index 100% rename from Core/player.gd rename to core/scripts/player.gd diff --git a/Core/player.gd.uid b/core/scripts/player.gd.uid similarity index 100% rename from Core/player.gd.uid rename to core/scripts/player.gd.uid diff --git a/generated/gym.VoxelGI_data.res b/generated/gym.VoxelGI_data.res index f029fc2..0882818 100644 Binary files a/generated/gym.VoxelGI_data.res and b/generated/gym.VoxelGI_data.res differ diff --git a/project.godot b/project.godot index 9e8e7e8..01c1dfa 100644 --- a/project.godot +++ b/project.godot @@ -19,6 +19,8 @@ config/icon="res://icon.svg" [display] +window/size/mode=4 +window/size/resizable=false mouse_cursor/custom_image="uid://dp4ed16rb1754" mouse_cursor/custom_image_hotspot=Vector2(14, 2)