Skip to content

Commit

Permalink
Trees and Drops
Browse files Browse the repository at this point in the history
  • Loading branch information
EclipsedMango committed Jun 28, 2024
1 parent 31c5c00 commit 3c77e7f
Show file tree
Hide file tree
Showing 26 changed files with 364 additions and 95 deletions.
Binary file added Assets/Art/Textures/TreeLOD.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions Assets/Art/Textures/TreeLOD.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bhnh2gvvbwqrm"
path.s3tc="res://.godot/imported/TreeLOD.png-bb2742e432836497469b14a0353c9025.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://Assets/Art/Textures/TreeLOD.png"
dest_files=["res://.godot/imported/TreeLOD.png-bb2742e432836497469b14a0353c9025.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
Binary file added Assets/Models/Log1.glb
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://by5gdtlcl17vc"
path="res://.godot/imported/Tree2FIXEDagain.glb-8d6053b40e9f8b8faa5948df16f936c7.scn"
uid="uid://bnrty63cm2iwt"
path="res://.godot/imported/Log1.glb-4bf2f4ac412b7e0484b30d5b7edea674.scn"

[deps]

source_file="res://Assets/Models/Tree2FIXEDagain.glb"
dest_files=["res://.godot/imported/Tree2FIXEDagain.glb-8d6053b40e9f8b8faa5948df16f936c7.scn"]
source_file="res://Assets/Models/Log1.glb"
dest_files=["res://.godot/imported/Log1.glb-4bf2f4ac412b7e0484b30d5b7edea674.scn"]

[params]

Expand Down
Binary file added Assets/Models/Log1COLOUR.glb
Binary file not shown.
34 changes: 34 additions & 0 deletions Assets/Models/Log1COLOUR.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dkonx1ug7cljx"
path="res://.godot/imported/Log1COLOUR.glb-bf225e42053d4264304d93698cdc4860.scn"

[deps]

source_file="res://Assets/Models/Log1COLOUR.glb"
dest_files=["res://.godot/imported/Log1COLOUR.glb-bf225e42053d4264304d93698cdc4860.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
Binary file removed Assets/Models/Tree2FIXEDagain.glb
Binary file not shown.
Binary file added Assets/Models/Tree3FIXED.glb
Binary file not shown.
34 changes: 34 additions & 0 deletions Assets/Models/Tree3FIXED.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://d0qxdri01t7lv"
path="res://.godot/imported/Tree3FIXED.glb-689ffd2f5fa6c12478a362ba3152f47c.scn"

[deps]

source_file="res://Assets/Models/Tree3FIXED.glb"
dest_files=["res://.godot/imported/Tree3FIXED.glb-689ffd2f5fa6c12478a362ba3152f47c.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
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,24 @@

importer="texture"
type="CompressedTexture2D"
uid="uid://ur5eeqet51x3"
path="res://.godot/imported/Tree2FIXEDagain_Leaves Texture - Imgur.png-ff59857ee11a1604f2096dcd089c1bcc.ctex"
uid="uid://dwu0xfgmv4vrk"
path.s3tc="res://.godot/imported/Tree3FIXED_Leaves Texture - Imgur.png-6223ebc14335e4778eac302f82ee6fbe.s3tc.ctex"
metadata={
"vram_texture": false
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={
"md5": "d5f31c5134a62f3c31ca3f0e20254606"
}

[deps]

source_file="res://Assets/Models/Tree2FIXEDagain_Leaves Texture - Imgur.png"
dest_files=["res://.godot/imported/Tree2FIXEDagain_Leaves Texture - Imgur.png-ff59857ee11a1604f2096dcd089c1bcc.ctex"]
source_file="res://Assets/Models/Tree3FIXED_Leaves Texture - Imgur.png"
dest_files=["res://.godot/imported/Tree3FIXED_Leaves Texture - Imgur.png-6223ebc14335e4778eac302f82ee6fbe.s3tc.ctex"]

[params]

compress/mode=0
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
Expand Down
6 changes: 6 additions & 0 deletions Scenes/Items/log_display.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://1mh0stp41hr5"]

[ext_resource type="PackedScene" uid="uid://dkonx1ug7cljx" path="res://Assets/Models/Log1COLOUR.glb" id="1_27t3l"]

[node name="Log1COLOUR" instance=ExtResource("1_27t3l")]
transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
11 changes: 11 additions & 0 deletions Scenes/Items/rock_display.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[gd_scene load_steps=3 format=3 uid="uid://brq5lhl2m56he"]

[ext_resource type="ArrayMesh" uid="uid://j78p2ctiwi7b" path="res://Assets/Models/Rock1.res" id="1_6lhx0"]

[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_h3j46"]
albedo_color = Color(0.47788, 0.47788, 0.47788, 1)

[node name="RockDisplay" type="MeshInstance3D"]
transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0)
material_override = SubResource("StandardMaterial3D_h3j46")
mesh = ExtResource("1_6lhx0")
22 changes: 22 additions & 0 deletions Scenes/dropped_item.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[gd_scene load_steps=4 format=3 uid="uid://bhgwvpmknjv7c"]

[ext_resource type="Script" path="res://Scripts/DroppedItem.gd" id="1_nnawm"]

[sub_resource type="SphereShape3D" id="SphereShape3D_7qh4i"]
radius = 0.3

[sub_resource type="SphereShape3D" id="SphereShape3D_bdfr6"]
radius = 0.75

[node name="DroppedItem" type="RigidBody3D"]
script = ExtResource("1_nnawm")

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

[node name="Area3D" type="Area3D" parent="."]

[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
shape = SubResource("SphereShape3D_bdfr6")

[connection signal="body_entered" from="Area3D" to="." method="_on_body_entered"]
89 changes: 32 additions & 57 deletions Scenes/inventory.tscn
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://bx3enqaqj2bvq"]
[gd_scene load_steps=6 format=3 uid="uid://bx3enqaqj2bvq"]

[ext_resource type="Script" path="res://Scripts/Inventory.gd" id="1_hpfk4"]
[ext_resource type="Texture2D" uid="uid://crurudbckpe4j" path="res://Assets/Art/Textures/inventory.png" id="1_qivim"]
[ext_resource type="PackedScene" uid="uid://cccy3p17tx25c" path="res://Scenes/ui_item_stack.tscn" id="2_mmi5o"]
[ext_resource type="Texture2D" uid="uid://der152ylpctsg" path="res://icon.svg" id="4_6llqd"]
[ext_resource type="Texture2D" uid="uid://b438nicufrs6d" path="res://Assets/Art/Textures/hotbar.png" id="5_rj0ue"]

[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_anabp"]
Expand All @@ -20,12 +19,12 @@ grow_vertical = 2
script = ExtResource("1_hpfk4")

[node name="CenterContainer" type="CenterContainer" parent="."]
visible = false
layout_mode = 2
offset_left = 509.0
offset_top = 240.0
offset_right = 1409.0
offset_bottom = 840.0
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2

[node name="Control" type="Control" parent="CenterContainer"]
custom_minimum_size = Vector2(900, 600)
Expand Down Expand Up @@ -179,54 +178,30 @@ layout_mode = 2
[node name="TextureRect9" parent="CenterContainer/Control/InventoryHotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="CursorItem" type="MarginContainer" parent="CenterContainer/Control"]
[node name="CursorItem" parent="CenterContainer/Control" instance=ExtResource("2_mmi5o")]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_left = -50.0
offset_top = -50.0
offset_right = 50.0
offset_bottom = 50.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
mouse_filter = 2
theme_override_constants/margin_left = 10
theme_override_constants/margin_top = 10
theme_override_constants/margin_right = 10
theme_override_constants/margin_bottom = 10

[node name="TextureRect" type="TextureRect" parent="CenterContainer/Control/CursorItem"]
visible = false
layout_mode = 2
layout_mode = 0
mouse_filter = 2
texture = ExtResource("4_6llqd")
expand_mode = 1
stretch_mode = 5

[node name="ItemCount" type="Label" parent="CenterContainer/Control/CursorItem"]
layout_mode = 2
text = "Hallo"
horizontal_alignment = 1

[node name="Hotbar" type="Control" parent="."]
unique_name_in_owner = true
[node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 1
anchors_preset = 12
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = -126.625
offset_bottom = -21.1245
offset_top = -139.74
offset_bottom = -34.7397
grow_horizontal = 2
grow_vertical = 0
alignment = 1
metadata/_edit_group_ = true

[node name="Hotbar" type="Control" parent="HBoxContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(1919, 105.5)
layout_mode = 2

[node name="TextureRect" type="TextureRect" parent="Hotbar"]
[node name="TextureRect" type="TextureRect" parent="HBoxContainer/Hotbar"]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
Expand All @@ -237,7 +212,7 @@ texture = ExtResource("5_rj0ue")
expand_mode = 1
stretch_mode = 5

[node name="Control" type="Control" parent="Hotbar"]
[node name="Control" type="Control" parent="HBoxContainer/Hotbar"]
layout_mode = 1
anchors_preset = 7
anchor_left = 0.5
Expand All @@ -251,7 +226,7 @@ offset_bottom = -11.5005
grow_horizontal = 2
grow_vertical = 0

[node name="Highlight" type="Panel" parent="Hotbar/Control"]
[node name="Highlight" type="Panel" parent="HBoxContainer/Hotbar/Control"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 15
Expand All @@ -261,7 +236,7 @@ grow_horizontal = 2
grow_vertical = 2
theme_override_styles/panel = SubResource("StyleBoxFlat_anabp")

[node name="HotbarGrid" type="GridContainer" parent="Hotbar"]
[node name="HotbarGrid" type="GridContainer" parent="HBoxContainer/Hotbar"]
unique_name_in_owner = true
layout_mode = 1
anchors_preset = 14
Expand All @@ -276,29 +251,29 @@ grow_horizontal = 2
grow_vertical = 2
columns = 9

[node name="TextureRect" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect2" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect2" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect3" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect3" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect4" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect4" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect5" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect5" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect6" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect6" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect7" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect7" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect8" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect8" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2

[node name="TextureRect9" parent="Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
[node name="TextureRect9" parent="HBoxContainer/Hotbar/HotbarGrid" instance=ExtResource("2_mmi5o")]
layout_mode = 2
10 changes: 7 additions & 3 deletions Scenes/main.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[gd_scene load_steps=12 format=3 uid="uid://dbkvn3mh5ff31"]
[gd_scene load_steps=13 format=3 uid="uid://dbkvn3mh5ff31"]

[ext_resource type="PackedScene" uid="uid://wygpiaun5mxw" path="res://Scenes/terrain_test.tscn" id="1_6r6n0"]
[ext_resource type="PackedScene" uid="uid://bbuymm13kjypt" path="res://Scenes/player.tscn" id="2_voc7m"]
[ext_resource type="PackedScene" uid="uid://brq1rqhw4t21k" path="res://Scenes/rock.tscn" id="4_6j0fb"]
[ext_resource type="Script" path="res://Scripts/Rockspawner.gd" id="4_ye4sx"]
[ext_resource type="Script" path="res://Scripts/FPS.gd" id="5_ro4ot"]
[ext_resource type="PackedScene" uid="uid://c68hil71myykb" path="res://Scenes/tree.tscn" id="6_fdd5e"]

[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_qq1ji"]
sky_top_color = Color(0.2, 0.376471, 0.513726, 1)
Expand Down Expand Up @@ -64,7 +65,7 @@ camera_attributes = SubResource("CameraAttributesPractical_ah7ol")
transform = Transform3D(1, 0, 0, 0, -0.554016, 0.832506, 0, -0.832506, -0.554016, 0, 20.282, -68.5258)
shadow_enabled = true

[node name="PlayerRelated" type="Node" parent="."]
[node name="PlayerRelated" type="Node3D" parent="."]

[node name="Player" parent="PlayerRelated" instance=ExtResource("2_voc7m")]

Expand All @@ -74,7 +75,7 @@ offset_bottom = 23.0
horizontal_alignment = 1
script = ExtResource("5_ro4ot")

[node name="Blocks" type="Node" parent="."]
[node name="Blocks" type="Node3D" parent="."]

[node name="StaticBody3D2" type="StaticBody3D" parent="Blocks"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 5.40181, 2)
Expand Down Expand Up @@ -111,3 +112,6 @@ script = ExtResource("4_ye4sx")

[node name="Rock" parent="Blocks/Rockspawner" instance=ExtResource("4_6j0fb")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2.56269, 6.43175)

[node name="Tree" parent="Blocks/Rockspawner" instance=ExtResource("6_fdd5e")]
transform = Transform3D(1.5, 0, 0, 0, 1.5, 0, 0, 0, 1.5, -0.43469, 3.13902, 0.095138)
Loading

0 comments on commit 3c77e7f

Please sign in to comment.