From 4ca69552c4887c12bdbddbbc13ede86ef6e2e81c Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 24 Jan 2020 16:30:52 +0100 Subject: [PATCH] Added my new Procedural Animations as a dependency. Also full HEADS update. And fixed a smaller gdscript error. --- HEADS | 2 +- SConstruct | 3 +++ game/voxelman/mc_mesher/MarchingCubesVoxelChunk.gd | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/HEADS b/HEADS index dd692009..b1687cd4 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "fa638a290fccdd12652bdab9d9890e4d3d6b41e2", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "3ef382b29ffcafe8d6381e95b89e7d78f708793c", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "7bef6db99e52e2340d5d655c16d27c7bbe999247", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"} \ No newline at end of file +{"engine": "97cc2e53f6fbba7e85a2cbb79f38e077a6e511f7", "world_generator": "e5f5d205f8aea478294ad4796b0f3c771dd7e7cf", "entity_spell_system": "6f3744e2cbd4ba8c0ac7c331876c2d7a28beb4b2", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "b0b38396c40090777595e612c66becb0fd220027", "texture_packer": "8d3b160f02054323a1dc4a9bc8b7e1c44fc57753", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "7bef6db99e52e2340d5d655c16d27c7bbe999247", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49", "procedural_animations": "9b20b6f7d955a6f1c46ed35322ac4e0e21da8806"} \ No newline at end of file diff --git a/SConstruct b/SConstruct index 02a5d438..2a4ca34f 100644 --- a/SConstruct +++ b/SConstruct @@ -42,6 +42,7 @@ module_repositories = [ [ ['https://github.com/Relintai/texture_packer.git', 'git@github.com:Relintai/texture_packer.git'], 'texture_packer', '' ], [ ['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', '' ], ] addon_repositories = [ @@ -230,6 +231,8 @@ if len(sys.argv) > 1: target += 'bin/libvoxelman.x11.opt.tools.64.so' elif 'W' in arg: target += 'bin/libworld_generator.x11.opt.tools.64.so' + elif 'P' in arg: + target += 'bin/libprocedural_animations.x11.opt.tools.64.so' print('Running command: ' + build_string) diff --git a/game/voxelman/mc_mesher/MarchingCubesVoxelChunk.gd b/game/voxelman/mc_mesher/MarchingCubesVoxelChunk.gd index 338fe6e7..b700e196 100644 --- a/game/voxelman/mc_mesher/MarchingCubesVoxelChunk.gd +++ b/game/voxelman/mc_mesher/MarchingCubesVoxelChunk.gd @@ -31,4 +31,4 @@ class_name MarchingCubesVoxelChunk # world = get_node("..") func _create_mesher(): - mesher = MarchingCubesVoxelMesher.new() + add_mesher(MarchingCubesVoxelMesher.new())