diff --git a/asset_dev/terrain/mountain_rock.xcf b/asset_dev/terrain/mountain_rock.xcf new file mode 100644 index 0000000..9c006a8 Binary files /dev/null and b/asset_dev/terrain/mountain_rock.xcf differ diff --git a/assets/textures/mountain_rock/mountain_rock_albedo.dds b/assets/textures/mountain_rock/mountain_rock_albedo.dds new file mode 100644 index 0000000..2de99c2 --- /dev/null +++ b/assets/textures/mountain_rock/mountain_rock_albedo.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b705352820907e61f0f381755d5731cd44973eda3985f6a911d7861aca334f8 +size 87536 diff --git a/assets/textures/mountain_rock/mountain_rock_normal.dds b/assets/textures/mountain_rock/mountain_rock_normal.dds new file mode 100644 index 0000000..f09f209 --- /dev/null +++ b/assets/textures/mountain_rock/mountain_rock_normal.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:133e6410fd6c584ad6543d88e0bf8825dbd073f7d794988170653e56980453c5 +size 87536 diff --git a/levels/debug_level/debug_level.tscn b/levels/debug_level/debug_level.tscn index b3e932b..cbf6702 100644 --- a/levels/debug_level/debug_level.tscn +++ b/levels/debug_level/debug_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=53 format=3 uid="uid://bm2o3mex10v11"] +[gd_scene load_steps=56 format=3 uid="uid://bm2o3mex10v11"] [ext_resource type="Terrain3DStorage" uid="uid://bu1gewgsgc5hm" path="res://levels/debug_level/terrain_3d_storage.res" id="1_nlsu2"] [ext_resource type="Texture2D" path="res://assets/textures/grass_fairway/grass_fairway_albedo.dds" id="2_e4m27"] @@ -11,7 +11,9 @@ [ext_resource type="Texture2D" path="res://assets/textures/sand_trap/sand_trap_normal.dds" id="7_f25dn"] [ext_resource type="Texture2D" uid="uid://con5a36t6n6sq" path="res://assets/textures/clear_sea_water_2048x2048.png" id="7_t86h2"] [ext_resource type="PackedScene" uid="uid://cy7t2tc4y3b4" path="res://src/player/shot_setup/shot_setup.tscn" id="8_h44v5"] +[ext_resource type="Texture2D" path="res://assets/textures/mountain_rock/mountain_rock_albedo.dds" id="8_ujbjy"] [ext_resource type="Script" path="res://src/world/ball_zone/ball_zone.gd" id="9_jwlau"] +[ext_resource type="Texture2D" path="res://assets/textures/mountain_rock/mountain_rock_normal.dds" id="9_rrguh"] [ext_resource type="PackedScene" uid="uid://dagh38vap4t1d" path="res://src/props/scenery/city/concrete_building_1.tscn" id="10_lf15j"] [ext_resource type="PackedScene" uid="uid://cjubxs7peir5k" path="res://src/props/scenery/city/kana_signboard.tscn" id="11_evxup"] [ext_resource type="PackedScene" uid="uid://di7aql54lksn7" path="res://src/props/scenery/trees/palm_tree/palm_tree.tscn" id="12_sswxf"] @@ -34,7 +36,11 @@ noise = SubResource("FastNoiseLite_rpgb7") [sub_resource type="Terrain3DMaterial" id="Terrain3DMaterial_woy2k"] _shader_parameters = { -"blend_sharpness": 0.87, +"auto_base_texture": 3, +"auto_height_reduction": 0.1, +"auto_overlay_texture": 0, +"auto_slope": 0.41, +"blend_sharpness": 1.0, "height_blending": true, "macro_variation1": Color(0.964742, 0.964742, 0.964742, 1), "macro_variation2": Color(1, 1, 1, 1), @@ -56,6 +62,7 @@ _shader_parameters = { } world_background = 2 texture_filtering = 1 +auto_shader = true [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2u1w6"] cull_mode = 2 @@ -90,9 +97,16 @@ albedo_texture = ExtResource("6_nlea7") normal_texture = ExtResource("7_f25dn") uv_scale = 0.01 +[sub_resource type="Terrain3DTextureAsset" id="Terrain3DTextureAsset_13d2a"] +name = "mountain_rock_albedo" +id = 3 +albedo_texture = ExtResource("8_ujbjy") +normal_texture = ExtResource("9_rrguh") +uv_scale = 0.02 + [sub_resource type="Terrain3DAssets" id="Terrain3DAssets_eq5uw"] mesh_list = Array[Terrain3DMeshAsset]([SubResource("Terrain3DMeshAsset_8g62o")]) -texture_list = Array[Terrain3DTextureAsset]([SubResource("Terrain3DTextureAsset_kocfk"), SubResource("Terrain3DTextureAsset_vmhlw"), SubResource("Terrain3DTextureAsset_k6h8c")]) +texture_list = Array[Terrain3DTextureAsset]([SubResource("Terrain3DTextureAsset_kocfk"), SubResource("Terrain3DTextureAsset_vmhlw"), SubResource("Terrain3DTextureAsset_k6h8c"), SubResource("Terrain3DTextureAsset_13d2a")]) [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_h8tes"] panorama = ExtResource("6_ectru") diff --git a/levels/debug_level/terrain_3d_storage.res b/levels/debug_level/terrain_3d_storage.res index a3ce2fe..22f446a 100644 --- a/levels/debug_level/terrain_3d_storage.res +++ b/levels/debug_level/terrain_3d_storage.res @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:939681a9852ab7987ddc4f08f61d999059faa2f15c1e970c366f0463c73d5e0e -size 1754233 +oid sha256:87a757aefe30546760291982475766000c22080965006bc0e2689606220efa19 +size 1753865