Skip to content

Commit

Permalink
small changes
Browse files Browse the repository at this point in the history
  • Loading branch information
janekx21 committed Jan 29, 2024
1 parent 726d505 commit a41137e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 82 deletions.
4 changes: 4 additions & 0 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ config/icon="res://icon.svg"

enabled=PackedStringArray()

[filesystem]

import/blender/enabled=false

[input]

move_left={
Expand Down
11 changes: 7 additions & 4 deletions scenes/game.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,21 @@
[ext_resource type="Shader" path="res://code/water.gdshader" id="10_t4h3o"]

[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_8g0j4"]
sky_horizon_color = Color(0.611765, 0.662745, 0.705882, 1)

[sub_resource type="Sky" id="Sky_7vv3c"]
sky_material = SubResource("ProceduralSkyMaterial_8g0j4")

[sub_resource type="Environment" id="Environment_ktnj1"]
background_mode = 2
sky = SubResource("Sky_7vv3c")
ambient_light_color = Color(0.282353, 0.352941, 0.407843, 1)
reflected_light_source = 2
tonemap_mode = 2

[sub_resource type="WorldBoundaryShape3D" id="WorldBoundaryShape3D_mnlg0"]

[sub_resource type="PlaneMesh" id="PlaneMesh_l5ckx"]
size = Vector2(100, 100)
size = Vector2(200, 200)
subdivide_width = 100
subdivide_depth = 100

Expand Down Expand Up @@ -62,7 +63,7 @@ shader = ExtResource("10_t4h3o")
shader_parameter/albedo_high = Color(0, 0.584314, 0.772549, 1)
shader_parameter/albedo = Color(0, 0.321569, 0.431373, 1)
shader_parameter/albedo_fresnel = Color(0, 0.533333, 0.701961, 1)
shader_parameter/metallic = 0.537
shader_parameter/metallic = 0.552
shader_parameter/roughness = 0.02
shader_parameter/wave_direction = Vector2(0.795, 0)
shader_parameter/wave_direction2 = Vector2(0, 0.585)
Expand Down Expand Up @@ -121,8 +122,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
floor_constant_speed = true

[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.219946, -0.903855, 0.366975, -0.542827, 0.199167, 0.815887, -0.810533, -0.378654, -0.446831, -6.28612, 0.125248, 0.0914339)
transform = Transform3D(0.219946, -0.903855, 0.366975, -0.542827, 0.199166, 0.815887, -0.810533, -0.378655, -0.446831, -6.28612, 0.125248, 0.0914339)
shadow_enabled = true
directional_shadow_blend_splits = true

[node name="World" type="Node" parent="."]

Expand Down Expand Up @@ -198,6 +200,7 @@ layout_mode = 2
texture = ExtResource("9_7vmu5")

[node name="Water" type="Node3D" parent="."]
visible = false

[node name="MeshInstance3D" type="MeshInstance3D" parent="Water"]
transform = Transform3D(0.786268, 0, 0, 0, 0.786268, 0, 0, 0, 0.786268, 0, -5, 0)
Expand Down
69 changes: 1 addition & 68 deletions scenes/hexagon.tscn

Large diffs are not rendered by default.

13 changes: 3 additions & 10 deletions scenes/player.tscn
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
[gd_scene load_steps=9 format=3 uid="uid://c6clkgmt6mj40"]
[gd_scene load_steps=8 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

[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_1rvxm"]
height = 1.8

Expand All @@ -20,12 +17,6 @@ script = ExtResource("1_mp6gu")
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")]

[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("CapsuleShape3D_1rvxm")

Expand All @@ -42,4 +33,6 @@ 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)

[node name="DebugLabel" parent="." instance=ExtResource("2_mrx3p")]

[connection signal="death" from="Hp" to="." method="_on_hp_death"]

0 comments on commit a41137e

Please sign in to comment.