Relintai/terraman
1
0
Fork 0
mirror of https://github.com/Relintai/terraman.git synced 2025-04-23 21:43:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Work on fixing compile.

Browse Source
This commit is contained in:
Relintai 2023-01-09 14:09:49 +01:00
parent cb3229876b
commit 6ef502ecb2
15 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
level_generator/terrain_level_generator.cpp
View File

@ -37,7 +37,7 @@ TerrainLevelGenerator::~TerrainLevelGenerator() {
} }
void TerrainLevelGenerator::_bind_methods() { 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); ClassDB::bind_method(D_METHOD("generate_chunk", "chunk"), &TerrainLevelGenerator::generate_chunk);
} }

22
library/terrain_library.cpp
View File

@ -489,7 +489,7 @@ void TerrainLibrary::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "initialized", PROPERTY_HINT_NONE, "", 0), "set_initialized", "get_initialized"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "initialized", PROPERTY_HINT_NONE, "", 0), "set_initialized", "get_initialized");
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_supports_caching")); //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_supports_caching"));
#else #else
GDVIRTUAL_BIND(_supports_caching); GDVIRTUAL_BIND(_supports_caching);
#endif #endif
@ -498,15 +498,15 @@ void TerrainLibrary::_bind_methods() {
ClassDB::bind_method(D_METHOD("supports_caching"), &TerrainLibrary::supports_caching); ClassDB::bind_method(D_METHOD("supports_caching"), &TerrainLibrary::supports_caching);
#if VERSION_MAJOR < 4 #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 #else
GDVIRTUAL_BIND(_setup_material_albedo, "material_index", "texture"); GDVIRTUAL_BIND(_setup_material_albedo, "material_index", "texture");
#endif #endif
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
BIND_VMETHOD(MethodInfo("_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); //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(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_unref", PropertyInfo(Variant::INT, "key")));
#else #else
GDVIRTUAL_BIND(_material_cache_get_key, "chunk", "texture"); GDVIRTUAL_BIND(_material_cache_get_key, "chunk", "texture");
GDVIRTUAL_BIND(_material_cache_get, "key"); 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"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "materials", PROPERTY_HINT_NONE, "17/17:Material", PROPERTY_USAGE_DEFAULT, "Material"), "materials_set", "materials_get");
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
BIND_VMETHOD(MethodInfo("_liquid_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); //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(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_unref", PropertyInfo(Variant::INT, "key")));
#else #else
GDVIRTUAL_BIND(_liquid_material_cache_get_key, "chunk", "texture"); GDVIRTUAL_BIND(_liquid_material_cache_get_key, "chunk", "texture");
GDVIRTUAL_BIND(_liquid_material_cache_get, "key"); 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"); 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 #if VERSION_MAJOR < 4
BIND_VMETHOD(MethodInfo("_prop_material_cache_get_key", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); //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(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_unref", PropertyInfo(Variant::INT, "key")));
#else #else
GDVIRTUAL_BIND(_prop_material_cache_get_key, "chunk", "texture"); GDVIRTUAL_BIND(_prop_material_cache_get_key, "chunk", "texture");
GDVIRTUAL_BIND(_prop_material_cache_get, "key"); GDVIRTUAL_BIND(_prop_material_cache_get, "key");

2
library/terrain_library_merger.cpp
View File

@ -359,7 +359,7 @@ void TerrainLibraryMerger::_setup_material_albedo(const int material_index, cons
} }
if (shmat.is_valid()) { if (shmat.is_valid()) {
shmat->set_shader_param("texture_albedo", texture); shmat->set_shader_parameter("texture_albedo", texture);
} }
} }
} }

4
library/terrain_library_merger_pcm.cpp
View File

@ -38,7 +38,7 @@ SOFTWARE.
#include "../defines.h" #include "../defines.h"
#include "../world/default/terrain_chunk_default.h" #include "../world/default/terrain_chunk_default.h"
#include "core/hashfuncs.h" #include "core/templates/hashfuncs.h"
#include "core/message_queue.h" #include "core/message_queue.h"
#include "terrain_material_cache_pcm.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()) { if (shmat.is_valid()) {
shmat->set_shader_param("texture_albedo", texture); shmat->set_shader_parameter("texture_albedo", texture);
} }
} }
*/ */

2
library/terrain_material_cache.cpp
View File

@ -287,7 +287,7 @@ void TerrainMaterialCache::_bind_methods() {
ClassDB::bind_method(D_METHOD("dec_ref_count"), &TerrainMaterialCache::dec_ref_count); ClassDB::bind_method(D_METHOD("dec_ref_count"), &TerrainMaterialCache::dec_ref_count);
#if VERSION_MAJOR < 4 #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 #else
GDVIRTUAL_BIND(_setup_material_albedo, "texture"); GDVIRTUAL_BIND(_setup_material_albedo, "texture");
#endif #endif

2
library/terrain_material_cache_pcm.cpp
View File

@ -173,7 +173,7 @@ void TerrainMaterialCachePCM::_setup_material_albedo(Ref<Texture> texture) {
Ref<ShaderMaterial> shmat = m; Ref<ShaderMaterial> shmat = m;
if (shmat.is_valid()) { if (shmat.is_valid()) {
shmat->set_shader_param("texture_albedo", texture); shmat->set_shader_parameter("texture_albedo", texture);
} }
} }
} }

8
meshers/terrain_mesher.cpp
View File

@ -966,9 +966,9 @@ TerrainMesher::~TerrainMesher() {
void TerrainMesher::_bind_methods() { void TerrainMesher::_bind_methods() {
#if VERSION_MAJOR < 4 #if VERSION_MAJOR < 4
BIND_VMETHOD(MethodInfo("_add_chunk", 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_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("_bake_liquid_colors", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk")));
#else #else
GDVIRTUAL_BIND(_add_chunk, "chunk"); GDVIRTUAL_BIND(_add_chunk, "chunk");
GDVIRTUAL_BIND(_bake_colors, "chunk"); GDVIRTUAL_BIND(_bake_colors, "chunk");
@ -1036,7 +1036,7 @@ void TerrainMesher::_bind_methods() {
#endif #endif
#if VERSION_MAJOR < 4 #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 #else
GDVIRTUAL_BIND(_add_mesher, "mesher"); GDVIRTUAL_BIND(_add_mesher, "mesher");
#endif #endif

1
nodes/terrain_light_node.h
View File

@ -37,7 +37,6 @@ SOFTWARE.
class TerrainLightNode : public Spatial { class TerrainLightNode : public Spatial {
GDCLASS(TerrainLightNode, Spatial); GDCLASS(TerrainLightNode, Spatial);
OBJ_CATEGORY("Props");
public: public:
//make it turn into a normal light if voxelman isn't present? //make it turn into a normal light if voxelman isn't present?

2
world/default/terrain_world_default.cpp
View File

@ -345,7 +345,7 @@ void TerrainWorldDefault::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_num_lods", "value"), &TerrainWorldDefault::set_num_lods); 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"); 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);
ClassDB::bind_method(D_METHOD("_update_lods"), &TerrainWorldDefault::_update_lods); ClassDB::bind_method(D_METHOD("_update_lods"), &TerrainWorldDefault::_update_lods);

10
world/jobs/terrain_job.cpp
View File

@ -318,8 +318,8 @@ TerrainJob::~TerrainJob() {
} }
void TerrainJob::_bind_methods() { void TerrainJob::_bind_methods() {
BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta"))); //BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta")));
BIND_VMETHOD(MethodInfo("_physics_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("get_build_phase_type"), &TerrainJob::get_build_phase_type);
ClassDB::bind_method(D_METHOD("set_build_phase_type", "value"), &TerrainJob::set_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); 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("_reset"), &TerrainJob::_reset); ClassDB::bind_method(D_METHOD("_reset"), &TerrainJob::_reset);
ClassDB::bind_method(D_METHOD("_execute"), &TerrainJob::_execute); 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);
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_do", "just_check"), &TerrainJob::should_do, DEFVAL(false));
ClassDB::bind_method(D_METHOD("should_return"), &TerrainJob::should_return); 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); ClassDB::bind_method(D_METHOD("execute"), &TerrainJob::execute);
ADD_SIGNAL(MethodInfo("completed")); ADD_SIGNAL(MethodInfo("completed"));

4
world/jobs/terrain_mesher_job_step.cpp
View File

@ -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("get_simplification_step_ratio"), &TerrainMesherJobStep::get_simplification_step_ratio);
ClassDB::bind_method(D_METHOD("set_simplification_step_ratio", "value"), &TerrainMesherJobStep::set_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("get_simplification_steps"), &TerrainMesherJobStep::get_simplification_steps);
ClassDB::bind_method(D_METHOD("set_simplification_steps", "value"), &TerrainMesherJobStep::set_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("get_simplification_agressiveness"), &TerrainMesherJobStep::get_simplification_agressiveness);
ClassDB::bind_method(D_METHOD("set_simplification_agressiveness", "value"), &TerrainMesherJobStep::set_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 #endif
BIND_ENUM_CONSTANT(TYPE_NORMAL); BIND_ENUM_CONSTANT(TYPE_NORMAL);

34
world/terrain_chunk.cpp
View File

@ -1285,31 +1285,31 @@ void TerrainChunk::_get_property_list(List<PropertyInfo> *p_list) const {
void TerrainChunk::_bind_methods() { void TerrainChunk::_bind_methods() {
ADD_SIGNAL(MethodInfo("mesh_generation_finished", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk"))); 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_lights"));
BIND_VMETHOD(MethodInfo("_bake_light", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight"))); //BIND_VMETHOD(MethodInfo("_bake_light", PropertyInfo(Variant::OBJECT, "light", PROPERTY_HINT_RESOURCE_TYPE, "TerrainLight")));
BIND_VMETHOD(MethodInfo("_clear_baked_lights")); //BIND_VMETHOD(MethodInfo("_clear_baked_lights"));
ClassDB::bind_method(D_METHOD("bake_lights"), &TerrainChunk::bake_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("bake_light", "light"), &TerrainChunk::bake_light);
ClassDB::bind_method(D_METHOD("clear_baked_lights"), &TerrainChunk::clear_baked_lights); ClassDB::bind_method(D_METHOD("clear_baked_lights"), &TerrainChunk::clear_baked_lights);
BIND_VMETHOD(MethodInfo("_enter_tree")); //BIND_VMETHOD(MethodInfo("_enter_tree"));
BIND_VMETHOD(MethodInfo("_exit_tree")); //BIND_VMETHOD(MethodInfo("_exit_tree"));
BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta"))); //BIND_VMETHOD(MethodInfo("_process", PropertyInfo(Variant::REAL, "delta")));
BIND_VMETHOD(MethodInfo("_physics_process", PropertyInfo(Variant::REAL, "delta"))); //BIND_VMETHOD(MethodInfo("_physics_process", PropertyInfo(Variant::REAL, "delta")));
BIND_VMETHOD(MethodInfo("_world_transform_changed")); //BIND_VMETHOD(MethodInfo("_world_transform_changed"));
BIND_VMETHOD(MethodInfo("_visibility_changed", PropertyInfo(Variant::BOOL, "visible"))); //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_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("_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_process", PropertyInfo(Variant::REAL, "delta")));
BIND_VMETHOD(MethodInfo("_generation_physics_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("enter_tree"), &TerrainChunk::enter_tree);
ClassDB::bind_method(D_METHOD("exit_tree"), &TerrainChunk::exit_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("collider_remove", "index"), &TerrainChunk::collider_remove);
ClassDB::bind_method(D_METHOD("colliders_clear"), &TerrainChunk::colliders_clear); 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);
ClassDB::bind_method(D_METHOD("_build"), &TerrainChunk::_build); ClassDB::bind_method(D_METHOD("_build"), &TerrainChunk::_build);

2
world/terrain_environment_data.cpp
View File

@ -86,7 +86,7 @@ TerrainEnvironmentData::~TerrainEnvironmentData() {
void TerrainEnvironmentData::_bind_methods() { void TerrainEnvironmentData::_bind_methods() {
#if VERSION_MAJOR < 4 #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 #else
GDVIRTUAL_BIND(_setup, "world_environment", "primary_light", "secondary_light"); GDVIRTUAL_BIND(_setup, "world_environment", "primary_light", "secondary_light");
#endif #endif

2
world/terrain_structure.cpp
View File

@ -83,7 +83,7 @@ TerrainStructure::~TerrainStructure() {
void TerrainStructure::_bind_methods() { void TerrainStructure::_bind_methods() {
#if VERSION_MAJOR < 4 #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 #else
GDVIRTUAL_BIND(_write_to_chunk, "chunk"); GDVIRTUAL_BIND(_write_to_chunk, "chunk");
#endif #endif

14
world/terrain_world.cpp
View File

@ -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"); 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 #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 #else
GDVIRTUAL_BIND(_chunk_added, "chunk"); GDVIRTUAL_BIND(_chunk_added, "chunk");
#endif #endif
@ -1196,11 +1196,11 @@ void TerrainWorld::_bind_methods() {
ADD_SIGNAL(MethodInfo("generation_finished")); ADD_SIGNAL(MethodInfo("generation_finished"));
#if VERSION_MAJOR < 4 #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(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("_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("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerrainChunk")));
#else #else
GDVIRTUAL_BIND(_generation_finished); GDVIRTUAL_BIND(_generation_finished);
GDVIRTUAL_BIND(_create_chunk, "chunk", "x", "z", "chunk", "ret"); 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); 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 #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 #else
GDVIRTUAL_BIND(_get_channel_index_info, "channel_type", "ret"); GDVIRTUAL_BIND(_get_channel_index_info, "channel_type", "ret");
#endif #endif
@ -1250,7 +1250,7 @@ void TerrainWorld::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_editor_camera"), &TerrainWorld::get_editor_camera); ClassDB::bind_method(D_METHOD("get_editor_camera"), &TerrainWorld::get_editor_camera);
#if VERSION_MAJOR < 4 #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::BOOL, "mode_add"),
PropertyInfo(Variant::VECTOR3, "hit_position"), PropertyInfo(Variant::VECTOR3, "hit_position"),
PropertyInfo(Variant::VECTOR3, "hit_normal"), PropertyInfo(Variant::VECTOR3, "hit_normal"),