From 6ef502ecb248189162f2bb2eb43d68901f276e00 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 9 Jan 2023 14:09:49 +0100 Subject: [PATCH] Work on fixing compile. --- level_generator/terrain_level_generator.cpp | 2 +- library/terrain_library.cpp | 22 ++++++------- library/terrain_library_merger.cpp | 2 +- library/terrain_library_merger_pcm.cpp | 4 +-- library/terrain_material_cache.cpp | 2 +- library/terrain_material_cache_pcm.cpp | 2 +- meshers/terrain_mesher.cpp | 8 ++--- nodes/terrain_light_node.h | 1 - world/default/terrain_world_default.cpp | 2 +- world/jobs/terrain_job.cpp | 10 +++--- world/jobs/terrain_mesher_job_step.cpp | 4 +-- world/terrain_chunk.cpp | 34 ++++++++++----------- world/terrain_environment_data.cpp | 2 +- world/terrain_structure.cpp | 2 +- world/terrain_world.cpp | 14 ++++----- 15 files changed, 55 insertions(+), 56 deletions(-) diff --git a/level_generator/terrain_level_generator.cpp b/level_generator/terrain_level_generator.cpp index b789fb6..12abe1f 100644 --- a/level_generator/terrain_level_generator.cpp +++ b/level_generator/terrain_level_generator.cpp @@ -37,7 +37,7 @@ TerrainLevelGenerator::~TerrainLevelGenerator() { } void TerrainLevelGenerator::_bind_methods() { - BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); ClassDB::bind_method(D_METHOD("generate_chunk", "chunk"), &TerrainLevelGenerator::generate_chunk); } diff --git a/library/terrain_library.cpp b/library/terrain_library.cpp index 0bef9f2..61b77b8 100644 --- a/library/terrain_library.cpp +++ b/library/terrain_library.cpp @@ -489,7 +489,7 @@ void TerrainLibrary::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "initialized", PROPERTY_HINT_NONE, "", 0), "set_initialized", "get_initialized"); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_supports_caching")); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_supports_caching")); #else GDVIRTUAL_BIND(_supports_caching); #endif @@ -498,15 +498,15 @@ void TerrainLibrary::_bind_methods() { ClassDB::bind_method(D_METHOD("supports_caching"), &TerrainLibrary::supports_caching); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_setup_material_albedo", PropertyInfo(Variant::INT, "material_index"), PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"))); + //BIND_VMETHOD(MethodInfo("_setup_material_albedo", PropertyInfo(Variant::INT, "material_index"), PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"))); #else GDVIRTUAL_BIND(_setup_material_albedo, "material_index", "texture"); #endif #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMaterialCache"), "_material_cache_get", PropertyInfo(Variant::INT, "key"))); - BIND_VMETHOD(MethodInfo("_material_cache_unref", PropertyInfo(Variant::INT, "key"))); + //BIND_VMETHOD(MethodInfo("_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMaterialCache"), "_material_cache_get", PropertyInfo(Variant::INT, "key"))); + //BIND_VMETHOD(MethodInfo("_material_cache_unref", PropertyInfo(Variant::INT, "key"))); #else GDVIRTUAL_BIND(_material_cache_get_key, "chunk", "texture"); GDVIRTUAL_BIND(_material_cache_get, "key"); @@ -534,9 +534,9 @@ void TerrainLibrary::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "materials", PROPERTY_HINT_NONE, "17/17:Material", PROPERTY_USAGE_DEFAULT, "Material"), "materials_set", "materials_get"); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_liquid_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMaterialCache"), "_liquid_material_cache_get", PropertyInfo(Variant::INT, "key"))); - BIND_VMETHOD(MethodInfo("_liquid_material_cache_unref", PropertyInfo(Variant::INT, "key"))); + //BIND_VMETHOD(MethodInfo("_liquid_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMaterialCache"), "_liquid_material_cache_get", PropertyInfo(Variant::INT, "key"))); + //BIND_VMETHOD(MethodInfo("_liquid_material_cache_unref", PropertyInfo(Variant::INT, "key"))); #else GDVIRTUAL_BIND(_liquid_material_cache_get_key, "chunk", "texture"); GDVIRTUAL_BIND(_liquid_material_cache_get, "key"); @@ -564,9 +564,9 @@ void TerrainLibrary::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "liquid_materials", PROPERTY_HINT_NONE, "17/17:Material", PROPERTY_USAGE_DEFAULT, "Material"), "liquid_materials_set", "liquid_materials_get"); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_prop_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMaterialCache"), "_prop_material_cache_get", PropertyInfo(Variant::INT, "key"))); - BIND_VMETHOD(MethodInfo("_prop_material_cache_unref", PropertyInfo(Variant::INT, "key"))); + //BIND_VMETHOD(MethodInfo("_prop_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMaterialCache"), "_prop_material_cache_get", PropertyInfo(Variant::INT, "key"))); + //BIND_VMETHOD(MethodInfo("_prop_material_cache_unref", PropertyInfo(Variant::INT, "key"))); #else GDVIRTUAL_BIND(_prop_material_cache_get_key, "chunk", "texture"); GDVIRTUAL_BIND(_prop_material_cache_get, "key"); diff --git a/library/terrain_library_merger.cpp b/library/terrain_library_merger.cpp index dc7b345..429db5b 100644 --- a/library/terrain_library_merger.cpp +++ b/library/terrain_library_merger.cpp @@ -359,7 +359,7 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons } if (shmat.is_valid()) { - shmat->set_shader_param("texture_albedo", texture); + shmat->set_shader_parameter("texture_albedo", texture); } } } diff --git a/library/terrain_library_merger_pcm.cpp b/library/terrain_library_merger_pcm.cpp index 6cd4f5b..efcfef4 100644 --- a/library/terrain_library_merger_pcm.cpp +++ b/library/terrain_library_merger_pcm.cpp @@ -38,7 +38,7 @@ SOFTWARE. #include "../defines.h" #include "../world/default/terrain_chunk_default.h" -#include "core/hashfuncs.h" +#include "core/templates/hashfuncs.h" #include "core/message_queue.h" #include "terrain_material_cache_pcm.h" @@ -896,7 +896,7 @@ void TerrainLibraryMergerPCM::_setup_material_albedo(const int material_index, c } if (shmat.is_valid()) { - shmat->set_shader_param("texture_albedo", texture); + shmat->set_shader_parameter("texture_albedo", texture); } } */ diff --git a/library/terrain_material_cache.cpp b/library/terrain_material_cache.cpp index eeb5763..a1d11cf 100644 --- a/library/terrain_material_cache.cpp +++ b/library/terrain_material_cache.cpp @@ -287,7 +287,7 @@ void TerrainMaterialCache::_bind_methods() { ClassDB::bind_method(D_METHOD("dec_ref_count"), &TerrainMaterialCache::dec_ref_count); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_setup_material_albedo", PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"))); + //BIND_VMETHOD(MethodInfo("_setup_material_albedo", PropertyInfo(Variant::OBJECT, "texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"))); #else GDVIRTUAL_BIND(_setup_material_albedo, "texture"); #endif diff --git a/library/terrain_material_cache_pcm.cpp b/library/terrain_material_cache_pcm.cpp index bf64efe..658bf40 100644 --- a/library/terrain_material_cache_pcm.cpp +++ b/library/terrain_material_cache_pcm.cpp @@ -173,7 +173,7 @@ void TerrainMaterialCachePCM::_setup_material_albedo(Ref texture) { Ref shmat = m; if (shmat.is_valid()) { - shmat->set_shader_param("texture_albedo", texture); + shmat->set_shader_parameter("texture_albedo", texture); } } } diff --git a/meshers/terrain_mesher.cpp b/meshers/terrain_mesher.cpp index 85b70ad..448ef01 100644 --- a/meshers/terrain_mesher.cpp +++ b/meshers/terrain_mesher.cpp @@ -966,9 +966,9 @@ TerrainMesher::~TerrainMesher() { void TerrainMesher::_bind_methods() { #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_add_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo("_bake_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo("_bake_liquid_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_add_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_bake_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_bake_liquid_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); #else GDVIRTUAL_BIND(_add_chunk, "chunk"); GDVIRTUAL_BIND(_bake_colors, "chunk"); @@ -1036,7 +1036,7 @@ void TerrainMesher::_bind_methods() { #endif #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_add_mesher", PropertyInfo(Variant::OBJECT, "mesher", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMesher"))); + //BIND_VMETHOD(MethodInfo("_add_mesher", PropertyInfo(Variant::OBJECT, "mesher", PROPERTY_HINT_RESOURCE_TYPE, "TerrainMesher"))); #else GDVIRTUAL_BIND(_add_mesher, "mesher"); #endif diff --git a/nodes/terrain_light_node.h b/nodes/terrain_light_node.h index 464fcce..64cce0f 100644 --- a/nodes/terrain_light_node.h +++ b/nodes/terrain_light_node.h @@ -37,7 +37,6 @@ SOFTWARE. class TerrainLightNode : public Spatial { GDCLASS(TerrainLightNode, Spatial); - OBJ_CATEGORY("Props"); public: //make it turn into a normal light if voxelman isn't present? diff --git a/world/default/terrain_world_default.cpp b/world/default/terrain_world_default.cpp index fc311cc..f532944 100644 --- a/world/default/terrain_world_default.cpp +++ b/world/default/terrain_world_default.cpp @@ -345,7 +345,7 @@ void TerrainWorldDefault::_bind_methods() { ClassDB::bind_method(D_METHOD("set_num_lods", "value"), &TerrainWorldDefault::set_num_lods); ADD_PROPERTY(PropertyInfo(Variant::INT, "num_lods"), "set_num_lods", "get_num_lods"); - BIND_VMETHOD(MethodInfo("_update_lods")); + //BIND_VMETHOD(MethodInfo("_update_lods")); ClassDB::bind_method(D_METHOD("update_lods"), &TerrainWorldDefault::update_lods); ClassDB::bind_method(D_METHOD("_update_lods"), &TerrainWorldDefault::_update_lods); diff --git a/world/jobs/terrain_job.cpp b/world/jobs/terrain_job.cpp index 163b809..578ff76 100644 --- a/world/jobs/terrain_job.cpp +++ b/world/jobs/terrain_job.cpp @@ -318,8 +318,8 @@ TerrainJob::~TerrainJob() { } void TerrainJob::_bind_methods() { - BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta"))); - BIND_VMETHOD(MethodInfo("_physics_process", PropertyInfo(Variant::REAL, "delta"))); + //BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta"))); + //BIND_VMETHOD(MethodInfo("_physics_process", PropertyInfo(Variant::REAL, "delta"))); ClassDB::bind_method(D_METHOD("get_build_phase_type"), &TerrainJob::get_build_phase_type); ClassDB::bind_method(D_METHOD("set_build_phase_type", "value"), &TerrainJob::set_build_phase_type); @@ -336,14 +336,14 @@ void TerrainJob::_bind_methods() { ClassDB::bind_method(D_METHOD("next_job"), &TerrainJob::next_job); - BIND_VMETHOD(MethodInfo("_reset")); + //BIND_VMETHOD(MethodInfo("_reset")); ClassDB::bind_method(D_METHOD("reset"), &TerrainJob::reset); ClassDB::bind_method(D_METHOD("_reset"), &TerrainJob::_reset); ClassDB::bind_method(D_METHOD("_execute"), &TerrainJob::_execute); - BIND_VMETHOD(MethodInfo("_execute_phase")); + //BIND_VMETHOD(MethodInfo("_execute_phase")); ClassDB::bind_method(D_METHOD("execute_phase"), &TerrainJob::execute_phase); ClassDB::bind_method(D_METHOD("_execute_phase"), &TerrainJob::_execute_phase); @@ -375,7 +375,7 @@ void TerrainJob::_bind_methods() { ClassDB::bind_method(D_METHOD("should_do", "just_check"), &TerrainJob::should_do, DEFVAL(false)); ClassDB::bind_method(D_METHOD("should_return"), &TerrainJob::should_return); - BIND_VMETHOD(MethodInfo("_execute")); + //BIND_VMETHOD(MethodInfo("_execute")); ClassDB::bind_method(D_METHOD("execute"), &TerrainJob::execute); ADD_SIGNAL(MethodInfo("completed")); diff --git a/world/jobs/terrain_mesher_job_step.cpp b/world/jobs/terrain_mesher_job_step.cpp index aeb43de..c6d2abb 100644 --- a/world/jobs/terrain_mesher_job_step.cpp +++ b/world/jobs/terrain_mesher_job_step.cpp @@ -102,7 +102,7 @@ void TerrainMesherJobStep::_bind_methods() { ClassDB::bind_method(D_METHOD("get_simplification_step_ratio"), &TerrainMesherJobStep::get_simplification_step_ratio); ClassDB::bind_method(D_METHOD("set_simplification_step_ratio", "value"), &TerrainMesherJobStep::set_simplification_step_ratio); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "simplification_step_ratio"), "set_simplification_step_ratio", "get_simplification_step_ratio"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "simplification_step_ratio"), "set_simplification_step_ratio", "get_simplification_step_ratio"); ClassDB::bind_method(D_METHOD("get_simplification_steps"), &TerrainMesherJobStep::get_simplification_steps); ClassDB::bind_method(D_METHOD("set_simplification_steps", "value"), &TerrainMesherJobStep::set_simplification_steps); @@ -110,7 +110,7 @@ void TerrainMesherJobStep::_bind_methods() { ClassDB::bind_method(D_METHOD("get_simplification_agressiveness"), &TerrainMesherJobStep::get_simplification_agressiveness); ClassDB::bind_method(D_METHOD("set_simplification_agressiveness", "value"), &TerrainMesherJobStep::set_simplification_agressiveness); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "simplification_agressiveness"), "set_simplification_agressiveness", "get_simplification_agressiveness"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "simplification_agressiveness"), "set_simplification_agressiveness", "get_simplification_agressiveness"); #endif BIND_ENUM_CONSTANT(TYPE_NORMAL); diff --git a/world/terrain_chunk.cpp b/world/terrain_chunk.cpp index 81d27c8..c164d24 100644 --- a/world/terrain_chunk.cpp +++ b/world/terrain_chunk.cpp @@ -1285,31 +1285,31 @@ void TerrainChunk::_get_property_list(List *p_list) const { void TerrainChunk::_bind_methods() { ADD_SIGNAL(MethodInfo("mesh_generation_finished", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo("_mesh_data_resource_added", PropertyInfo(Variant::INT, "index"))); + //BIND_VMETHOD(MethodInfo("_mesh_data_resource_added", PropertyInfo(Variant::INT, "index"))); - BIND_VMETHOD(MethodInfo("_channel_setup")); + //BIND_VMETHOD(MethodInfo("_channel_setup")); - BIND_VMETHOD(MethodInfo("_bake_lights")); - BIND_VMETHOD(MethodInfo("_bake_light", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight"))); - BIND_VMETHOD(MethodInfo("_clear_baked_lights")); + //BIND_VMETHOD(MethodInfo("_bake_lights")); + //BIND_VMETHOD(MethodInfo("_bake_light", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight"))); + //BIND_VMETHOD(MethodInfo("_clear_baked_lights")); ClassDB::bind_method(D_METHOD("bake_lights"), &TerrainChunk::bake_lights); ClassDB::bind_method(D_METHOD("bake_light", "light"), &TerrainChunk::bake_light); ClassDB::bind_method(D_METHOD("clear_baked_lights"), &TerrainChunk::clear_baked_lights); - BIND_VMETHOD(MethodInfo("_enter_tree")); - BIND_VMETHOD(MethodInfo("_exit_tree")); - BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta"))); - BIND_VMETHOD(MethodInfo("_physics_process", PropertyInfo(Variant::REAL, "delta"))); - BIND_VMETHOD(MethodInfo("_world_transform_changed")); - BIND_VMETHOD(MethodInfo("_visibility_changed", PropertyInfo(Variant::BOOL, "visible"))); - BIND_VMETHOD(MethodInfo("_world_light_added", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight"))); - BIND_VMETHOD(MethodInfo("_world_light_removed", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight"))); + //BIND_VMETHOD(MethodInfo("_enter_tree")); + //BIND_VMETHOD(MethodInfo("_exit_tree")); + //BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta"))); + //BIND_VMETHOD(MethodInfo("_physics_process", PropertyInfo(Variant::REAL, "delta"))); + //BIND_VMETHOD(MethodInfo("_world_transform_changed")); + //BIND_VMETHOD(MethodInfo("_visibility_changed", PropertyInfo(Variant::BOOL, "visible"))); + //BIND_VMETHOD(MethodInfo("_world_light_added", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight"))); + //BIND_VMETHOD(MethodInfo("_world_light_removed", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight"))); - BIND_VMETHOD(MethodInfo("_generation_process", PropertyInfo(Variant::REAL, "delta"))); - BIND_VMETHOD(MethodInfo("_generation_physics_process", PropertyInfo(Variant::REAL, "delta"))); + //BIND_VMETHOD(MethodInfo("_generation_process", PropertyInfo(Variant::REAL, "delta"))); + //BIND_VMETHOD(MethodInfo("_generation_physics_process", PropertyInfo(Variant::REAL, "delta"))); - BIND_VMETHOD(MethodInfo("_finalize_build")); + //BIND_VMETHOD(MethodInfo("_finalize_build")); ClassDB::bind_method(D_METHOD("enter_tree"), &TerrainChunk::enter_tree); ClassDB::bind_method(D_METHOD("exit_tree"), &TerrainChunk::exit_tree); @@ -1543,7 +1543,7 @@ void TerrainChunk::_bind_methods() { ClassDB::bind_method(D_METHOD("collider_remove", "index"), &TerrainChunk::collider_remove); ClassDB::bind_method(D_METHOD("colliders_clear"), &TerrainChunk::colliders_clear); - BIND_VMETHOD(MethodInfo("_build")); + //BIND_VMETHOD(MethodInfo("_build")); ClassDB::bind_method(D_METHOD("build"), &TerrainChunk::build); ClassDB::bind_method(D_METHOD("_build"), &TerrainChunk::_build); diff --git a/world/terrain_environment_data.cpp b/world/terrain_environment_data.cpp index 4c19ad1..8d8ab8f 100644 --- a/world/terrain_environment_data.cpp +++ b/world/terrain_environment_data.cpp @@ -86,7 +86,7 @@ TerrainEnvironmentData::~TerrainEnvironmentData() { void TerrainEnvironmentData::_bind_methods() { #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_setup", PropertyInfo(Variant::OBJECT, "world_environment", PROPERTY_HINT_RESOURCE_TYPE, "WorldEnvironment"), PropertyInfo(Variant::OBJECT, "primary_light", PROPERTY_HINT_RESOURCE_TYPE, "DirectionalLight"), PropertyInfo(Variant::OBJECT, "secondary_light", PROPERTY_HINT_RESOURCE_TYPE, "DirectionalLight"))); + //BIND_VMETHOD(MethodInfo("_setup", PropertyInfo(Variant::OBJECT, "world_environment", PROPERTY_HINT_RESOURCE_TYPE, "WorldEnvironment"), PropertyInfo(Variant::OBJECT, "primary_light", PROPERTY_HINT_RESOURCE_TYPE, "DirectionalLight"), PropertyInfo(Variant::OBJECT, "secondary_light", PROPERTY_HINT_RESOURCE_TYPE, "DirectionalLight"))); #else GDVIRTUAL_BIND(_setup, "world_environment", "primary_light", "secondary_light"); #endif diff --git a/world/terrain_structure.cpp b/world/terrain_structure.cpp index 5b18730..49d9bec 100644 --- a/world/terrain_structure.cpp +++ b/world/terrain_structure.cpp @@ -83,7 +83,7 @@ TerrainStructure::~TerrainStructure() { void TerrainStructure::_bind_methods() { #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_write_to_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_write_to_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); #else GDVIRTUAL_BIND(_write_to_chunk, "chunk"); #endif diff --git a/world/terrain_world.cpp b/world/terrain_world.cpp index fc06c4c..6889ae0 100644 --- a/world/terrain_world.cpp +++ b/world/terrain_world.cpp @@ -1163,7 +1163,7 @@ void TerrainWorld::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_structures", PROPERTY_HINT_NONE, "17/17:TerrainStructure", PROPERTY_USAGE_DEFAULT, "TerrainStructure"), "voxel_structures_set", "voxel_structures_get"); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_chunk_added", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_chunk_added", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); #else GDVIRTUAL_BIND(_chunk_added, "chunk"); #endif @@ -1196,11 +1196,11 @@ void TerrainWorld::_bind_methods() { ADD_SIGNAL(MethodInfo("generation_finished")); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_generation_finished")); + //BIND_VMETHOD(MethodInfo("_generation_finished")); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"), "_create_chunk", PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "z"), PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo("_prepare_chunk_for_generation", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); - BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"), "_create_chunk", PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "z"), PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_prepare_chunk_for_generation", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); + //BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); #else GDVIRTUAL_BIND(_generation_finished); GDVIRTUAL_BIND(_create_chunk, "chunk", "x", "z", "chunk", "ret"); @@ -1239,7 +1239,7 @@ void TerrainWorld::_bind_methods() { ClassDB::bind_method(D_METHOD("get_or_create_chunk_at_world_position", "world_position"), &TerrainWorld::get_or_create_chunk_at_world_position); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::INT, "ret"), "_get_channel_index_info", PropertyInfo(Variant::INT, "channel_type", PROPERTY_HINT_ENUM, BINDING_STRING_CHANNEL_TYPE_INFO))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::INT, "ret"), "_get_channel_index_info", PropertyInfo(Variant::INT, "channel_type", PROPERTY_HINT_ENUM, BINDING_STRING_CHANNEL_TYPE_INFO))); #else GDVIRTUAL_BIND(_get_channel_index_info, "channel_type", "ret"); #endif @@ -1250,7 +1250,7 @@ void TerrainWorld::_bind_methods() { ClassDB::bind_method(D_METHOD("get_editor_camera"), &TerrainWorld::get_editor_camera); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_set_voxel_with_tool", + //BIND_VMETHOD(MethodInfo("_set_voxel_with_tool", PropertyInfo(Variant::BOOL, "mode_add"), PropertyInfo(Variant::VECTOR3, "hit_position"), PropertyInfo(Variant::VECTOR3, "hit_normal"),