diff --git a/models/hex.blend b/models/hex.blend index 509d0de..ed64987 100644 Binary files a/models/hex.blend and b/models/hex.blend differ diff --git a/models/hex.blend1 b/models/hex.blend1 index d8919a8..509d0de 100644 Binary files a/models/hex.blend1 and b/models/hex.blend1 differ diff --git a/models/player.blend b/models/player.blend new file mode 100644 index 0000000..1439059 Binary files /dev/null and b/models/player.blend differ diff --git a/models/player.glb b/models/player.glb new file mode 100644 index 0000000..367d420 Binary files /dev/null and b/models/player.glb differ diff --git a/models/player.glb.import b/models/player.glb.import new file mode 100644 index 0000000..3b461aa --- /dev/null +++ b/models/player.glb.import @@ -0,0 +1,34 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dsk5notetr5gh" +path="res://.godot/imported/player.glb-874246918b1d1ae729e6f5a64d32052b.scn" + +[deps] + +source_file="res://models/player.glb" +dest_files=["res://.godot/imported/player.glb-874246918b1d1ae729e6f5a64d32052b.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +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 +import_script/path="" +_subresources={} +gltf/naming_version=1 +gltf/embedded_image_handling=1 diff --git a/project.godot b/project.godot index 0b97bfd..2d35914 100644 --- a/project.godot +++ b/project.godot @@ -50,5 +50,5 @@ attack={ [physics] -common/physics_ticks_per_second=240 +common/physics_ticks_per_second=120 3d/default_gravity=20.0 diff --git a/scenes/hexagon.tscn b/scenes/hexagon.tscn index 98a1ebc..fb5e589 100644 --- a/scenes/hexagon.tscn +++ b/scenes/hexagon.tscn @@ -82,3 +82,8 @@ visible = false material_override = SubResource("ShaderMaterial_h646y") mesh = SubResource("ArrayMesh_3jj5g") skeleton = NodePath("") + +[node name="ReflectionProbe" type="ReflectionProbe" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0443811, 3.38648, -0.00446701) +max_distance = 10.0 +size = Vector3(10, 5, 10) diff --git a/scenes/player.tscn b/scenes/player.tscn index 79f646b..fa135b9 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=8 format=3 uid="uid://c6clkgmt6mj40"] +[gd_scene load_steps=9 format=3 uid="uid://c6clkgmt6mj40"] [ext_resource type="Script" path="res://code/player.gd" id="1_mp6gu"] [ext_resource type="Script" path="res://code/Hitbox.gd" id="2_i6eom"] [ext_resource type="PackedScene" uid="uid://bxkww14xjpfa6" path="res://scenes/debug_label.tscn" id="2_mrx3p"] [ext_resource type="Script" path="res://code/Hp.gd" id="2_t6o4p"] +[ext_resource type="PackedScene" uid="uid://dsk5notetr5gh" path="res://models/player.glb" id="5_4xekk"] [sub_resource type="CapsuleMesh" id="CapsuleMesh_a6ck7"] height = 1.8 @@ -20,6 +21,7 @@ max_speed = 6 hp = NodePath("Hp") [node name="MeshInstance3D" type="MeshInstance3D" parent="."] +visible = false mesh = SubResource("CapsuleMesh_a6ck7") [node name="DebugLabel" parent="MeshInstance3D" instance=ExtResource("2_mrx3p")] @@ -37,4 +39,7 @@ shape = SubResource("CapsuleShape3D_rvqs5") [node name="Hp" type="Node" parent="."] script = ExtResource("2_t6o4p") +[node name="player" parent="." instance=ExtResource("5_4xekk")] +transform = Transform3D(0.363647, 0, 0, 0, 0.363647, 0, 0, 0, 0.363647, 0, -0.967437, 0) + [connection signal="death" from="Hp" to="." method="_on_hp_death"]