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

Removed the properties which gets created if voxelman isn't present. They weren't that useful.

Browse Source
This commit is contained in:
Relintai 2021-04-18 20:14:09 +02:00
parent d12ab222a2
commit e3080525e8
8 changed files with 0 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/biome.cpp
View File

@ -409,20 +409,6 @@ void Biome::_setup_library(Ref<VoxelmanLibrary> library) {
}
#endif
}
#else
void Biome::setup_library(Ref<Resource> library) {
if (has_method("_setup_library")) {
call("_setup_library", library);
}
}
void Biome::generate_chunk(Ref<Resource> chunk, bool spawn_mobs) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_generate_chunk")) {
call("_generate_chunk", chunk, spawn_mobs);
}
}
#endif
Biome::Biome() {
@ -465,9 +451,6 @@ void Biome::_bind_methods() {
BIND_VMETHOD(MethodInfo("_setup_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary")));
BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
BIND_VMETHOD(MethodInfo("_generate_stack", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::INT, "x"), PropertyInfo(Variant::INT, "z"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
#else
BIND_VMETHOD(MethodInfo("_setup_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Resource"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
#endif
ClassDB::bind_method(D_METHOD("instance", "seed"), &Biome::instance);
@ -481,8 +464,6 @@ void Biome::_bind_methods() {
ClassDB::bind_method(D_METHOD("generate_chunk", "chunk", "spawn_mobs"), &Biome::generate_chunk);
ClassDB::bind_method(D_METHOD("generate_stack", "chunk", "x", "z", "spawn_mobs"), &Biome::generate_stack);
#else
ClassDB::bind_method(D_METHOD("generate_chunk", "chunk", "spawn_mobs"), &Biome::generate_chunk);
#endif
ClassDB::bind_method(D_METHOD("get_current_seed"), &Biome::get_current_seed);

4
main/biome.h
View File

@ -136,10 +136,6 @@ public:
void setup_library(Ref<VoxelmanLibrary> library);
void _setup_library(Ref<VoxelmanLibrary> library);
#else
void generate_chunk(Ref<Resource> chunk, bool spawn_mobs);
void setup_library(Ref<Resource> library);
#endif
Biome();

6
main/dungeon.cpp
View File

@ -928,9 +928,6 @@ void Dungeon::_bind_methods() {
BIND_VMETHOD(MethodInfo("_setup_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary")));
BIND_VMETHOD(MethodInfo("_generate_structure", PropertyInfo(Variant::OBJECT, "structure", PROPERTY_HINT_RESOURCE_TYPE, "VoxelStructure"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
#else
BIND_VMETHOD(MethodInfo("_setup_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
#endif
ClassDB::bind_method(D_METHOD("instance", "seed"), &Dungeon::instance);
@ -944,9 +941,6 @@ void Dungeon::_bind_methods() {
ClassDB::bind_method(D_METHOD("generate_chunk", "chunk", "spawn_mobs"), &Dungeon::generate_chunk);
ClassDB::bind_method(D_METHOD("generate_structure", "structure", "spawn_mobs"), &Dungeon::generate_structure);
#else
ClassDB::bind_method(D_METHOD("setup_library", "library"), &Dungeon::setup_library);
ClassDB::bind_method(D_METHOD("generate_chunk", "chunk", "spawn_mobs"), &Dungeon::generate_chunk);
#endif
ClassDB::bind_method(D_METHOD("get_current_seed"), &Dungeon::get_current_seed);

3
main/dungeon.h
View File

@ -244,9 +244,6 @@ public:
void generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs);
void generate_structure(Ref<VoxelStructure> structure, bool spawn_mobs);
#else
void setup_library(Ref<Resource> library);
void generate_chunk(Ref<Resource> chunk, bool spawn_mobs);
#endif
Ref<Image> generate_map();

16
main/dungeon_room.cpp
View File

@ -444,22 +444,6 @@ void DungeonRoom::generate_room(Ref<VoxelStructure> structure, bool spawn_mobs)
call("_generate_room", structure, spawn_mobs);
}
}
#else
void DungeonRoom::setup_library(Ref<Resource> library) {
if (has_method("_setup_library")) {
call("_setup_library", library);
}
}
void DungeonRoom::generate_chunk(Ref<Resource> chunk, bool spawn_mobs) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_generate_chunk")) {
call("_generate_chunk", chunk, spawn_mobs);
}
}
#endif
DungeonRoom::DungeonRoom() {

3
main/dungeon_room.h
View File

@ -174,9 +174,6 @@ public:
void generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs);
void generate_room(Ref<VoxelStructure> structure, bool spawn_mobs);
#else
void setup_library(Ref<Resource> library);
void generate_chunk(Ref<Resource> chunk, bool spawn_mobs);
#endif
DungeonRoom();

19
main/planet.cpp
View File

@ -344,20 +344,6 @@ void Planet::generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs) {
}
}
#else
void Planet::setup_library(Ref<Resource> library) {
if (has_method("_setup_library")) {
call("_setup_library", library);
}
}
void Planet::generate_chunk(Ref<Resource> chunk, bool spawn_mobs) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_generate_chunk")) {
call("_generate_chunk", chunk, spawn_mobs);
}
}
#endif
Ref<Image> Planet::generate_map() {
@ -400,9 +386,6 @@ void Planet::_bind_methods() {
#ifdef VOXELMAN_PRESENT
BIND_VMETHOD(MethodInfo("_setup_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary")));
BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "VoxelChunk"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
#else
BIND_VMETHOD(MethodInfo("_setup_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "Resource")));
BIND_VMETHOD(MethodInfo("_generate_chunk", PropertyInfo(Variant::OBJECT, "chunk", PROPERTY_HINT_RESOURCE_TYPE, "Node"), PropertyInfo(Variant::BOOL, "spawn_mobs")));
#endif
ClassDB::bind_method(D_METHOD("instance", "seed"), &Planet::instance);
@ -413,8 +396,6 @@ void Planet::_bind_methods() {
#ifdef VOXELMAN_PRESENT
ClassDB::bind_method(D_METHOD("generate_chunk", "chunk"), &Planet::generate_chunk);
ClassDB::bind_method(D_METHOD("_setup_library", "library"), &Planet::_setup_library);
#else
ClassDB::bind_method(D_METHOD("generate_chunk", "chunk"), &Planet::generate_chunk);
#endif
ClassDB::bind_method(D_METHOD("setup_library", "library"), &Planet::setup_library);

3
main/planet.h
View File

@ -126,9 +126,6 @@ public:
void _setup_library(Ref<VoxelmanLibrary> library);
void generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs);
#else
void generate_chunk(Ref<Resource> chunk, bool spawn_mobs);
void setup_library(Ref<Resource> library);
#endif
Ref<Image> generate_map();