From 583fadae709d9e1ecb694b38396d521f2cca2297 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 12 Aug 2021 18:47:07 +0200 Subject: [PATCH] Updated the props module to get the automatic lod change support to PropInstanceMerger. --- HEADS | 2 +- game/test_props/Spatial.tscn | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/HEADS b/HEADS index 2c862a5d..704abf9a 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "91cb296a9065c541bcc31f01dcd156f84086363e"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "0f709b5455411652f371879e83a0737589d690c3"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2a2b2ae31a57fa078c4de81123cb725e3818a1b3"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "cb3aa0b1b08b90ed35b5628bd1847c5bd12a8c78"}, "mesh_utils": {"master": "e0ee26fc61f9d0f1a8a9a78070e3098c8f889048"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "ecf09d12457dff62e0fade1a403634fc845f5005"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "91cb296a9065c541bcc31f01dcd156f84086363e"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "0f709b5455411652f371879e83a0737589d690c3"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "2a2b2ae31a57fa078c4de81123cb725e3818a1b3"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "10256f556cc495ceee86af3f1f5edfb9187e85af"}, "mesh_utils": {"master": "e0ee26fc61f9d0f1a8a9a78070e3098c8f889048"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "ecf09d12457dff62e0fade1a403634fc845f5005"}} \ No newline at end of file diff --git a/game/test_props/Spatial.tscn b/game/test_props/Spatial.tscn index 080ae460..387e9b96 100644 --- a/game/test_props/Spatial.tscn +++ b/game/test_props/Spatial.tscn @@ -1,14 +1,17 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://test_props/MeshDataInstance.tres" type="PropData" id=1] +[ext_resource path="res://debug/FreeLookCamera.gd" type="Script" id=2] [node name="Spatial" type="Spatial"] [node name="PropInstanceMerger" type="PropInstanceMerger" parent="."] prop_data = ExtResource( 1 ) +lod_reduction_distance_squared = 800.0 [node name="Camera" type="Camera" parent="."] transform = Transform( 1, 0, 0, 0, 0.828911, 0.559381, 0, -0.559381, 0.828911, 2.65264, 3.23164, 6.30864 ) +script = ExtResource( 2 ) [node name="DirectionalLight" type="DirectionalLight" parent="."] transform = Transform( 1, 0, 0, 0, 0.823889, 0.566751, 0, -0.566751, 0.823889, 0, 2.11892, 3.32613 )