From 2321f2630e3579c63298287cba35bd0eb94e5d8b Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 21 Feb 2020 17:57:00 +0100 Subject: [PATCH] Removed the fast quadratic mesh simplifier module, because as it turns out, it won't work with the kind of meshes this project has. --- HEADS | 2 +- SConstruct | 1 - game/scenes/Menu.tscn | 2 ++ game/voxelman/world/TVVoxelChunk.gd | 11 ----------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/HEADS b/HEADS index a5d91a75..069be9b0 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "f1a77a7e0a41dde8b59aa66eba29ddaf737b6b18", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "7666d11b2da6b6dc8cda20f72d388eacc7e4ce6b"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "f25dac92ea740e99e99011bc12af5971da2a32de"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "fast_quadratic_mesh_simplifier": {"master": "77ca534fad159f81dc19712d370ba7d97df3741f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} \ No newline at end of file +{"engine": {"3.2": "f1a77a7e0a41dde8b59aa66eba29ddaf737b6b18", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "7666d11b2da6b6dc8cda20f72d388eacc7e4ce6b"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "0a4072b9b8f1a1d35c0e38aaa04e0858ea6eacb0"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} \ No newline at end of file diff --git a/SConstruct b/SConstruct index d7c58544..6f7b31c0 100644 --- a/SConstruct +++ b/SConstruct @@ -43,7 +43,6 @@ module_repositories = [ [ ['https://github.com/Relintai/godot_fastnoise.git', 'git@github.com:Relintai/godot_fastnoise.git'], 'fastnoise', '' ], [ ['https://github.com/Relintai/mesh_data_resource.git', 'git@github.com:Relintai/mesh_data_resource.git'], 'mesh_data_resource', '' ], [ ['https://github.com/Relintai/procedural_animations.git', 'git@github.com:Relintai/procedural_animations.git'], 'procedural_animations', '' ], - [ ['https://github.com/Relintai/fast_quadratic_mesh_simplifier.git', 'git@github.com:Relintai/fast_quadratic_mesh_simplifier.git'], 'fast_quadratic_mesh_simplifier', '' ], ] addon_repositories = [ diff --git a/game/scenes/Menu.tscn b/game/scenes/Menu.tscn index 666c6bdd..d4d1cac1 100644 --- a/game/scenes/Menu.tscn +++ b/game/scenes/Menu.tscn @@ -571,6 +571,8 @@ level_generator = SubResource( 1 ) voxel_scale = 1.6 chunk_spawn_range = 1 script = ExtResource( 16 ) +meshes = [ ] +editor_generate = false show_loading_screen = false generate_on_ready = true diff --git a/game/voxelman/world/TVVoxelChunk.gd b/game/voxelman/world/TVVoxelChunk.gd index c24d7e58..3ba9e764 100644 --- a/game/voxelman/world/TVVoxelChunk.gd +++ b/game/voxelman/world/TVVoxelChunk.gd @@ -237,17 +237,6 @@ func _build_phase(phase): return true var arr : Array = mesher.build_mesh() - -# print("Orig tris " + str(arr[VisualServer.ARRAY_INDEX].size() / 3)) -# var fqms : FastQuadraticMeshSimplifier = FastQuadraticMeshSimplifier.new() -# fqms.max_iteration_count = 10 -# fqms.enable_smart_link = false -# fqms.preserve_border_dges = true -# fqms.preserve_uv_foldover_edges = true -# fqms.preserve_uv_seam_edges = true -# fqms.initialize(arr) -# fqms.simplify_mesh(0.6) -# arr = fqms.get_arrays() VisualServer.mesh_add_surface_from_arrays(get_mesh_rid(), VisualServer.PRIMITIVE_TRIANGLES, arr)