diff --git a/splunk/addons/freecam_3D/freecam.gd b/splunk/addons/freecam_3D/freecam.gd index b019470..1c92c7b 100644 --- a/splunk/addons/freecam_3D/freecam.gd +++ b/splunk/addons/freecam_3D/freecam.gd @@ -142,4 +142,3 @@ func _add_key_input_action(name: String, key: Key) -> void: InputMap.add_action(name) InputMap.action_add_event(name, ev) - diff --git a/splunk/levels/lobby-scene/lobby-terrain.blend b/splunk/levels/lobby-scene/lobby-terrain.blend new file mode 100644 index 0000000..f1dd138 Binary files /dev/null and b/splunk/levels/lobby-scene/lobby-terrain.blend differ diff --git a/splunk/levels/lobby-scene/lobby-terrain.blend.import b/splunk/levels/lobby-scene/lobby-terrain.blend.import new file mode 100644 index 0000000..ee1fb85 --- /dev/null +++ b/splunk/levels/lobby-scene/lobby-terrain.blend.import @@ -0,0 +1,60 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://b5xb0fsfpn7r3" +path="res://.godot/imported/lobby-terrain.blend-1020d7f6f6a9a581e1b1682b5ac8d125.scn" + +[deps] + +source_file="res://levels/lobby-scene/lobby-terrain.blend" +dest_files=["res://.godot/imported/lobby-terrain.blend-1020d7f6f6a9a581e1b1682b5ac8d125.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +_subresources={ +"materials": { +"Material.001": { +"use_external/enabled": true, +"use_external/path": "" +} +} +} +blender/nodes/visible=0 +blender/nodes/active_collection_only=false +blender/nodes/punctual_lights=true +blender/nodes/cameras=true +blender/nodes/custom_properties=true +blender/nodes/modifiers=1 +blender/meshes/colors=false +blender/meshes/uvs=true +blender/meshes/normals=true +blender/meshes/export_geometry_nodes_instances=false +blender/meshes/tangents=true +blender/meshes/skins=2 +blender/meshes/export_bones_deforming_mesh_only=false +blender/materials/unpack_enabled=true +blender/materials/export_materials=1 +blender/animation/limit_playback=true +blender/animation/always_sample=true +blender/animation/group_tracks=true diff --git a/splunk/levels/lobby-scene/lobby-terrain.blend1 b/splunk/levels/lobby-scene/lobby-terrain.blend1 new file mode 100644 index 0000000..c48d584 Binary files /dev/null and b/splunk/levels/lobby-scene/lobby-terrain.blend1 differ diff --git a/splunk/levels/lobby-scene/lobby.tscn b/splunk/levels/lobby-scene/lobby.tscn index 4cddcfc..72e1d05 100644 --- a/splunk/levels/lobby-scene/lobby.tscn +++ b/splunk/levels/lobby-scene/lobby.tscn @@ -1,32 +1,30 @@ -[gd_scene load_steps=6 format=3 uid="uid://bj52j4ew2lfr6"] +[gd_scene load_steps=7 format=3 uid="uid://bj52j4ew2lfr6"] [ext_resource type="PackedScene" uid="uid://5vggmy1srgxb" path="res://tools/human-height-reference.tscn" id="1_yyu2g"] [ext_resource type="PackedScene" uid="uid://daq1prwl8aaia" path="res://tools/debug.tscn" id="2_72fkp"] +[ext_resource type="PackedScene" uid="uid://b5xb0fsfpn7r3" path="res://levels/lobby-scene/lobby-terrain.blend" id="3_f73ky"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_f73ky"] + +[sub_resource type="Sky" id="Sky_0aw1h"] +sky_material = SubResource("ProceduralSkyMaterial_f73ky") [sub_resource type="Environment" id="Environment_72fkp"] background_mode = 2 - -[sub_resource type="PlaneMesh" id="PlaneMesh_fnh6i"] -size = Vector2(20, 20) - -[sub_resource type="BoxShape3D" id="BoxShape3D_yyu2g"] -size = Vector3(20, 0.4, 20) +sky = SubResource("Sky_0aw1h") [node name="Lobby" type="Node3D"] [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_72fkp") -[node name="TempFloor" type="StaticBody3D" parent="."] - -[node name="MeshInstance3D" type="MeshInstance3D" parent="TempFloor"] -mesh = SubResource("PlaneMesh_fnh6i") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="TempFloor"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.2, 0) -shape = SubResource("BoxShape3D_yyu2g") +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="WorldEnvironment"] +transform = Transform3D(0.915754, 0.29917, -0.268128, 0.115653, 0.442845, 0.889108, 0.384733, -0.845214, 0.370937, 0, 0, 0) +shadow_enabled = true [node name="Human-height-reference" parent="." instance=ExtResource("1_yyu2g")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.33741, 0.953, -5.00694) [node name="Debug" parent="." instance=ExtResource("2_72fkp")] + +[node name="lobby-terrain" parent="." instance=ExtResource("3_f73ky")] diff --git a/splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg b/splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg new file mode 100644 index 0000000..e39dab1 Binary files /dev/null and b/splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg differ diff --git a/splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg.import b/splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg.import new file mode 100644 index 0000000..5e50691 --- /dev/null +++ b/splunk/levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dxeibfk11lodj" +path.s3tc="res://.godot/imported/rocky_terrain_02_diff_1k.jpg-a0faf17242828e040608373f3cdaba10.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://levels/lobby-scene/textures/rocky_terrain_02_diff_1k.jpg" +dest_files=["res://.godot/imported/rocky_terrain_02_diff_1k.jpg-a0faf17242828e040608373f3cdaba10.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png b/splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png new file mode 100644 index 0000000..46b56ab Binary files /dev/null and b/splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png differ diff --git a/splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png.import b/splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png.import new file mode 100644 index 0000000..2ef703c --- /dev/null +++ b/splunk/levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c31rlthxjvvbp" +path="res://.godot/imported/rocky_terrain_02_spec_1k.png-79c9d42463680422048e46f05a653dfb.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://levels/lobby-scene/textures/rocky_terrain_02_spec_1k.png" +dest_files=["res://.godot/imported/rocky_terrain_02_spec_1k.png-79c9d42463680422048e46f05a653dfb.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1