From cbcde2c3a5a5371a7cd4f974f45beee5ac983a2a Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 9 Jan 2023 14:10:21 +0100 Subject: [PATCH] Work on fixing compile. --- .../terrain_2d_level_generator.cpp | 2 +- library/terrain_2d_library.cpp | 22 ++++++------ library/terrain_2d_library_merger.cpp | 2 +- library/terrain_2d_library_merger_pcm.cpp | 4 +-- library/terrain_2d_material_cache.cpp | 2 +- library/terrain_2d_material_cache_pcm.cpp | 4 +-- meshers/terrain_2d_mesher.cpp | 8 ++--- nodes/terrain_2d_light_node.h | 1 - world/jobs/terrain_2d_job.cpp | 10 +++--- world/terrain_2d_chunk.cpp | 36 +++++++++---------- world/terrain_2d_environment_data.cpp | 2 +- world/terrain_2d_structure.cpp | 2 +- world/terrain_2d_world.cpp | 16 ++++----- 13 files changed, 55 insertions(+), 56 deletions(-) diff --git a/level_generator/terrain_2d_level_generator.cpp b/level_generator/terrain_2d_level_generator.cpp index c9d6bd5..5b72248 100644 --- a/level_generator/terrain_2d_level_generator.cpp +++ b/level_generator/terrain_2d_level_generator.cpp @@ -37,7 +37,7 @@ Terrain2DLevelGenerator::~Terrain2DLevelGenerator() { } void Terrain2DLevelGenerator::_bind_methods() { - BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); ClassDB::bind_method(D_METHOD("generate_chunk", "chunk"), &Terrain2DLevelGenerator::generate_chunk); } diff --git a/library/terrain_2d_library.cpp b/library/terrain_2d_library.cpp index 7c12ee6..3979c91 100644 --- a/library/terrain_2d_library.cpp +++ b/library/terrain_2d_library.cpp @@ -370,7 +370,7 @@ void Terrain2DLibrary::_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 @@ -391,15 +391,15 @@ void Terrain2DLibrary::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "prop_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "prop_texture_set", "prop_texture_get"); #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, "Terrain2DChunk"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMaterialCache"), "_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, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMaterialCache"), "_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"); @@ -418,9 +418,9 @@ void Terrain2DLibrary::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "material", PROPERTY_HINT_RESOURCE_TYPE, "Material"), "material_set", "material_get"); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_liquid_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMaterialCache"), "_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, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMaterialCache"), "_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"); @@ -439,9 +439,9 @@ void Terrain2DLibrary::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "liquid_material", PROPERTY_HINT_RESOURCE_TYPE, "Material"), "liquid_material_set", "liquid_material_get"); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_prop_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMaterialCache"), "_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, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMaterialCache"), "_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_2d_library_merger.cpp b/library/terrain_2d_library_merger.cpp index 2e818ec..8136568 100644 --- a/library/terrain_2d_library_merger.cpp +++ b/library/terrain_2d_library_merger.cpp @@ -314,7 +314,7 @@ void Terrain2DLibraryMerger::_setup_material_albedo(const int material_index, co } if (shmat.is_valid()) { - shmat->set_shader_param("texture_albedo", texture); + shmat->set_shader_parameter("texture_albedo", texture); } } diff --git a/library/terrain_2d_library_merger_pcm.cpp b/library/terrain_2d_library_merger_pcm.cpp index 05e35ff..c2cae73 100644 --- a/library/terrain_2d_library_merger_pcm.cpp +++ b/library/terrain_2d_library_merger_pcm.cpp @@ -38,7 +38,7 @@ SOFTWARE. #include "../defines.h" #include "../world/default/terrain_2d_chunk_default.h" -#include "core/hashfuncs.h" +#include "core/templates/hashfuncs.h" #include "core/message_queue.h" #include "terrain_2d_material_cache_pcm.h" @@ -689,7 +689,7 @@ void Terrain2DLibraryMergerPCM::_setup_material_albedo(const int material_index, } if (shmat.is_valid()) { - shmat->set_shader_param("texture_albedo", texture); + shmat->set_shader_parameter("texture_albedo", texture); }*/ } diff --git a/library/terrain_2d_material_cache.cpp b/library/terrain_2d_material_cache.cpp index 4a1a926..b9457f5 100644 --- a/library/terrain_2d_material_cache.cpp +++ b/library/terrain_2d_material_cache.cpp @@ -250,7 +250,7 @@ void Terrain2DMaterialCache::_bind_methods() { ClassDB::bind_method(D_METHOD("dec_ref_count"), &Terrain2DMaterialCache::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_2d_material_cache_pcm.cpp b/library/terrain_2d_material_cache_pcm.cpp index 0c9f0be..dc84353 100644 --- a/library/terrain_2d_material_cache_pcm.cpp +++ b/library/terrain_2d_material_cache_pcm.cpp @@ -88,7 +88,7 @@ Rect2 Terrain2DMaterialCachePCM::additional_texture_get_uv_rect(const Ref image = tex->get_data(); + Ref image = tex->get_image(); if (!image.is_valid()) { return Rect2(0, 0, 1, 1); @@ -165,7 +165,7 @@ void Terrain2DMaterialCachePCM::_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_2d_mesher.cpp b/meshers/terrain_2d_mesher.cpp index 5f73ce0..494f678 100644 --- a/meshers/terrain_2d_mesher.cpp +++ b/meshers/terrain_2d_mesher.cpp @@ -936,9 +936,9 @@ Terrain2DMesher::~Terrain2DMesher() { void Terrain2DMesher::_bind_methods() { #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_add_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); - BIND_VMETHOD(MethodInfo("_bake_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); - BIND_VMETHOD(MethodInfo("_bake_liquid_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_add_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_bake_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_bake_liquid_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); #else GDVIRTUAL_BIND(_add_chunk, "chunk"); GDVIRTUAL_BIND(_bake_colors, "chunk"); @@ -998,7 +998,7 @@ void Terrain2DMesher::_bind_methods() { #endif #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_add_mesher", PropertyInfo(Variant::OBJECT, "mesher", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMesher"))); + //BIND_VMETHOD(MethodInfo("_add_mesher", PropertyInfo(Variant::OBJECT, "mesher", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DMesher"))); #else GDVIRTUAL_BIND(_add_mesher, "mesher"); #endif diff --git a/nodes/terrain_2d_light_node.h b/nodes/terrain_2d_light_node.h index 6752881..21b6826 100644 --- a/nodes/terrain_2d_light_node.h +++ b/nodes/terrain_2d_light_node.h @@ -37,7 +37,6 @@ SOFTWARE. class Terrain2DLightNode : public Spatial { GDCLASS(Terrain2DLightNode, Spatial); - OBJ_CATEGORY("Prop2Ds"); public: //make it turn into a normal light if voxelman isn't present? diff --git a/world/jobs/terrain_2d_job.cpp b/world/jobs/terrain_2d_job.cpp index 74ae72c..b23948b 100644 --- a/world/jobs/terrain_2d_job.cpp +++ b/world/jobs/terrain_2d_job.cpp @@ -293,8 +293,8 @@ Terrain2DJob::~Terrain2DJob() { } void Terrain2DJob::_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"), &Terrain2DJob::get_build_phase_type); ClassDB::bind_method(D_METHOD("set_build_phase_type", "value"), &Terrain2DJob::set_build_phase_type); @@ -311,14 +311,14 @@ void Terrain2DJob::_bind_methods() { ClassDB::bind_method(D_METHOD("next_job"), &Terrain2DJob::next_job); - BIND_VMETHOD(MethodInfo("_reset")); + //BIND_VMETHOD(MethodInfo("_reset")); ClassDB::bind_method(D_METHOD("reset"), &Terrain2DJob::reset); ClassDB::bind_method(D_METHOD("_reset"), &Terrain2DJob::_reset); ClassDB::bind_method(D_METHOD("_execute"), &Terrain2DJob::_execute); - BIND_VMETHOD(MethodInfo("_execute_phase")); + //BIND_VMETHOD(MethodInfo("_execute_phase")); ClassDB::bind_method(D_METHOD("execute_phase"), &Terrain2DJob::execute_phase); ClassDB::bind_method(D_METHOD("_execute_phase"), &Terrain2DJob::_execute_phase); @@ -350,7 +350,7 @@ void Terrain2DJob::_bind_methods() { ClassDB::bind_method(D_METHOD("should_do", "just_check"), &Terrain2DJob::should_do, DEFVAL(false)); ClassDB::bind_method(D_METHOD("should_return"), &Terrain2DJob::should_return); - BIND_VMETHOD(MethodInfo("_execute")); + //BIND_VMETHOD(MethodInfo("_execute")); ClassDB::bind_method(D_METHOD("execute"), &Terrain2DJob::execute); ADD_SIGNAL(MethodInfo("completed")); diff --git a/world/terrain_2d_chunk.cpp b/world/terrain_2d_chunk.cpp index ee0580d..c632736 100644 --- a/world/terrain_2d_chunk.cpp +++ b/world/terrain_2d_chunk.cpp @@ -1381,32 +1381,32 @@ void Terrain2DChunk::_get_property_list(List *p_list) const { void Terrain2DChunk::_bind_methods() { ADD_SIGNAL(MethodInfo("mesh_generation_finished", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); - 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, "Terrain2DLight"))); - BIND_VMETHOD(MethodInfo("_clear_baked_lights")); + //BIND_VMETHOD(MethodInfo("_bake_lights")); + //BIND_VMETHOD(MethodInfo("_bake_light", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DLight"))); + //BIND_VMETHOD(MethodInfo("_clear_baked_lights")); ClassDB::bind_method(D_METHOD("bake_lights"), &Terrain2DChunk::bake_lights); ClassDB::bind_method(D_METHOD("bake_light", "light"), &Terrain2DChunk::bake_light); ClassDB::bind_method(D_METHOD("clear_baked_lights"), &Terrain2DChunk::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, "Terrain2DLight"))); - BIND_VMETHOD(MethodInfo("_world_light_removed", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DLight"))); - BIND_VMETHOD(MethodInfo("_draw")); + //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, "Terrain2DLight"))); + //BIND_VMETHOD(MethodInfo("_world_light_removed", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DLight"))); + //BIND_VMETHOD(MethodInfo("_draw")); - 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"), &Terrain2DChunk::enter_tree); ClassDB::bind_method(D_METHOD("exit_tree"), &Terrain2DChunk::exit_tree); @@ -1665,7 +1665,7 @@ void Terrain2DChunk::_bind_methods() { ClassDB::bind_method(D_METHOD("collider_remove", "index"), &Terrain2DChunk::collider_remove); ClassDB::bind_method(D_METHOD("colliders_clear"), &Terrain2DChunk::colliders_clear); - BIND_VMETHOD(MethodInfo("_build")); + //BIND_VMETHOD(MethodInfo("_build")); ClassDB::bind_method(D_METHOD("build"), &Terrain2DChunk::build); ClassDB::bind_method(D_METHOD("_build"), &Terrain2DChunk::_build); diff --git a/world/terrain_2d_environment_data.cpp b/world/terrain_2d_environment_data.cpp index 8cac301..02adcc0 100644 --- a/world/terrain_2d_environment_data.cpp +++ b/world/terrain_2d_environment_data.cpp @@ -86,7 +86,7 @@ Terrain2DEnvironmentData::~Terrain2DEnvironmentData() { void Terrain2DEnvironmentData::_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_2d_structure.cpp b/world/terrain_2d_structure.cpp index 97ab7c5..037a1f1 100644 --- a/world/terrain_2d_structure.cpp +++ b/world/terrain_2d_structure.cpp @@ -74,7 +74,7 @@ Terrain2DStructure::~Terrain2DStructure() { void Terrain2DStructure::_bind_methods() { #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_write_to_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_write_to_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); #else GDVIRTUAL_BIND(_write_to_chunk, "chunk"); #endif diff --git a/world/terrain_2d_world.cpp b/world/terrain_2d_world.cpp index 7da9249..456c552 100644 --- a/world/terrain_2d_world.cpp +++ b/world/terrain_2d_world.cpp @@ -1250,7 +1250,7 @@ void Terrain2DWorld::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_structures", PROPERTY_HINT_NONE, "17/17:Terrain2DStructure", PROPERTY_USAGE_DEFAULT, "Terrain2DStructure"), "voxel_structures_set", "voxel_structures_get"); #if VERSION_MAJOR < 4 - BIND_VMETHOD(MethodInfo("_chunk_added", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_chunk_added", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); #else GDVIRTUAL_BIND(_chunk_added, "chunk"); #endif @@ -1283,11 +1283,11 @@ void Terrain2DWorld::_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, "Terrain2DChunk"), "_create_chunk", PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "y"), PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); - BIND_VMETHOD(MethodInfo("_prepare_chunk_for_generation", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); - BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "ret", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"), "_create_chunk", PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "y"), PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_prepare_chunk_for_generation", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); + //BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Terrain2DChunk"))); #else GDVIRTUAL_BIND(_generation_finished); GDVIRTUAL_BIND(_create_chunk, "chunk", "x", "y", "chunk", "ret"); @@ -1326,7 +1326,7 @@ void Terrain2DWorld::_bind_methods() { ClassDB::bind_method(D_METHOD("get_or_create_chunk_at_world_position", "world_position"), &Terrain2DWorld::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 @@ -1335,7 +1335,7 @@ void Terrain2DWorld::_bind_methods() { ClassDB::bind_method(D_METHOD("_get_channel_index_info", "channel_type"), &Terrain2DWorld::_get_channel_index_info); #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::VECTOR2, "hit_position"), PropertyInfo(Variant::INT, "selected_voxel"), @@ -1347,7 +1347,7 @@ void Terrain2DWorld::_bind_methods() { ClassDB::bind_method(D_METHOD("set_voxel_with_tool", "mode_add", "hit_position", "selected_voxel", "isolevel"), &Terrain2DWorld::set_voxel_with_tool); ClassDB::bind_method(D_METHOD("_set_voxel_with_tool", "mode_add", "hit_position", "selected_voxel", "isolevel"), &Terrain2DWorld::_set_voxel_with_tool); - BIND_VMETHOD(MethodInfo("_draw")); + //BIND_VMETHOD(MethodInfo("_draw")); ClassDB::bind_method(D_METHOD("_draw"), &Terrain2DWorld::_draw); BIND_ENUM_CONSTANT(CHANNEL_TYPE_INFO_TYPE);