diff --git a/game/data/models/armature_model_orig_v2.tscn b/game/data/models/armature_model_orig_v2.tscn index 81b5fb4f..a02fbd3b 100644 --- a/game/data/models/armature_model_orig_v2.tscn +++ b/game/data/models/armature_model_orig_v2.tscn @@ -230,19 +230,11 @@ viss = [ ExtResource( 6 ) ] [node name="armature" parent="." instance=ExtResource( 1 )] -[node name="Skeleton" parent="armature/Armature" index="0"] -bones/0/bound_children = [ NodePath("RootAttachment") ] -bones/1/bound_children = [ NodePath("RightHipAttachment") ] -bones/4/bound_children = [ NodePath("BoneAttachment") ] -bones/5/bound_children = [ NodePath("NeckAttachment") ] -bones/10/bound_children = [ NodePath("LeftHandAttachment") ] -bones/18/bound_children = [ NodePath("RightHandAttachment") ] - [node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton" index="0"] skin = SubResource( 1 ) [node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"] -transform = Transform( 0.102791, -0.987263, -0.121332, 0.0575961, -0.11585, 0.991558, -0.993031, -0.108913, 0.0449552, 0.267946, 0.766981, -0.0101607 ) +transform = Transform( 0.103564, -0.98842, -0.110674, 0.0564303, -0.105215, 0.992799, -0.993015, -0.109066, 0.0448831, 0.268724, 0.760958, -0.0112532 ) bone_name = "left_hand" [node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"] @@ -250,7 +242,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.04, -0.09 ) script = ExtResource( 4 ) [node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"] -transform = Transform( -0.0401363, -0.998883, 0.0242321, -0.127327, 0.0291502, 0.991386, -0.991058, 0.0367127, -0.128358, -0.264997, 0.761966, -0.00637655 ) +transform = Transform( -0.0425592, -0.998135, 0.0431264, -0.127963, 0.0482404, 0.990537, -0.990882, 0.0366505, -0.129781, -0.274708, 0.765201, -0.00470273 ) bone_name = "right_hand" [node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"] @@ -266,7 +258,7 @@ transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0 script = ExtResource( 4 ) [node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="4"] -transform = Transform( 0.99998, -0.000313001, 0.00628229, 0.00628985, 0.0731525, -0.997246, -0.000147444, 0.99732, 0.0731573, 0.00104161, 1.31822, 5.40821e-05 ) +transform = Transform( 0.99995, -0.00134125, 0.00993415, 0.0099976, 0.0730947, -0.997194, 0.000611389, 0.997323, 0.0731092, 0.00126205, 1.31264, 9.72227e-05 ) bone_name = "neck" [node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"] @@ -274,7 +266,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 ) script = ExtResource( 4 ) [node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"] -transform = Transform( 0.999505, 1.43205e-08, -0.0314672, -0.0314672, 4.71629e-07, -0.999505, 5.27444e-10, 1, 4.71847e-07, 5.01364e-06, 0.77672, -2.03727e-10 ) +transform = Transform( 0.999886, 5.70244e-09, -0.0150737, -0.0150737, 4.71811e-07, -0.999886, 1.41015e-09, 1, 4.71844e-07, 0.00650302, 0.77115, -4.94765e-10 ) bone_name = "pelvis" [node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/RightHipAttachment"] @@ -287,7 +279,7 @@ material/0 = null material/1 = null [node name="BoneAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"] -transform = Transform( 0.999978, 0.000271824, 0.00655987, 0.00656163, -0.00104016, -0.999923, -0.000265003, 0.999999, -0.00104169, 0.00227223, 1.13064, -0.000141337 ) +transform = Transform( 0.999947, -0.000482637, 0.0102779, 0.0102694, -0.00109357, -0.999866, 0.000493842, 0.999999, -0.00108968, 0.00319017, 1.12507, -0.0001072 ) bone_name = "spine_2" [node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/BoneAttachment"] diff --git a/game/dev/character_dev_mat.tres b/game/dev/character_dev_mat.tres deleted file mode 100644 index 0de87a82..00000000 --- a/game/dev/character_dev_mat.tres +++ /dev/null @@ -1,11 +0,0 @@ -[gd_resource type="ShaderMaterial" load_steps=2 format=2] - -[ext_resource path="res://data/shaders/1_standard_shader.tres" type="Shader" id=1] - - - - - - -[resource] -shader = ExtResource( 1 ) diff --git a/game/dev/shader_character_dev.tscn b/game/dev/shader_character_dev.tscn deleted file mode 100644 index 23a3aa3b..00000000 --- a/game/dev/shader_character_dev.tscn +++ /dev/null @@ -1,92 +0,0 @@ -[gd_scene load_steps=10 format=2] - -[ext_resource path="res://data/models/armature_model_orig_v2.tscn" type="PackedScene" id=1] -[ext_resource path="res://data/voxel_libraries/1_main_lib_merger_empty.tres" type="VoxelmanLibraryMerger" id=2] -[ext_resource path="res://default_bus_layout.tres" type="AudioBusLayout" id=3] -[ext_resource path="res://voxelman/world/TVVoxelWorld.gd" type="Script" id=4] -[ext_resource path="res://dungeon_generator/MainDungeonGenerator.gd" type="Script" id=5] - -[sub_resource type="VoxelmanLevelGenerator" id=1] -script = ExtResource( 5 ) -prop = ExtResource( 3 ) -gen_type = 1 -_level_seed = 35 -_spawn_mobs = false - -[sub_resource type="AnimationNodeStateMachinePlayback" id=2] - -[sub_resource type="ProceduralSky" id=3] -sky_top_color = Color( 0.0431373, 0.00784314, 0.0666667, 1 ) -sky_horizon_color = Color( 0.27451, 0.447059, 0.427451, 1 ) -sky_curve = 0.263535 -sky_energy = 0.3 -ground_bottom_color = Color( 0.196078, 0.152941, 0.152941, 1 ) -ground_horizon_color = Color( 0.223529, 0.192157, 0.164706, 1 ) -ground_curve = 0.101965 -ground_energy = 0.4 -sun_color = Color( 0.619608, 0.47451, 0.113725, 1 ) -sun_latitude = 37.43 -sun_longitude = -8.09 -sun_angle_min = 0.0 -sun_angle_max = 23.15 -sun_energy = 9.7 -texture_size = 0 - -[sub_resource type="Environment" id=4] -background_mode = 2 -background_sky = SubResource( 3 ) -ambient_light_color = Color( 0.737255, 0.737255, 0.737255, 1 ) -fog_enabled = true -fog_color = Color( 0.278431, 0.360784, 0.360784, 1 ) -fog_sun_color = Color( 0.113725, 0.568627, 0.827451, 1 ) -fog_depth_begin = 34.0 -fog_depth_end = 257.9 -fog_depth_curve = 1.18921 -tonemap_mode = 2 -tonemap_exposure = 0.83 -auto_exposure_max_luma = 7.33 -ss_reflections_enabled = true -ssao_enabled = true -glow_levels/3 = false -glow_intensity = 1.6 -glow_strength = 1.1 -glow_bloom = 0.1 -glow_hdr_luminance_cap = 1.0 -adjustment_enabled = true -adjustment_contrast = 1.05 - -[node name="World" type="VoxelWorld" groups=[ -"save", -]] -library = ExtResource( 2 ) -level_generator = SubResource( 1 ) -voxel_scale = 3.0 -chunk_spawn_range = 2 -script = ExtResource( 4 ) -show_loading_screen = false - -[node name="character" parent="." instance=ExtResource( 1 )] -automatic_build = false -use_threads = false - -[node name="AnimationTree" parent="character" index="1"] -parameters/playback = SubResource( 2 ) - -[node name="WorldEnvironment" type="WorldEnvironment" parent="."] -environment = SubResource( 4 ) - -[node name="DirectionalLight" type="DirectionalLight" parent="."] -transform = Transform( -0.797163, 0.45442, 0.397535, 0, -0.658427, 0.752644, 0.603765, 0.59998, 0.524873, 0, 18.834, 0 ) -light_energy = 1.4 -directional_shadow_normal_bias = 0.1 - -[node name="DirectionalLight2" type="DirectionalLight" parent="."] -transform = Transform( -0.797163, 0.523191, -0.301335, 0, 0.499093, 0.866548, 0.603765, 0.69078, -0.397858, 0, 18.834, 0 ) -light_energy = 0.4 -light_specular = 0.0 -directional_shadow_normal_bias = 0.1 - -[node name="OmniLight" type="OmniLight" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.30692, 2.07707, 1.61396 ) - -[editable path="character"] diff --git a/game/scenes/Main.tscn b/game/scenes/Main.tscn index 43dcdb46..8508477a 100644 --- a/game/scenes/Main.tscn +++ b/game/scenes/Main.tscn @@ -5,7 +5,7 @@ [ext_resource path="res://scenes/Menu.tscn" type="PackedScene" id=3] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=4] [ext_resource path="res://ui/debug/DebugInfo.tscn" type="PackedScene" id=5] -[ext_resource path="res://debug/FreeLookCam.tscn" type="PackedScene" id=6] +[ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=6] [node name="Main" type="Node"] script = ExtResource( 1 ) diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn index 8c3810ec..81d16c08 100644 --- a/game/scenes/Menu.tscn +++ b/game/scenes/Menu.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=23 format=2] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] -[ext_resource path="res://menu/CharacterEntry.tscn" type="PackedScene" id=2] +[ext_resource path="res://ui/menu/CharacterEntry.tscn" type="PackedScene" id=2] [ext_resource path="res://scenes/Menu.gd" type="Script" id=3] -[ext_resource path="res://menu/menu_character_button_group.tres" type="ButtonGroup" id=4] +[ext_resource path="res://ui/menu/menu_character_button_group.tres" type="ButtonGroup" id=4] [ext_resource path="res://scenes/CharacterSelectorMenu.gd" type="Script" id=5] [ext_resource path="res://scenes/CharacterCreationMenu.gd" type="Script" id=6] -[ext_resource path="res://menu/character_creation_button_group.tres" type="ButtonGroup" id=7] +[ext_resource path="res://ui/menu/character_creation_button_group.tres" type="ButtonGroup" id=7] [ext_resource path="res://ui/options/Options.tscn" type="PackedScene" id=8] [ext_resource path="res://ui/register/Register.tscn" type="PackedScene" id=9] [ext_resource path="res://ui/login/Login.tscn" type="PackedScene" id=10] @@ -20,6 +20,7 @@ [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=18] [ext_resource path="res://scripts/settings/DirectionalLightSettings.gd" type="Script" id=19] + [sub_resource type="VoxelmanLevelGenerator" id=1] script = ExtResource( 18 ) _force_planet = -1 diff --git a/game/test_weapons/shield_d.mesh b/game/test_weapons/shield_d.mesh index b127229f..f6e6142e 100644 Binary files a/game/test_weapons/shield_d.mesh and b/game/test_weapons/shield_d.mesh differ diff --git a/game/test_weapons/sword_i.mesh b/game/test_weapons/sword_i.mesh index 85c9ee7e..c357f3d3 100644 Binary files a/game/test_weapons/sword_i.mesh and b/game/test_weapons/sword_i.mesh differ diff --git a/game/menu/CharacterEntry.gd b/game/ui/menu/CharacterEntry.gd similarity index 100% rename from game/menu/CharacterEntry.gd rename to game/ui/menu/CharacterEntry.gd diff --git a/game/menu/CharacterEntry.tscn b/game/ui/menu/CharacterEntry.tscn similarity index 97% rename from game/menu/CharacterEntry.tscn rename to game/ui/menu/CharacterEntry.tscn index 46cec91d..bcaeaa77 100644 --- a/game/menu/CharacterEntry.tscn +++ b/game/ui/menu/CharacterEntry.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=1] -[ext_resource path="res://menu/CharacterEntry.gd" type="Script" id=2] +[ext_resource path="res://ui/menu/CharacterEntry.gd" type="Script" id=2] [node name="CharacterEntry" type="Button"] margin_right = 224.0 diff --git a/game/menu/character_creation_button_group.tres b/game/ui/menu/character_creation_button_group.tres similarity index 100% rename from game/menu/character_creation_button_group.tres rename to game/ui/menu/character_creation_button_group.tres diff --git a/game/menu/menu_character_button_group.tres b/game/ui/menu/menu_character_button_group.tres similarity index 100% rename from game/menu/menu_character_button_group.tres rename to game/ui/menu/menu_character_button_group.tres diff --git a/game/voxelman/TestScene.tscn b/game/voxelman/TestScene.tscn index 8cfe61be..ba696ab3 100644 --- a/game/voxelman/TestScene.tscn +++ b/game/voxelman/TestScene.tscn @@ -1,12 +1,13 @@ [gd_scene load_steps=16 format=2] -[ext_resource path="res://debug/FreeLookCam.tscn" type="PackedScene" id=1] +[ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=1] [ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3] [ext_resource path="res://voxelman/cubic_mesher/CubicVoxelWorld.tscn" type="PackedScene" id=4] [ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=5] + [sub_resource type="Environment" id=1] ambient_light_color = Color( 1, 1, 1, 1 ) diff --git a/game/debug/FreeLookCam.tscn b/game/voxelman/debug/FreeLookCam.tscn similarity index 77% rename from game/debug/FreeLookCam.tscn rename to game/voxelman/debug/FreeLookCam.tscn index ae752de6..d069a997 100644 --- a/game/debug/FreeLookCam.tscn +++ b/game/voxelman/debug/FreeLookCam.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://debug/FreeLookCamera.gd" type="Script" id=1] +[ext_resource path="res://voxelman/debug/FreeLookCamera.gd" type="Script" id=1] + [node name="Camera" type="Camera"] transform = Transform( 0.844995, 0.305893, -0.438648, -0.0119927, 0.830883, 0.556318, 0.534639, -0.464826, 0.705761, -7.76488, 10.4889, 10.3045 ) diff --git a/game/debug/FreeLookCamera.gd b/game/voxelman/debug/FreeLookCamera.gd similarity index 100% rename from game/debug/FreeLookCamera.gd rename to game/voxelman/debug/FreeLookCamera.gd diff --git a/game/voxelman/world/TVTestScene.tscn b/game/voxelman/world/TVTestScene.tscn index b435b6d3..f3e22f9f 100644 --- a/game/voxelman/world/TVTestScene.tscn +++ b/game/voxelman/world/TVTestScene.tscn @@ -3,12 +3,13 @@ [ext_resource path="res://voxelman/world/TVVoxelWorld.tscn" type="PackedScene" id=1] [ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3] -[ext_resource path="res://debug/FreeLookCam.tscn" type="PackedScene" id=4] +[ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=4] [ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=5] [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=6] + [sub_resource type="Environment" id=1] ambient_light_color = Color( 1, 1, 1, 1 )