From b20303a24e436119e513bafdfd225f3db88d1b9c Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 19 Apr 2021 18:19:19 +0200 Subject: [PATCH] Re-enable lods. The simple lod seams still need work. Also updated Terraman for a the fixes. --- HEADS | 2 +- game/tw/TerraWorldBlocky.gd | 45 +++++++++++--------------- game/tw/TerraWorldBlocky.tscn | 2 +- game/tw/new_terramanlibrarymerger.tres | 5 ++- 4 files changed, 22 insertions(+), 32 deletions(-) diff --git a/HEADS b/HEADS index cb595769..45c36c8f 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "eaeb650367c2dc3b053f24888e3155bdfc5ac083"}, "world_generator": {"master": "d289ee942c19f75ae0ecbdc1d0f38a84ec4ff3e3"}, "entity_spell_system": {"master": "378ebcff23e5ab0a04c0e92119d26391de4be139"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "dbf3c59a9c52f155f0d98b567d571708e8b3f253"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "679064ea4f1fe81d14e18b3db9e113384e99cf84"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "6f418a07d491539b0bcd0bf16e84211e950cb21c"}, "mesh_utils": {"master": "6725a4906c0a039eaff4c46c8dea00f6b1b99045"}, "broken_seals_module": {"master": "8bfe7efe6940c701bc9296d6e4eb565b36b6527b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "a6d8ee6ae4505752b861c3ff96eefb73fbe2feee"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "bb10729c6ee1051965b564c43bb4493e6e7459a5"}, "world_generator": {"master": "d289ee942c19f75ae0ecbdc1d0f38a84ec4ff3e3"}, "entity_spell_system": {"master": "378ebcff23e5ab0a04c0e92119d26391de4be139"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "dbf3c59a9c52f155f0d98b567d571708e8b3f253"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "679064ea4f1fe81d14e18b3db9e113384e99cf84"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "6f418a07d491539b0bcd0bf16e84211e950cb21c"}, "mesh_utils": {"master": "6725a4906c0a039eaff4c46c8dea00f6b1b99045"}, "broken_seals_module": {"master": "8bfe7efe6940c701bc9296d6e4eb565b36b6527b"}, "thread_pool": {"master": "b2e8c815392052947e7386f722913a12eea543a4"}, "terraman": {"master": "a3c81f4d0c4c336e3abfe027b06a08f576da0b59"}} \ No newline at end of file diff --git a/game/tw/TerraWorldBlocky.gd b/game/tw/TerraWorldBlocky.gd index b74add99..a3dc65c6 100644 --- a/game/tw/TerraWorldBlocky.gd +++ b/game/tw/TerraWorldBlocky.gd @@ -233,33 +233,24 @@ func _create_chunk(x : int, z : int, pchunk : TerraChunk) -> TerraChunk: s.job_type = TerraMesherJobStep.TYPE_NORMAL tj.add_jobs_step(s) -# s = TerraMesherJobStep.new() -# s.job_type = TerraMesherJobStep.TYPE_NORMAL_LOD -# s.lod_index = 1 -# tj.add_jobs_step(s) -# -# s = TerraMesherJobStep.new() -# s.job_type = TerraMesherJobStep.TYPE_NORMAL_LOD -# s.lod_index = 2 -# tj.add_jobs_step(s) -# -# s = TerraMesherJobStep.new() -# s.job_type = TerraMesherJobStep.TYPE_NORMAL_LOD -# s.lod_index = 3 -# tj.add_jobs_step(s) - -# s = TerraMesherJobStep.new() -# s.job_type = TerraMesherJobStep.TYPE_DROP_UV2 -# tj.add_jobs_step(s) -# -# s = TerraMesherJobStep.new() -# s.job_type = TerraMesherJobStep.TYPE_MERGE_VERTS -# tj.add_jobs_step(s) -# -# s = TerraMesherJobStep.new() -# s.job_type = TerraMesherJobStep.TYPE_SIMPLIFY_MESH -# s.fqms = FastQuadraticMeshSimplifier.new() -# tj.add_jobs_step(s) + s = TerraMesherJobStep.new() + s.job_type = TerraMesherJobStep.TYPE_NORMAL_LOD + s.lod_index = 1 + tj.add_jobs_step(s) + + s = TerraMesherJobStep.new() + s.job_type = TerraMesherJobStep.TYPE_NORMAL_LOD + s.lod_index = 2 + tj.add_jobs_step(s) + + s = TerraMesherJobStep.new() + s.job_type = TerraMesherJobStep.TYPE_MERGE_VERTS + tj.add_jobs_step(s) + + s = TerraMesherJobStep.new() + s.job_type = TerraMesherJobStep.TYPE_BAKE_TEXTURE + tj.add_jobs_step(s) + pchunk.job_add(lj) pchunk.job_add(tj) diff --git a/game/tw/TerraWorldBlocky.tscn b/game/tw/TerraWorldBlocky.tscn index 8951c55b..93911f08 100644 --- a/game/tw/TerraWorldBlocky.tscn +++ b/game/tw/TerraWorldBlocky.tscn @@ -61,7 +61,7 @@ library = ExtResource( 1 ) level_generator = SubResource( 1 ) voxel_scale = 2.0 build_flags = 510 -num_lods = 1 +num_lods = 5 script = ExtResource( 2 ) test_prop = ExtResource( 5 ) diff --git a/game/tw/new_terramanlibrarymerger.tres b/game/tw/new_terramanlibrarymerger.tres index 8a996b07..9637488a 100644 --- a/game/tw/new_terramanlibrarymerger.tres +++ b/game/tw/new_terramanlibrarymerger.tres @@ -1,11 +1,10 @@ -[gd_resource type="TerramanLibraryMerger" load_steps=11 format=2] +[gd_resource type="TerramanLibraryMerger" load_steps=10 format=2] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2] [ext_resource path="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=3] [ext_resource path="res://modules/core/materials/7_standard_material_notex.tres" type="Material" id=4] [ext_resource path="res://modules/core/materials/5_standard_material_nouv2.tres" type="Material" id=5] -[ext_resource path="res://modules/core/materials/1_standard_material.tres" type="Material" id=6] [sub_resource type="TerraSurfaceMerger" id=1] texture_top = ExtResource( 1 ) @@ -28,6 +27,6 @@ texture_bottom = ExtResource( 2 ) texture_side = ExtResource( 2 ) [resource] -materials = [ ExtResource( 6 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 4 ) ] +materials = [ ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 5 ), ExtResource( 4 ) ] texture_flags = 1 voxel_surfaces = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ]