Relintai/world_generator
1
0
Fork 0
mirror of https://github.com/Relintai/world_generator.git synced 2025-02-20 17:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add "p_" prefix to the virtual _instance()'s parameters, as in gdscript seed, and instance are both seen as methods.

Browse Source
This commit is contained in:
Relintai 2020-07-21 22:19:25 +02:00
parent a1b988e154
commit cf3c6db8c4
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/biome.cpp
View File

@ -460,8 +460,8 @@ Biome::~Biome() {
void Biome::_bind_methods() {
BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Biome"),
"_instance",
PropertyInfo(Variant::INT, "seed"),
PropertyInfo(Variant::OBJECT, "instance", PROPERTY_HINT_RESOURCE_TYPE, "Biome")));
PropertyInfo(Variant::INT, "p_seed"),
PropertyInfo(Variant::OBJECT, "p_instance", PROPERTY_HINT_RESOURCE_TYPE, "Biome")));
BIND_VMETHOD(MethodInfo("_setup"));
@ -475,7 +475,7 @@ void Biome::_bind_methods() {
#endif
ClassDB::bind_method(D_METHOD("instance", "seed"), &Biome::instance);
ClassDB::bind_method(D_METHOD("_instance", "seed", "instance"), &Biome::_instance);
ClassDB::bind_method(D_METHOD("_instance", "p_seed", "p_instance"), &Biome::_instance);
ClassDB::bind_method(D_METHOD("setup"), &Biome::setup);
ClassDB::bind_method(D_METHOD("setup_library", "library"), &Biome::setup_library);

6
main/dungeon.cpp
View File

@ -711,8 +711,8 @@ Dungeon::~Dungeon() {
void Dungeon::_bind_methods() {
BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Dungeon"),
"_instance",
PropertyInfo(Variant::INT, "seed"),
PropertyInfo(Variant::OBJECT, "instance", PROPERTY_HINT_RESOURCE_TYPE, "Dungeon")));
PropertyInfo(Variant::INT, "p_seed"),
PropertyInfo(Variant::OBJECT, "p_instance", PROPERTY_HINT_RESOURCE_TYPE, "Dungeon")));
BIND_VMETHOD(MethodInfo("_setup"));
@ -726,7 +726,7 @@ void Dungeon::_bind_methods() {
#endif
ClassDB::bind_method(D_METHOD("instance", "seed"), &Dungeon::instance);
ClassDB::bind_method(D_METHOD("_instance", "seed", "instance"), &Dungeon::_instance);
ClassDB::bind_method(D_METHOD("_instance", "p_seed", "p_instance"), &Dungeon::_instance);
ClassDB::bind_method(D_METHOD("setup"), &Dungeon::setup);

6
main/dungeon_room.cpp
View File

@ -506,8 +506,8 @@ DungeonRoom::~DungeonRoom() {
void DungeonRoom::_bind_methods() {
BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "DungeonRoom"),
"_instance",
PropertyInfo(Variant::INT, "seed"),
PropertyInfo(Variant::OBJECT, "instance", PROPERTY_HINT_RESOURCE_TYPE, "DungeonRoom")));
PropertyInfo(Variant::INT, "p_seed"),
PropertyInfo(Variant::OBJECT, "p_instance", PROPERTY_HINT_RESOURCE_TYPE, "DungeonRoom")));
BIND_VMETHOD(MethodInfo("_setup"));
@ -521,7 +521,7 @@ void DungeonRoom::_bind_methods() {
#endif
ClassDB::bind_method(D_METHOD("instance", "seed"), &DungeonRoom::instance);
ClassDB::bind_method(D_METHOD("_instance", "seed", "instance"), &DungeonRoom::_instance);
ClassDB::bind_method(D_METHOD("_instance", "p_seed", "p_instance"), &DungeonRoom::_instance);
ClassDB::bind_method(D_METHOD("setup"), &DungeonRoom::setup);
ClassDB::bind_method(D_METHOD("setup_library", "library"), &DungeonRoom::setup_library);

8
main/planet.cpp
View File

@ -227,7 +227,7 @@ void Planet::set_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
Ref<Planet> Planet::instance(const int seed) {
if (has_method("_instance")) {
return call("_instance", seed);
return call("_instance", seed, Ref<Planet>());
}
return Ref<Planet>();
@ -391,8 +391,8 @@ Planet::~Planet() {
void Planet::_bind_methods() {
BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::OBJECT, "inst", PROPERTY_HINT_RESOURCE_TYPE, "Planet"),
"_instance",
PropertyInfo(Variant::INT, "seed"),
PropertyInfo(Variant::OBJECT, "instance", PROPERTY_HINT_RESOURCE_TYPE, "Planet")));
PropertyInfo(Variant::INT, "p_seed"),
PropertyInfo(Variant::OBJECT, "p_instance", PROPERTY_HINT_RESOURCE_TYPE, "Planet")));
BIND_VMETHOD(MethodInfo("_setup"));
@ -405,7 +405,7 @@ void Planet::_bind_methods() {
#endif
ClassDB::bind_method(D_METHOD("instance", "seed"), &Planet::instance);
ClassDB::bind_method(D_METHOD("_instance", "seed", "instance"), &Planet::_instance);
ClassDB::bind_method(D_METHOD("_instance", "p_seed", "p_instance"), &Planet::_instance);
ClassDB::bind_method(D_METHOD("setup"), &Planet::setup);