diff --git a/data/world_generator_prop_data.cpp b/data/world_generator_prop_data.cpp index 876d7aa..f9c4baa 100644 --- a/data/world_generator_prop_data.cpp +++ b/data/world_generator_prop_data.cpp @@ -54,9 +54,9 @@ WorldGeneratorPropData::~WorldGeneratorPropData() { } void WorldGeneratorPropData::_bind_methods() { - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "can"), "_can_spawn", PropertyInfo(Variant::INT, "seed"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "can"), "_can_spawn", PropertyInfo(Variant::INT, "seed"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "prop", PROPERTY_HINT_RESOURCE_TYPE, "PackedScene"), "_get_prop_seeded", PropertyInfo(Variant::INT, "seed"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "prop", PROPERTY_HINT_RESOURCE_TYPE, "PackedScene"), "_get_prop_seeded", PropertyInfo(Variant::INT, "seed"))); ClassDB::bind_method(D_METHOD("get_prop"), &WorldGeneratorPropData::get_prop); ClassDB::bind_method(D_METHOD("set_prop"), &WorldGeneratorPropData::set_prop); diff --git a/main/biome.cpp b/main/biome.cpp index ffc5d50..00bfbb2 100644 --- a/main/biome.cpp +++ b/main/biome.cpp @@ -601,12 +601,12 @@ Biome::~Biome() { } void Biome::_bind_methods() { - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Biome"), + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Biome"), "_instance", PropertyInfo(Variant::INT, "p_seed"), PropertyInfo(Variant::OBJECT, "p_instance", PROPERTY_HINT_RESOURCE_TYPE, "Biome"))); - BIND_VMETHOD(MethodInfo("_setup")); + //BIND_VMETHOD(MethodInfo("_setup")); ClassDB::bind_method(D_METHOD("instance", "seed"), &Biome::instance); ClassDB::bind_method(D_METHOD("_instance", "p_seed", "p_instance"), &Biome::_instance); @@ -665,9 +665,9 @@ void Biome::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "buildings", PROPERTY_HINT_NONE, "17/17:Building", PROPERTY_USAGE_DEFAULT, "Building"), "set_buildings", "get_buildings"); #ifdef VOXELMAN_PRESENT - BIND_VMETHOD(MethodInfo("_setup_voxel_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); - BIND_VMETHOD(MethodInfo("_generate_voxel_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); - BIND_VMETHOD(MethodInfo("_generate_voxel_stack", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "z"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_setup_voxel_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); + //BIND_VMETHOD(MethodInfo("_generate_voxel_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_generate_voxel_stack", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "z"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); ClassDB::bind_method(D_METHOD("setup_voxel_library", "library"), &Biome::setup_voxel_library); ClassDB::bind_method(D_METHOD("_setup_voxel_library", "library"), &Biome::_setup_voxel_library); @@ -703,9 +703,9 @@ void Biome::_bind_methods() { #endif #ifdef TERRAMAN_PRESENT - BIND_VMETHOD(MethodInfo("_setup_terra_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "TerramanLibrary"))); - BIND_VMETHOD(MethodInfo("_generate_terra_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); - BIND_VMETHOD(MethodInfo("_generate_terra_stack", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "z"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_setup_terra_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "TerramanLibrary"))); + //BIND_VMETHOD(MethodInfo("_generate_terra_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_generate_terra_stack", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "z"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); ClassDB::bind_method(D_METHOD("setup_terra_library", "library"), &Biome::setup_terra_library); ClassDB::bind_method(D_METHOD("_setup_terra_library", "library"), &Biome::_setup_terra_library); diff --git a/main/building.cpp b/main/building.cpp index 4eb5692..c3e221b 100644 --- a/main/building.cpp +++ b/main/building.cpp @@ -498,12 +498,12 @@ Building::~Building() { } void Building::_bind_methods() { - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Building"), + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Building"), "_instance", PropertyInfo(Variant::INT, "p_seed"), PropertyInfo(Variant::OBJECT, "p_instance", PROPERTY_HINT_RESOURCE_TYPE, "Building"))); - BIND_VMETHOD(MethodInfo("_setup")); + //BIND_VMETHOD(MethodInfo("_setup")); ClassDB::bind_method(D_METHOD("instance", "seed"), &Building::instance); ClassDB::bind_method(D_METHOD("_instance", "p_seed", "p_instance"), &Building::_instance); @@ -558,9 +558,9 @@ void Building::_bind_methods() { #endif #ifdef VOXELMAN_PRESENT - BIND_VMETHOD(MethodInfo("_setup_voxel_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); - BIND_VMETHOD(MethodInfo("_generate_voxel_structure", PropertyInfo(Variant::OBJECT, "structure", PROPERTY_HINT_RESOURCE_TYPE, "VoxelStructure"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); - BIND_VMETHOD(MethodInfo("_generate_voxel_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_setup_voxel_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); + //BIND_VMETHOD(MethodInfo("_generate_voxel_structure", PropertyInfo(Variant::OBJECT, "structure", PROPERTY_HINT_RESOURCE_TYPE, "VoxelStructure"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_generate_voxel_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); ClassDB::bind_method(D_METHOD("setup_voxel_library", "library"), &Building::setup_voxel_library); ClassDB::bind_method(D_METHOD("_setup_voxel_library", "library"), &Building::_setup_voxel_library); @@ -597,9 +597,9 @@ void Building::_bind_methods() { #endif #ifdef TERRAMAN_PRESENT - BIND_VMETHOD(MethodInfo("_setup_terra_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "TerramanLibrary"))); - BIND_VMETHOD(MethodInfo("_generate_terra_structure", PropertyInfo(Variant::OBJECT, "structure", PROPERTY_HINT_RESOURCE_TYPE, "TerraStructure"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); - BIND_VMETHOD(MethodInfo("_generate_terra_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_setup_terra_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "TerramanLibrary"))); + //BIND_VMETHOD(MethodInfo("_generate_terra_structure", PropertyInfo(Variant::OBJECT, "structure", PROPERTY_HINT_RESOURCE_TYPE, "TerraStructure"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_generate_terra_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); ClassDB::bind_method(D_METHOD("setup_terra_library", "library"), &Building::setup_terra_library); ClassDB::bind_method(D_METHOD("_setup_terra_library", "library"), &Building::_setup_terra_library); @@ -635,7 +635,7 @@ void Building::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "terra_surfaces", PROPERTY_HINT_NONE, "17/17:TerraSurface", PROPERTY_USAGE_DEFAULT, "TerraSurface"), "set_terra_surfaces", "get_terra_surfaces"); #endif - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, "Image"), "_generate_map")); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, "Image"), "_generate_map")); ClassDB::bind_method(D_METHOD("generate_map"), &Building::generate_map); } diff --git a/main/planet.cpp b/main/planet.cpp index 573788b..73d86b6 100644 --- a/main/planet.cpp +++ b/main/planet.cpp @@ -547,12 +547,12 @@ Planet::~Planet() { } void Planet::_bind_methods() { - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Planet"), + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Planet"), "_instance", PropertyInfo(Variant::INT, "p_seed"), PropertyInfo(Variant::OBJECT, "p_instance", PROPERTY_HINT_RESOURCE_TYPE, "Planet"))); - BIND_VMETHOD(MethodInfo("_setup")); + //BIND_VMETHOD(MethodInfo("_setup")); ClassDB::bind_method(D_METHOD("instance", "seed"), &Planet::instance); ClassDB::bind_method(D_METHOD("_instance", "p_seed", "p_instance"), &Planet::_instance); @@ -603,13 +603,13 @@ void Planet::_bind_methods() { ClassDB::bind_method(D_METHOD("set_buildings", "buildings"), &Planet::set_buildings); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "buildings", PROPERTY_HINT_NONE, "17/17:Building", PROPERTY_USAGE_DEFAULT, "Building"), "set_buildings", "get_buildings"); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, "Image"), "_generate_map")); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "image", PROPERTY_HINT_RESOURCE_TYPE, "Image"), "_generate_map")); ClassDB::bind_method(D_METHOD("generate_map"), &Planet::generate_map); #ifdef VOXELMAN_PRESENT - BIND_VMETHOD(MethodInfo("_setup_voxel_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); - BIND_VMETHOD(MethodInfo("_generate_voxel_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_setup_voxel_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); + //BIND_VMETHOD(MethodInfo("_generate_voxel_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); ClassDB::bind_method(D_METHOD("generate_voxel_chunk", "chunk"), &Planet::generate_voxel_chunk); ClassDB::bind_method(D_METHOD("_setup_voxel_library", "library"), &Planet::_setup_voxel_library); @@ -643,8 +643,8 @@ void Planet::_bind_methods() { #endif #ifdef TERRAMAN_PRESENT - BIND_VMETHOD(MethodInfo("_setup_terra_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "TerramanLibrary"))); - BIND_VMETHOD(MethodInfo("_generate_terra_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); + //BIND_VMETHOD(MethodInfo("_setup_terra_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "TerramanLibrary"))); + //BIND_VMETHOD(MethodInfo("_generate_terra_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "TerraChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs"))); ClassDB::bind_method(D_METHOD("generate_terra_chunk", "chunk"), &Planet::generate_terra_chunk); ClassDB::bind_method(D_METHOD("_setup_terra_library", "library"), &Planet::_setup_terra_library); diff --git a/world_generator.cpp b/world_generator.cpp index a366f05..33de454 100644 --- a/world_generator.cpp +++ b/world_generator.cpp @@ -82,7 +82,7 @@ WorldGenerator::~WorldGenerator() { } void WorldGenerator::_bind_methods() { - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "planet", PROPERTY_HINT_RESOURCE_TYPE, "Planet"), "_setup_planet", PropertyInfo(Variant::INT, "seed"))); + //BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "planet", PROPERTY_HINT_RESOURCE_TYPE, "Planet"), "_setup_planet", PropertyInfo(Variant::INT, "seed"))); ClassDB::bind_method(D_METHOD("setup_planet", "seed"), &WorldGenerator::setup_planet);