Compare commits

..

No commits in common. "d762bfc8f1f8f6e41afb0af3b1ba59badd7d26ba" and "1de8895bdfe6b37007463dee9b9830b2604cc91c" have entirely different histories.

8 changed files with 30 additions and 64 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=56 format=3 uid="uid://bm2o3mex10v11"]
[gd_scene load_steps=53 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,16 +11,14 @@
[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"]
[ext_resource type="PackedScene" uid="uid://c7l58wuuahn7w" path="res://src/props/flag/flag.tscn" id="13_6jtao"]
[ext_resource type="Texture2D" uid="uid://dj60e8ri2fco" path="res://assets/models/scenery/city/concrete_building_1/concrete_building_1.png" id="14_y7s2h"]
[ext_resource type="Texture2D" uid="uid://du3vk5nnksohs" path="res://assets/sprites/particles/sparkle.png" id="16_2m5yu"]
[ext_resource type="PackedScene" uid="uid://nqar1qcun8ax" path="res://src/props/scenery/highway/guard_rail/guard_rail.tscn" id="16_xtxyj"]
[ext_resource type="PackedScene" uid="uid://nqar1qcun8ax" path="res://src/props/scenery/highway/guard_rail.tscn" id="16_xtxyj"]
[ext_resource type="PackedScene" uid="uid://d0tcr6uijpym5" path="res://src/props/scenery/highway/highway_road.tscn" id="17_amems"]
[ext_resource type="PackedScene" uid="uid://cblsayfgirexr" path="res://src/characters/umineko/umineko.tscn" id="21_ch6qk"]
@ -36,11 +34,7 @@ noise = SubResource("FastNoiseLite_rpgb7")
[sub_resource type="Terrain3DMaterial" id="Terrain3DMaterial_woy2k"]
_shader_parameters = {
"auto_base_texture": 3,
"auto_height_reduction": 0.1,
"auto_overlay_texture": 0,
"auto_slope": 0.41,
"blend_sharpness": 1.0,
"blend_sharpness": 0.87,
"height_blending": true,
"macro_variation1": Color(0.964742, 0.964742, 0.964742, 1),
"macro_variation2": Color(1, 1, 1, 1),
@ -62,7 +56,6 @@ _shader_parameters = {
}
world_background = 2
texture_filtering = 1
auto_shader = true
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2u1w6"]
cull_mode = 2
@ -97,16 +90,9 @@ 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"), SubResource("Terrain3DTextureAsset_13d2a")])
texture_list = Array[Terrain3DTextureAsset]([SubResource("Terrain3DTextureAsset_kocfk"), SubResource("Terrain3DTextureAsset_vmhlw"), SubResource("Terrain3DTextureAsset_k6h8c")])
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_h8tes"]
panorama = ExtResource("6_ectru")

BIN
levels/debug_level/terrain_3d_storage.res (Stored with Git LFS)

Binary file not shown.

View File

@ -23,21 +23,9 @@ var _dirty := false
@onready var post_multi_mesh: MultiMeshInstance3D = $PostMultiMesh
static var multimesh_mesh: Mesh = preload(
"res://src/props/scenery/highway/guard_rail/guard_rail_post_mesh.tres"
)
func _ready() -> void:
# Set up multimesh
# This is a workaround for an engine bug as of Godot 4.3
# ref: https://github.com/godotengine/godot/issues/68592
var multimesh := MultiMesh.new()
multimesh.transform_format = MultiMesh.TRANSFORM_3D
multimesh.instance_count = 0
multimesh.mesh = multimesh_mesh
post_multi_mesh.multimesh = multimesh
post_multi_mesh.multimesh = post_multi_mesh.multimesh.duplicate()
func _update_multimesh() -> void:

View File

@ -1,12 +1,29 @@
[gd_scene load_steps=5 format=3 uid="uid://nqar1qcun8ax"]
[gd_scene load_steps=7 format=3 uid="uid://nqar1qcun8ax"]
[ext_resource type="Script" path="res://src/props/scenery/highway/guard_rail/guard_rail.gd" id="1_imntf"]
[ext_resource type="Script" path="res://src/props/scenery/highway/guard_rail.gd" id="1_imntf"]
[ext_resource type="Material" uid="uid://cift6p0wn1oce" path="res://assets/materials/guard_rail.tres" id="2_1s4wy"]
[ext_resource type="PlaneMesh" uid="uid://bdcmgvgpj1e0w" path="res://src/props/scenery/highway/guard_rail/guard_rail_post_mesh.tres" id="3_hha2c"]
[sub_resource type="MultiMesh" id="MultiMesh_suiix"]
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_fo7j3"]
load_path = "res://.godot/imported/guard_rail_post.png-4447ff881a5916e5281ed251b7beecd0.ctex"
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_k1yjg"]
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
albedo_texture = SubResource("CompressedTexture2D_fo7j3")
texture_filter = 4
texture_repeat = false
billboard_mode = 2
[sub_resource type="PlaneMesh" id="PlaneMesh_ko4yv"]
material = SubResource("StandardMaterial3D_k1yjg")
size = Vector2(0.5, 1)
center_offset = Vector3(0, 0.5, 0)
orientation = 2
[sub_resource type="MultiMesh" id="MultiMesh_ecm13"]
transform_format = 1
mesh = ExtResource("3_hha2c")
mesh = SubResource("PlaneMesh_ko4yv")
[node name="GuardRail" type="Path3D"]
script = ExtResource("1_imntf")
@ -42,6 +59,6 @@ path_joined = false
material = ExtResource("2_1s4wy")
[node name="PostMultiMesh" type="MultiMeshInstance3D" parent="."]
multimesh = SubResource("MultiMesh_suiix")
multimesh = SubResource("MultiMesh_ecm13")
[connection signal="curve_changed" from="." to="." method="_on_curve_changed"]

View File

@ -1,19 +0,0 @@
[gd_resource type="PlaneMesh" load_steps=3 format=3 uid="uid://bdcmgvgpj1e0w"]
[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_fo7j3"]
load_path = "res://.godot/imported/guard_rail_post.png-4447ff881a5916e5281ed251b7beecd0.ctex"
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_k1yjg"]
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
albedo_texture = SubResource("CompressedTexture2D_fo7j3")
texture_filter = 4
texture_repeat = false
billboard_mode = 2
[resource]
material = SubResource("StandardMaterial3D_k1yjg")
size = Vector2(0.5, 1)
center_offset = Vector3(0, 0.5, 0)
orientation = 2