Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

godot/Level/Island.tscn

@@ -1,8 +1,10 @@
-[gd_scene load_steps=4 format=3 uid="uid://3d51hjh2st8a"]
+[gd_scene load_steps=6 format=3 uid="uid://3d51hjh2st8a"]
 
 [ext_resource type="PackedScene" uid="uid://d3ccrfjpg4hbv" path="res://Models/palm_curved.tscn" id="3_bth2b"]
+[ext_resource type="PackedScene" uid="uid://c1n2lfcn4rkx7" path="res://Models/palm_default.tscn" id="4_2cnue"]
 [ext_resource type="PackedScene" uid="uid://ctbyl0qbks4k6" path="res://Models/ocean.tscn" id="4_dey2i"]
-[ext_resource type="PackedScene" uid="uid://bv6ar0kqmr7o8" path="res://Models/island.tscn" id="4_lq6cy"]
+[ext_resource type="PackedScene" uid="uid://difi2tur2j4dg" path="res://Models/island.tscn" id="4_lq6cy"]
+[ext_resource type="PackedScene" uid="uid://hg1yr5rnxd47" path="res://Models/palm_young.tscn" id="5_prlw2"]
 
 [node name="Node3D" type="Node3D"]
 
@@ -13,3 +15,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.867198, 0)
 
 [node name="PalmCurved" parent="." instance=ExtResource("3_bth2b")]
 transform = Transform3D(0.0166766, 0, 0, 0, 0.0166766, 0, 0, 0, 0.0166766, 2.60201, 1.38633, -0.419671)
+
+[node name="PalmDefault" parent="." instance=ExtResource("4_2cnue")]
+transform = Transform3D(0.0285645, 0, 0, 0, 0.0285645, 0, 0, 0, 0.0285645, 1.58539, 1.19143, 0.741446)
+
+[node name="PalmYoung" parent="." instance=ExtResource("5_prlw2")]
+transform = Transform3D(0.0328739, 0, 0, 0, 0.0328739, 0, 0, 0, 0.0328739, 0.0679206, 1.38939, 0.60797)

godot/Models/palm_default.tscn

@@ -0,0 +1,16 @@
+[gd_scene load_steps=5 format=3 uid="uid://c1n2lfcn4rkx7"]
+
+[ext_resource type="PackedScene" uid="uid://7c7deqr02ce6" path="res://Models/PalmDefault.glb" id="1_wlpps"]
+[ext_resource type="Material" uid="uid://dudwc12l32jc1" path="res://Textures/leaves.tres" id="2_xkp4w"]
+[ext_resource type="Texture2D" uid="uid://cqdi13k4hs5vb" path="res://Textures/wood1.png" id="3_vowun"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_81n3a"]
+albedo_texture = ExtResource("3_vowun")
+
+[node name="PalmDefault" instance=ExtResource("1_wlpps")]
+
+[node name="PalmLeaveDeafalt" parent="." index="0"]
+material_override = ExtResource("2_xkp4w")
+
+[node name="PalmBarkDefalts" parent="." index="1"]
+material_override = SubResource("StandardMaterial3D_81n3a")

godot/Models/palm_young.tscn

@@ -0,0 +1,16 @@
+[gd_scene load_steps=5 format=3 uid="uid://hg1yr5rnxd47"]
+
+[ext_resource type="PackedScene" uid="uid://bx4qhi6ucs6g1" path="res://Models/PalmYoung.glb" id="1_aeax5"]
+[ext_resource type="Material" uid="uid://dudwc12l32jc1" path="res://Textures/leaves.tres" id="2_6pvnm"]
+[ext_resource type="Texture2D" uid="uid://cqdi13k4hs5vb" path="res://Textures/wood1.png" id="3_ynktd"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tug8p"]
+albedo_texture = ExtResource("3_ynktd")
+
+[node name="PalmYoung" instance=ExtResource("1_aeax5")]
+
+[node name="PalmLeaveYoung" parent="." index="0"]
+material_override = ExtResource("2_6pvnm")
+
+[node name="PalmBarkYoung" parent="." index="1"]
+material_override = SubResource("StandardMaterial3D_tug8p")

godot/Textures/grass.tres

@@ -6,7 +6,7 @@
 [resource]
 diffuse_mode = 3
 specular_mode = 1
-albedo_color = Color(0.215686, 0.858824, 0.34902, 1)
+albedo_color = Color(0.423529, 0.619608, 0.145098, 1)
 albedo_texture = ExtResource("1_40rrr")
 normal_texture = ExtResource("1_r1qrb")
 uv1_scale = Vector3(75, 75, 75)

godot/Textures/leaves.tres

@@ -1,13 +1,13 @@
 [gd_resource type="StandardMaterial3D" load_steps=3 format=3 uid="uid://dudwc12l32jc1"]
 
-[ext_resource type="Texture2D" uid="uid://cvnigqwcb01dj" path="res://Textures/grass1.png" id="1_rk3mg"]
+[ext_resource type="Texture2D" uid="uid://cqdi13k4hs5vb" path="res://Textures/wood1.png" id="1_5s240"]
 [ext_resource type="Texture2D" uid="uid://d0pddcjy8uhp" path="res://Textures/leaves3.png" id="2_blarx"]
 
 [resource]
 diffuse_mode = 3
 specular_mode = 1
-albedo_color = Color(0.215686, 0.858824, 0.34902, 1)
-albedo_texture = ExtResource("1_rk3mg")
+albedo_color = Color(0.439216, 0.552941, 0, 1)
+albedo_texture = ExtResource("1_5s240")
 normal_texture = ExtResource("2_blarx")
 uv1_scale = Vector3(2, 2, 2)
 uv1_triplanar_sharpness = 0.00995752

godot/Textures/sand.tres

@@ -1,12 +1,12 @@
 [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://yuhlhpwji3c4"]
 
-[ext_resource type="Texture2D" uid="uid://d0pddcjy8uhp" path="res://Textures/leaves3.png" id="1_2cxg6"]
+[ext_resource type="Texture2D" uid="uid://d0pddcjy8uhp" path="res://Textures/leaves3.png" id="1_cj3li"]
 
 [resource]
 diffuse_mode = 3
 specular_mode = 1
 albedo_color = Color(0.219608, 0.494118, 0.0705882, 1)
-albedo_texture = ExtResource("1_2cxg6")
-normal_texture = ExtResource("1_2cxg6")
+albedo_texture = ExtResource("1_cj3li")
+normal_texture = ExtResource("1_cj3li")
 uv1_scale = Vector3(150, 150, 150)
 uv1_triplanar_sharpness = 0.00995752

godot/Textures/weirding2.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cwhif8yubo7pv"
+path.s3tc="res://.godot/imported/weirding2.png-0ec272148c017c4eeacae4dee370838c.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Textures/weirding2.png"
+dest_files=["res://.godot/imported/weirding2.png-0ec272148c017c4eeacae4dee370838c.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