diff --git a/addons/instant-realistic-light/light_scene.tscn b/addons/instant-realistic-light/light_scene.tscn deleted file mode 100644 index 9c6b231..0000000 --- a/addons/instant-realistic-light/light_scene.tscn +++ /dev/null @@ -1,48 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://bs2jm62cmkbrk"] - -[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_gn88m"] -ground_color = Color(0, 0, 0, 1) - -[sub_resource type="Sky" id="Sky_tyhie"] -sky_material = SubResource("PhysicalSkyMaterial_gn88m") -radiance_size = 2 - -[sub_resource type="Environment" id="Environment_f8w8m"] -background_mode = 2 -background_intensity = 100000.0 -sky = SubResource("Sky_tyhie") -tonemap_mode = 2 -tonemap_white = 8.0 -ssao_enabled = true -ssao_detail = 2.0 -sdfgi_enabled = true -sdfgi_bounce_feedback = 0.9 -glow_enabled = true -glow_normalized = true -glow_bloom = 0.2 -volumetric_fog_enabled = true -volumetric_fog_density = 0.01 -volumetric_fog_gi_inject = 1.14 -volumetric_fog_anisotropy = 0.7 -volumetric_fog_sky_affect = 0.295 -adjustment_saturation = 1.17 - -[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_qo5hu"] -exposure_multiplier = 3.069 -auto_exposure_scale = 0.22 -auto_exposure_speed = 0.8 -dof_blur_far_distance = 1.44 -dof_blur_near_distance = 0.01 -auto_exposure_min_sensitivity = 8.01 - -[node name="WorldEnvironment" type="WorldEnvironment"] -environment = SubResource("Environment_f8w8m") -camera_attributes = SubResource("CameraAttributesPractical_qo5hu") - -[node name="Sun3" type="DirectionalLight3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.605197, 0.796076, 0, -0.796076, 0.605197, -4.86868, 8.33126, 2.18251) -shadow_enabled = true - -[node name="ReflectionProbe" type="ReflectionProbe" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 49.8991, 25.834, -30.0061) -size = Vector3(10000, 10000, 1000) diff --git a/addons/instant-realistic-light/plugin.cfg b/addons/instant-realistic-light/plugin.cfg deleted file mode 100644 index e738734..0000000 --- a/addons/instant-realistic-light/plugin.cfg +++ /dev/null @@ -1,7 +0,0 @@ -[plugin] - -name="Instant Realistic Light" -description="A very simple Godot Engine Plugin to get realistic lights on your 3D Scene" -author="soykhaler" -version="1.0" -script="plugin.gd" diff --git a/addons/instant-realistic-light/plugin.gd b/addons/instant-realistic-light/plugin.gd deleted file mode 100644 index 7d252a4..0000000 --- a/addons/instant-realistic-light/plugin.gd +++ /dev/null @@ -1,19 +0,0 @@ -@tool -extends EditorPlugin - -@onready var temp_scene = preload("res://addons/instant-realistic-light/light_scene.tscn") -var button = Button.new() - -func _enter_tree(): - button.text = "Instant Realistic Light" - button.connect("pressed", Callable(self, "_on_button_pressed")) - add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU, button) - -func _exit_tree(): - remove_control_from_container(CONTAINER_SPATIAL_EDITOR_MENU, button) - button.free() - -func _on_button_pressed(): - var scene = temp_scene.instantiate() - get_tree().get_edited_scene_root().add_child(scene) - scene.set_owner(get_tree().get_edited_scene_root()) diff --git a/camera_attributes.tres b/camera_attributes.tres new file mode 100644 index 0000000..f450161 --- /dev/null +++ b/camera_attributes.tres @@ -0,0 +1,9 @@ +[gd_resource type="CameraAttributesPractical" format=3 uid="uid://cjryeyord6xdd"] + +[resource] +exposure_multiplier = 1.5 +auto_exposure_scale = 0.22 +auto_exposure_speed = 0.8 +dof_blur_far_distance = 1.44 +dof_blur_near_distance = 0.01 +auto_exposure_min_sensitivity = 8.01 diff --git a/icon.png b/images/icon.png similarity index 100% rename from icon.png rename to images/icon.png diff --git a/icon.png.import b/images/icon.png.import similarity index 73% rename from icon.png.import rename to images/icon.png.import index 1949c84..56baf36 100644 --- a/icon.png.import +++ b/images/icon.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cunvglaug2rlt" -path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" +path="res://.godot/imported/icon.png-b9450fb2459f5b277908511db3d050dd.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://icon.png" -dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"] +source_file="res://images/icon.png" +dest_files=["res://.godot/imported/icon.png-b9450fb2459f5b277908511db3d050dd.ctex"] [params] diff --git a/icon.svg b/images/icon.svg similarity index 100% rename from icon.svg rename to images/icon.svg diff --git a/icon.svg.import b/images/icon.svg.import similarity index 76% rename from icon.svg.import rename to images/icon.svg.import index 10aefc8..25dad8a 100644 --- a/icon.svg.import +++ b/images/icon.svg.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://brdoqvapyya5b" -path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex" +path="res://.godot/imported/icon.svg-40d11009b022ae281956dc38e8f8d85e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://icon.svg" -dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"] +source_file="res://images/icon.svg" +dest_files=["res://.godot/imported/icon.svg-40d11009b022ae281956dc38e8f8d85e.ctex"] [params] diff --git a/splash.png b/images/splash.png similarity index 100% rename from splash.png rename to images/splash.png diff --git a/splash.png.import b/images/splash.png.import similarity index 73% rename from splash.png.import rename to images/splash.png.import index 1928c67..7e09f65 100644 --- a/splash.png.import +++ b/images/splash.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dkyaix1edhf8c" -path="res://.godot/imported/splash.png-929ed8a00b89ba36c51789452f874c77.ctex" +path="res://.godot/imported/splash.png-7d889cb59307e5eb1d06763e99321ffe.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://splash.png" -dest_files=["res://.godot/imported/splash.png-929ed8a00b89ba36c51789452f874c77.ctex"] +source_file="res://images/splash.png" +dest_files=["res://.godot/imported/splash.png-7d889cb59307e5eb1d06763e99321ffe.ctex"] [params] diff --git a/images/traditional-dark.png b/images/traditional-dark.png new file mode 100644 index 0000000..d181b3d Binary files /dev/null and b/images/traditional-dark.png differ diff --git a/images/traditional-dark.png.import b/images/traditional-dark.png.import new file mode 100644 index 0000000..9f74120 --- /dev/null +++ b/images/traditional-dark.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://biofeaj17qryh" +path="res://.godot/imported/traditional-dark.png-7ffe52df25251ac79d79a06e22b7e283.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/traditional-dark.png" +dest_files=["res://.godot/imported/traditional-dark.png-7ffe52df25251ac79d79a06e22b7e283.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 diff --git a/models/dungeon/torch.bin b/models/dungeon/torch.bin new file mode 100644 index 0000000..3f27a88 Binary files /dev/null and b/models/dungeon/torch.bin differ diff --git a/models/dungeon/torch.gltf b/models/dungeon/torch.gltf new file mode 100644 index 0000000..b9119a6 --- /dev/null +++ b/models/dungeon/torch.gltf @@ -0,0 +1,136 @@ +{ + "asset" : { + "generator" : "Khronos glTF Blender I/O v3.4.50", + "version" : "2.0" + }, + "scene" : 0, + "scenes" : [ + { + "name" : "Scene", + "nodes" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "torch" + } + ], + "materials" : [ + { + "name" : "texture", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.44999998807907104 + } + } + ], + "meshes" : [ + { + "name" : "torch", + "primitives" : [ + { + "attributes" : { + "POSITION" : 0, + "TEXCOORD_0" : 1, + "NORMAL" : 2 + }, + "indices" : 3, + "material" : 0 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/png", + "name" : "dungeon_texture", + "uri" : "dungeon_texture.png" + } + ], + "accessors" : [ + { + "bufferView" : 0, + "componentType" : 5126, + "count" : 288, + "max" : [ + 0.2751416862010956, + 0.6465588808059692, + 0.2751415967941284 + ], + "min" : [ + -0.2751416563987732, + -0.395045667886734, + -0.2751416862010956 + ], + "type" : "VEC3" + }, + { + "bufferView" : 1, + "componentType" : 5126, + "count" : 288, + "type" : "VEC2" + }, + { + "bufferView" : 2, + "componentType" : 5126, + "count" : 288, + "type" : "VEC3" + }, + { + "bufferView" : 3, + "componentType" : 5123, + "count" : 648, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 3456, + "byteOffset" : 0, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 2304, + "byteOffset" : 3456, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 3456, + "byteOffset" : 5760, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 1296, + "byteOffset" : 9216, + "target" : 34963 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 10512, + "uri" : "torch.bin" + } + ] +} diff --git a/models/dungeon/torch.gltf.import b/models/dungeon/torch.gltf.import new file mode 100644 index 0000000..8de873f --- /dev/null +++ b/models/dungeon/torch.gltf.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dg0s5732cjj84" +path="res://.godot/imported/torch.gltf-72ba7965de735d1f1872fb061f1edc2c.scn" + +[deps] + +source_file="res://models/dungeon/torch.gltf" +dest_files=["res://.godot/imported/torch.gltf-72ba7965de735d1f1872fb061f1edc2c.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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={ +"nodes": { +"PATH:torch": { +"generate/physics": true +} +} +} +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/models/dungeon/torch_mounted.bin b/models/dungeon/torch_mounted.bin new file mode 100644 index 0000000..340d963 Binary files /dev/null and b/models/dungeon/torch_mounted.bin differ diff --git a/models/dungeon/torch_mounted.gltf b/models/dungeon/torch_mounted.gltf new file mode 100644 index 0000000..39d1f2a --- /dev/null +++ b/models/dungeon/torch_mounted.gltf @@ -0,0 +1,136 @@ +{ + "asset" : { + "generator" : "Khronos glTF Blender I/O v3.4.50", + "version" : "2.0" + }, + "scene" : 0, + "scenes" : [ + { + "name" : "Scene", + "nodes" : [ + 0 + ] + } + ], + "nodes" : [ + { + "mesh" : 0, + "name" : "torch_mounted" + } + ], + "materials" : [ + { + "name" : "texture", + "pbrMetallicRoughness" : { + "baseColorTexture" : { + "index" : 0 + }, + "metallicFactor" : 0, + "roughnessFactor" : 0.44999998807907104 + } + } + ], + "meshes" : [ + { + "name" : "torch_mounted", + "primitives" : [ + { + "attributes" : { + "POSITION" : 0, + "TEXCOORD_0" : 1, + "NORMAL" : 2 + }, + "indices" : 3, + "material" : 0 + } + ] + } + ], + "textures" : [ + { + "sampler" : 0, + "source" : 0 + } + ], + "images" : [ + { + "mimeType" : "image/png", + "name" : "dungeon_texture", + "uri" : "dungeon_texture.png" + } + ], + "accessors" : [ + { + "bufferView" : 0, + "componentType" : 5126, + "count" : 391, + "max" : [ + 0.2751467823982239, + 0.6816596984863281, + 0.615840494632721 + ], + "min" : [ + -0.2751365005970001, + -0.3808070421218872, + -4.093442029784455e-09 + ], + "type" : "VEC3" + }, + { + "bufferView" : 1, + "componentType" : 5126, + "count" : 391, + "type" : "VEC2" + }, + { + "bufferView" : 2, + "componentType" : 5126, + "count" : 391, + "type" : "VEC3" + }, + { + "bufferView" : 3, + "componentType" : 5123, + "count" : 834, + "type" : "SCALAR" + } + ], + "bufferViews" : [ + { + "buffer" : 0, + "byteLength" : 4692, + "byteOffset" : 0, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 3128, + "byteOffset" : 4692, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 4692, + "byteOffset" : 7820, + "target" : 34962 + }, + { + "buffer" : 0, + "byteLength" : 1668, + "byteOffset" : 12512, + "target" : 34963 + } + ], + "samplers" : [ + { + "magFilter" : 9729, + "minFilter" : 9987 + } + ], + "buffers" : [ + { + "byteLength" : 14180, + "uri" : "torch_mounted.bin" + } + ] +} diff --git a/models/dungeon/torch_mounted.gltf.import b/models/dungeon/torch_mounted.gltf.import new file mode 100644 index 0000000..95bf192 --- /dev/null +++ b/models/dungeon/torch_mounted.gltf.import @@ -0,0 +1,45 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://h8sw1wyrq8ik" +path="res://.godot/imported/torch_mounted.gltf-8ad0966e1facf1f113a8220f50c9485a.scn" + +[deps] + +source_file="res://models/dungeon/torch_mounted.gltf" +dest_files=["res://.godot/imported/torch_mounted.gltf-8ad0966e1facf1f113a8220f50c9485a.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +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={ +"nodes": { +"PATH:torch_mounted": { +"generate/physics": true +} +} +} +fbx/importer=0 +fbx/allow_geometry_helper_nodes=false +fbx/embedded_image_handling=1 +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/project.godot b/project.godot index ced8675..2fa1cbd 100644 --- a/project.godot +++ b/project.godot @@ -10,14 +10,15 @@ config_version=5 [application] -config/name="SchildDerStärke" +config/name="Schild der Stärke" run/main_scene="res://scenes/game.tscn" config/features=PackedStringArray("4.3", "Forward Plus") -config/icon="res://icon.svg" +boot_splash/image="res://images/traditional-dark.png" +config/icon="res://images/icon.svg" -[editor_plugins] +[display] -enabled=PackedStringArray("res://addons/instant-realistic-light/plugin.cfg") +window/size/mode=3 [input] diff --git a/scenes/game.tscn b/scenes/game.tscn index 28803a9..f1e7ba2 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,97 +1,83 @@ -[gd_scene load_steps=11 format=3 uid="uid://b1i4juq2u7pwk"] +[gd_scene load_steps=9 format=3 uid="uid://b1i4juq2u7pwk"] -[ext_resource type="PackedScene" uid="uid://bs2jm62cmkbrk" path="res://addons/instant-realistic-light/light_scene.tscn" id="1_88gpj"] +[ext_resource type="Environment" uid="uid://d31wkt76cft8k" path="res://world_environment.tres" id="1_03qki"] [ext_resource type="Script" path="res://scripts/game_manager.gd" id="1_kvi4c"] +[ext_resource type="CameraAttributesPractical" uid="uid://cjryeyord6xdd" path="res://camera_attributes.tres" id="2_0dc62"] [ext_resource type="PackedScene" uid="uid://cy23boc8vgagv" path="res://scenes/floor.tscn" id="2_duogt"] [ext_resource type="PackedScene" uid="uid://7o1425mnc60b" path="res://scenes/box.tscn" id="3_vnkom"] [ext_resource type="PackedScene" uid="uid://b8ko1hpclkf54" path="res://models/dungeon/wall.gltf" id="6_m45s7"] [ext_resource type="PackedScene" uid="uid://dtehhqrqtplan" path="res://scenes/knight.tscn" id="7_iwqlu"] - -[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_gn88m"] -ground_color = Color(0, 0, 0, 1) - -[sub_resource type="Sky" id="Sky_tyhie"] -sky_material = SubResource("PhysicalSkyMaterial_gn88m") -radiance_size = 2 - -[sub_resource type="Environment" id="Environment_f8w8m"] -background_mode = 2 -background_intensity = 100000.0 -sky = SubResource("Sky_tyhie") -tonemap_mode = 3 -tonemap_white = 8.0 -ssao_enabled = true -ssao_detail = 2.0 -sdfgi_enabled = true -sdfgi_bounce_feedback = 0.9 -glow_enabled = true -glow_normalized = true -glow_bloom = 0.2 -volumetric_fog_enabled = true -volumetric_fog_density = 0.01 -volumetric_fog_gi_inject = 1.14 -volumetric_fog_anisotropy = 0.7 -volumetric_fog_sky_affect = 0.295 -adjustment_saturation = 1.17 - -[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_qo5hu"] -exposure_multiplier = 3.069 -auto_exposure_scale = 0.22 -auto_exposure_speed = 0.8 -dof_blur_far_distance = 1.44 -dof_blur_near_distance = 0.01 -auto_exposure_min_sensitivity = 8.01 +[ext_resource type="PackedScene" uid="uid://dif2kboftacra" path="res://scenes/torch_mounted.tscn" id="8_8d1n4"] [node name="Game" type="Node3D"] -[node name="WorldEnvironment" parent="." instance=ExtResource("1_88gpj")] -environment = SubResource("Environment_f8w8m") -camera_attributes = SubResource("CameraAttributesPractical_qo5hu") +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = ExtResource("1_03qki") +camera_attributes = ExtResource("2_0dc62") + +[node name="Sun" type="DirectionalLight3D" parent="WorldEnvironment"] +transform = Transform3D(1, 0, 0, 0, 0.605197, 0.796076, 0, -0.796076, 0.605197, -4.86868, 8.33126, 2.18251) +shadow_enabled = true + +[node name="ReflectionProbe" type="ReflectionProbe" parent="WorldEnvironment"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 49.8991, 25.834, -30.0061) +size = Vector3(10000, 10000, 1000) [node name="GameManager" type="Node3D" parent="."] script = ExtResource("1_kvi4c") -[node name="Floor" parent="." instance=ExtResource("2_duogt")] +[node name="Knight" parent="." instance=ExtResource("7_iwqlu")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 15) + +[node name="Level" type="Node3D" parent="."] -[node name="Boxes" type="Node3D" parent="."] +[node name="torch_mounted" parent="Level" instance=ExtResource("8_8d1n4")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 2, 0.246556) -[node name="Box" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Boxes" type="Node3D" parent="Level"] -[node name="Box2" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box" parent="Level/Boxes" instance=ExtResource("3_vnkom")] + +[node name="Box2" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 0.5, -3) -[node name="Box3" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box3" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 0.5, -12) -[node name="Box4" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box4" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1.5, -12) -[node name="Box5" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box5" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11, 0.5, -6) -[node name="Box6" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box6" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0.5, 1) -[node name="Box7" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box7" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0.5, 6) -[node name="Box8" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box8" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.5, 6) -[node name="Box9" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box9" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1.5, 6) -[node name="Box10" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box10" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1.5, 6) -[node name="Box11" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box11" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0.5, 6) -[node name="Box12" parent="Boxes" instance=ExtResource("3_vnkom")] +[node name="Box12" parent="Level/Boxes" instance=ExtResource("3_vnkom")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 2.5, 6) -[node name="wall2" parent="." instance=ExtResource("6_m45s7")] +[node name="Floor" parent="Level" instance=ExtResource("2_duogt")] + +[node name="Wall" parent="Level" instance=ExtResource("6_m45s7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, 0) -[node name="Knight" parent="." instance=ExtResource("7_iwqlu")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 12) +[node name="Wall2" parent="Level" instance=ExtResource("6_m45s7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, 0) + +[node name="Wall3" parent="Level" instance=ExtResource("6_m45s7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14, 0, 0) diff --git a/scenes/knight.tscn b/scenes/knight.tscn index 37595c8..ac812a5 100644 --- a/scenes/knight.tscn +++ b/scenes/knight.tscn @@ -137,61 +137,61 @@ script = ExtResource("2_51yjr") [node name="Skeleton3D" parent="Rig" index="0"] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) -bones/0/position = Vector3(0, 2.1663e-05, 0) +bones/0/position = Vector3(0, 0.000155538, 0) bones/0/rotation = Quaternion(-9.45752e-12, -0.000274707, -1.63809e-11, 1) -bones/1/position = Vector3(1.38548e-19, 0.378427, 6.55276e-19) -bones/1/rotation = Quaternion(0.000383502, 0.042994, 2.00601e-05, 0.999075) -bones/2/rotation = Quaternion(0.000452998, -2.03956e-05, -1.85667e-05, 1) -bones/3/rotation = Quaternion(0.000177651, 7.96786e-05, -4.86315e-05, 1) -bones/4/position = Vector3(0.211946, 0.134064, -0.000173846) -bones/4/rotation = Quaternion(-0.556342, -0.0582373, -0.637535, 0.529756) +bones/1/position = Vector3(1.34677e-20, 0.391729, -9.32372e-19) +bones/1/rotation = Quaternion(0.000373657, 0.0429939, 2.04897e-05, 0.999075) +bones/2/rotation = Quaternion(0.000448099, 0.000440358, -5.66009e-05, 1) +bones/3/rotation = Quaternion(0.000169611, 8.66795e-05, -1.25757e-05, 1) +bones/4/position = Vector3(0.211993, 0.134088, -0.000186373) +bones/4/rotation = Quaternion(-0.560737, -0.0613846, -0.643158, 0.517836) bones/4/scale = Vector3(0.999999, 0.999999, 1) -bones/5/rotation = Quaternion(2.20756e-08, -7.0742e-08, -0.511186, 0.85947) +bones/5/rotation = Quaternion(3.77598e-09, -4.59e-08, -0.495317, 0.868713) bones/6/rotation = Quaternion(-9.73784e-11, -2.98437e-10, 0.0266581, 0.999645) bones/6/scale = Vector3(1, 1, 1) -bones/7/rotation = Quaternion(-0.320629, -0.334398, 0.148689, 0.873652) +bones/7/rotation = Quaternion(-0.320059, -0.326101, 0.14495, 0.877616) bones/8/position = Vector3(4.03522e-10, 0.0961252, -0.0575) -bones/8/rotation = Quaternion(0.000250121, 0.000607424, -0.704675, 0.70953) +bones/8/rotation = Quaternion(-0.000205364, 0.000181415, -0.706284, 0.707929) bones/8/scale = Vector3(1, 1, 1) -bones/14/position = Vector3(-0.211969, 0.134076, -0.000180054) -bones/14/rotation = Quaternion(-0.614423, 0.0783667, 0.612886, 0.490625) +bones/14/position = Vector3(-0.211923, 0.134053, -0.000167527) +bones/14/rotation = Quaternion(-0.619012, 0.0806966, 0.61666, 0.479627) bones/14/scale = Vector3(0.999999, 0.999999, 1) -bones/15/rotation = Quaternion(9.35424e-09, 5.98391e-08, 0.533925, 0.845532) +bones/15/rotation = Quaternion(2.91882e-08, 4.7328e-08, 0.518353, 0.855166) bones/16/rotation = Quaternion(-9.73784e-11, 2.98437e-10, -0.0266581, 0.999645) bones/16/scale = Vector3(1, 1, 1) -bones/17/rotation = Quaternion(-0.319219, 0.310374, -0.230697, 0.865185) +bones/17/rotation = Quaternion(-0.318316, 0.301555, -0.225984, 0.869868) bones/18/position = Vector3(-1.54781e-08, 0.0961251, -0.0575) -bones/18/rotation = Quaternion(0.00131889, 0.00156994, 0.704898, 0.709306) +bones/18/rotation = Quaternion(-9.29263e-05, -7.82745e-05, 0.706372, 0.707841) bones/18/scale = Vector3(1, 1, 1) -bones/21/rotation = Quaternion(-0.000503325, -0.0312134, -5.10248e-05, 0.999513) -bones/24/position = Vector3(0.170945, 0.113587, 0.00010732) -bones/24/rotation = Quaternion(0.991548, 0.0827401, 0.0769409, 0.0637692) +bones/21/rotation = Quaternion(-0.000509593, -0.0315664, -2.95604e-05, 0.999502) +bones/24/position = Vector3(0.170945, 0.113587, 0.000356948) +bones/24/rotation = Quaternion(0.993728, 0.0832267, 0.0734252, 0.0136577) bones/24/scale = Vector3(1, 1, 1) -bones/25/rotation = Quaternion(0.333379, 5.82166e-08, -2.33173e-07, 0.942793) -bones/26/rotation = Quaternion(-0.587661, -0.203651, 0.0648365, 0.78037) -bones/27/rotation = Quaternion(-9.82308e-09, 0.920355, -0.391084, 7.82749e-08) +bones/25/rotation = Quaternion(0.198424, 6.32707e-08, -1.31878e-07, 0.980116) +bones/26/rotation = Quaternion(-0.51935, -0.208609, 0.0440003, 0.827539) +bones/27/rotation = Quaternion(-9.82177e-09, 0.920355, -0.391084, 7.82713e-08) bones/27/scale = Vector3(1, 1, 1) -bones/28/position = Vector3(-0.170945, 0.113587, -0.000107288) -bones/28/rotation = Quaternion(0.993903, -0.0318014, 0.0302819, 0.101138) +bones/28/position = Vector3(-0.170945, 0.113587, -0.000356917) +bones/28/rotation = Quaternion(0.99728, -0.0294109, 0.0313871, 0.0598505) bones/28/scale = Vector3(1, 1, 1) -bones/29/rotation = Quaternion(0.381893, -6.09202e-08, 2.67048e-07, 0.924206) -bones/30/rotation = Quaternion(-0.616546, 0.113025, -0.0178288, 0.77896) -bones/31/rotation = Quaternion(3.02642e-08, 0.92022, -0.391402, -6.95245e-08) +bones/29/rotation = Quaternion(0.278069, -6.31705e-08, 1.95848e-07, 0.960561) +bones/30/rotation = Quaternion(-0.55905, 0.114066, -0.00893948, 0.821201) +bones/31/rotation = Quaternion(3.0361e-08, 0.920355, -0.391084, -6.95391e-08) bones/31/scale = Vector3(1, 1, 1) -bones/32/position = Vector3(0.170945, 0.292641, 0.576143) +bones/32/position = Vector3(0.170945, 0.292336, 0.575838) bones/32/rotation = Quaternion(0.707107, -2.29302e-07, -4.60552e-08, 0.707107) -bones/33/position = Vector3(0.202061, 0.0260724, 0.204346) -bones/33/rotation = Quaternion(-0.705334, -7.06822e-08, -7.03776e-08, 0.708875) +bones/33/position = Vector3(0.202061, 0.0271045, 0.206623) +bones/33/rotation = Quaternion(-0.708211, -7.04067e-08, -7.06491e-08, 0.706001) bones/34/position = Vector3(1.94503e-08, 0.362833, -2.42861e-15) bones/34/rotation = Quaternion(9.6269e-09, 1.76582e-09, 0.98583, -0.16775) bones/35/position = Vector3(-2.59494e-08, 0.213436, -5.15143e-09) bones/35/rotation = Quaternion(-1.01283e-07, 0.391084, 0.920355, -3.34974e-08) bones/36/position = Vector3(8.5477e-09, 0.16565, -2.42004e-09) bones/37/rotation = Quaternion(1, -2.31451e-09, 1.99757e-07, 9.76327e-13) -bones/39/position = Vector3(-0.170945, 0.292641, 0.576143) +bones/39/position = Vector3(-0.170945, 0.292336, 0.575838) bones/39/rotation = Quaternion(0.707107, -3.82385e-08, 1.45009e-07, 0.707107) -bones/40/position = Vector3(-0.170945, 0.0258378, 0.245532) -bones/40/rotation = Quaternion(-0.70692, -7.05464e-08, -7.05096e-08, 0.707294) +bones/40/position = Vector3(-0.170945, 0.0264173, 0.243014) +bones/40/rotation = Quaternion(-0.704399, -7.08172e-08, -7.02379e-08, 0.709804) bones/41/position = Vector3(1.94816e-08, 0.362833, 2.0002e-10) bones/41/rotation = Quaternion(-5.81779e-09, 6.41802e-10, 0.99485, 0.101363) bones/42/position = Vector3(-1.10904e-08, 0.213436, 8.32518e-11) @@ -201,41 +201,41 @@ bones/43/rotation = Quaternion(-0.391084, -6.885e-08, -6.56287e-08, 0.920355) bones/44/rotation = Quaternion(1, 3.75961e-09, 1.94881e-07, 7.41776e-09) bones/46/position = Vector3(0.453379, 1.10598, -0.589302) bones/46/rotation = Quaternion(-0.707107, 6.47043e-05, 6.47042e-05, 0.707107) -bones/47/position = Vector3(0.520812, 0.781564, -0.0568721) -bones/47/rotation = Quaternion(0.79557, 0.00193247, 0.605858, 0.000241251) +bones/47/position = Vector3(0.520812, 0.788113, -0.0570226) +bones/47/rotation = Quaternion(0.795441, 0.00177548, 0.606029, 0.000197342) bones/48/position = Vector3(-0.45384, 1.10588, -0.588869) bones/48/rotation = Quaternion(-0.707107, 6.47043e-05, 6.47042e-05, 0.707107) -bones/49/position = Vector3(-0.510786, 0.781564, 0.0603409) -bones/49/rotation = Quaternion(0.759304, -0.00186127, -0.650733, 0.000429696) +bones/49/position = Vector3(-0.510786, 0.788113, 0.0601905) +bones/49/rotation = Quaternion(0.759165, -0.00170699, -0.650896, 0.000376884) [node name="1H_Sword_Offhand" parent="Rig/Skeleton3D" index="0"] -transform = Transform3D(-0.00264137, 0.263613, 0.964624, 0.999988, -0.00297891, 0.00355266, 0.00381029, 0.964623, -0.263603, 0.512704, 0.630353, -2.03699e-05) +transform = Transform3D(-0.00201176, 0.264045, 0.964507, 0.999997, 0.000862623, 0.00185006, -0.00034324, 0.964509, -0.264046, 0.512825, 0.636868, -0.00134114) visible = false [node name="Badge_Shield" parent="Rig/Skeleton3D" index="1"] -transform = Transform3D(-0.00264135, 0.263613, 0.964624, 0.999988, -0.00298145, 0.00355333, 0.00381291, 0.964623, -0.263603, 0.663075, 0.630907, -0.0411122) +transform = Transform3D(-0.00201174, 0.264045, 0.964507, 0.999997, 0.000860088, 0.00185073, -0.000340619, 0.964509, -0.264046, 0.663178, 0.637157, -0.0425021) visible = false [node name="Rectangle_Shield" parent="Rig/Skeleton3D" index="2"] -transform = Transform3D(-0.00264135, 0.263613, 0.964624, 0.999988, -0.00298145, 0.00355333, 0.00381291, 0.964623, -0.263603, 0.663075, 0.630907, -0.0411122) +transform = Transform3D(-0.00201174, 0.264045, 0.964507, 0.999997, 0.000860088, 0.00185073, -0.000340619, 0.964509, -0.264046, 0.663178, 0.637157, -0.0425021) visible = false [node name="Round_Shield" parent="Rig/Skeleton3D" index="3"] -transform = Transform3D(-0.00264135, 0.263613, 0.964624, 0.999988, -0.00298145, 0.00355333, 0.00381291, 0.964623, -0.263603, 0.663075, 0.630907, -0.0411122) +transform = Transform3D(-0.00201174, 0.264045, 0.964507, 0.999997, 0.000860088, 0.00185073, -0.000340619, 0.964509, -0.264046, 0.663178, 0.637157, -0.0425021) [node name="1H_Sword" parent="Rig/Skeleton3D" index="4"] -transform = Transform3D(0.00168977, -0.156187, 0.987725, 0.999994, -0.0024064, -0.00209167, 0.00270401, 0.987724, 0.156183, -0.496421, 0.634809, 0.140933) +transform = Transform3D(0.00288414, -0.15269, 0.988269, 0.999995, 0.000861427, -0.00278562, -0.000425572, 0.988273, 0.152692, -0.497149, 0.641357, 0.139546) [node name="2H_Sword" parent="Rig/Skeleton3D" index="5"] -transform = Transform3D(0.00168975, -0.156187, 0.987725, 0.999994, -0.00240642, -0.00209166, 0.00270402, 0.987724, 0.156183, -0.496421, 0.634809, 0.140933) +transform = Transform3D(0.00288413, -0.15269, 0.988269, 0.999995, 0.000861412, -0.00278561, -0.000425559, 0.988273, 0.152692, -0.497149, 0.641357, 0.139546) visible = false [node name="Knight_Helmet" parent="Rig/Skeleton3D" index="6"] -transform = Transform3D(0.999732, 0.000281237, 0.0231448, -0.000257958, 0.999999, -0.00100877, -0.0231451, 0.00100253, 0.999732, 9.48005e-05, 1.18867, 0.00128818) +transform = Transform3D(0.999727, 0.000237854, 0.0233737, -0.000215667, 0.999999, -0.000951751, -0.0233739, 0.000946449, 0.999726, 0.000123411, 1.20211, 0.00126002) visible = false [node name="Knight_Cape" parent="Rig/Skeleton3D" index="7"] -transform = Transform3D(0.99634, 0.000234038, 0.0854791, -6.10916e-05, 0.999998, -0.00202587, -0.0854794, 0.00201323, 0.996338, 9.55195e-05, 1.18868, 0.00126235) +transform = Transform3D(0.99626, 0.000234796, 0.0864109, -6.3917e-05, 0.999998, -0.00198027, -0.0864112, 0.00196734, 0.996258, 0.000123003, 1.20211, 0.00123393) visible = false [node name="CollisionShape3D" type="CollisionShape3D" parent="." index="1"] @@ -246,7 +246,7 @@ shape = SubResource("CapsuleShape3D_i3cyd") tree_root = SubResource("AnimationNodeStateMachine_vnar2") anim_player = NodePath("../AnimationPlayer") parameters/current_length = 1.06667 -parameters/current_position = 0.290059 +parameters/current_position = 0.0328482 parameters/current_delta = 0.0166667 parameters/conditions/grounded = false parameters/conditions/jumping = false @@ -266,20 +266,20 @@ parameters/End/current_length = 0.0 parameters/End/current_position = 0.0 parameters/End/current_delta = 0.0 parameters/IWR/current_length = 1.06667 -parameters/IWR/current_position = 0.290059 +parameters/IWR/current_position = 0.0328482 parameters/IWR/current_delta = 0.0166667 parameters/IWR/blend_position = Vector2(0.000524879, 0.00335574) parameters/IWR/0/current_length = 1.06667 -parameters/IWR/0/current_position = 0.290059 +parameters/IWR/0/current_position = 0.0328482 parameters/IWR/0/current_delta = 0.0166667 parameters/IWR/1/current_length = 0.8 -parameters/IWR/1/current_position = 0.55676 +parameters/IWR/1/current_position = 0.0328519 parameters/IWR/1/current_delta = 0.0166667 parameters/IWR/2/current_length = 1.06667 parameters/IWR/2/current_position = 0.408754 parameters/IWR/2/current_delta = 0.0166667 parameters/IWR/3/current_length = 0.8 -parameters/IWR/3/current_position = 0.55676 +parameters/IWR/3/current_position = 0.0328519 parameters/IWR/3/current_delta = 0.0166667 parameters/IWR/4/current_length = 0.8 parameters/IWR/4/current_position = 0.61058 @@ -288,11 +288,11 @@ parameters/Interact/current_length = null parameters/Interact/current_position = null parameters/Interact/current_delta = null parameters/Jump_Idle/current_length = 1.06667 -parameters/Jump_Idle/current_position = 0.0 -parameters/Jump_Idle/current_delta = 0.0 +parameters/Jump_Idle/current_position = 0.82916 +parameters/Jump_Idle/current_delta = 0.0166667 parameters/Jump_Land/current_length = 0.666667 parameters/Jump_Land/current_position = 0.666667 -parameters/Jump_Land/current_delta = 0.0333333 +parameters/Jump_Land/current_delta = 0.0320261 parameters/Jump_Start/current_length = 0.6 parameters/Jump_Start/current_position = 0.6 parameters/Jump_Start/current_delta = 0.0180555 diff --git a/scenes/torch_mounted.tscn b/scenes/torch_mounted.tscn new file mode 100644 index 0000000..50f0f29 --- /dev/null +++ b/scenes/torch_mounted.tscn @@ -0,0 +1,12 @@ +[gd_scene load_steps=2 format=3 uid="uid://dif2kboftacra"] + +[ext_resource type="PackedScene" uid="uid://h8sw1wyrq8ik" path="res://models/dungeon/torch_mounted.gltf" id="1_o20tv"] + +[node name="torch_mounted" instance=ExtResource("1_o20tv")] + +[node name="OmniLight3D" type="OmniLight3D" parent="." index="1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.385284, 0.301509) +light_color = Color(1, 0.552941, 0, 1) +light_energy = 2.0 +shadow_enabled = true +distance_fade_enabled = true diff --git a/scenes/wall.tscn b/scenes/wall.tscn new file mode 100644 index 0000000..383646a --- /dev/null +++ b/scenes/wall.tscn @@ -0,0 +1,5 @@ +[gd_scene load_steps=2 format=3 uid="uid://sw7iy4y80yom"] + +[ext_resource type="PackedScene" uid="uid://b8ko1hpclkf54" path="res://models/dungeon/wall.gltf" id="1_vchjv"] + +[node name="Wall" instance=ExtResource("1_vchjv")] diff --git a/scripts/game_manager.gd b/scripts/game_manager.gd index 1ed02f0..2d268c9 100644 --- a/scripts/game_manager.gd +++ b/scripts/game_manager.gd @@ -4,8 +4,3 @@ extends Node3D # Called when the node enters the scene tree for the first time. func _ready() -> void: print("Hallo Felix") - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(delta: float) -> void: - pass diff --git a/scripts/knight.gd b/scripts/knight.gd index d732387..d52d8e2 100644 --- a/scripts/knight.gd +++ b/scripts/knight.gd @@ -5,7 +5,7 @@ class_name Knight @export var acceleration := 4.0 @export var jump_speed := 8.0 @export var mouse_sensitivity := 0.0015 -@export var rotation_speed := 12.0 +@export var rotation_speed := 24.0 var gravity = ProjectSettings.get_setting("physics/3d/default_gravity") var jumping := false diff --git a/world_environment.tres b/world_environment.tres new file mode 100644 index 0000000..98066e9 --- /dev/null +++ b/world_environment.tres @@ -0,0 +1,28 @@ +[gd_resource type="Environment" load_steps=3 format=3 uid="uid://d31wkt76cft8k"] + +[sub_resource type="PhysicalSkyMaterial" id="PhysicalSkyMaterial_gn88m"] +ground_color = Color(0, 0, 0, 1) + +[sub_resource type="Sky" id="Sky_tyhie"] +sky_material = SubResource("PhysicalSkyMaterial_gn88m") +radiance_size = 2 + +[resource] +background_mode = 2 +background_intensity = 100000.0 +sky = SubResource("Sky_tyhie") +tonemap_mode = 2 +tonemap_white = 8.0 +ssao_enabled = true +ssao_detail = 2.0 +sdfgi_enabled = true +sdfgi_bounce_feedback = 0.9 +glow_enabled = true +glow_normalized = true +glow_bloom = 0.2 +volumetric_fog_enabled = true +volumetric_fog_density = 0.01 +volumetric_fog_gi_inject = 1.14 +volumetric_fog_anisotropy = 0.7 +volumetric_fog_sky_affect = 0.295 +adjustment_saturation = 1.17