diff --git a/main/biome.cpp b/main/biome.cpp index 0d27269..0144f2a 100644 --- a/main/biome.cpp +++ b/main/biome.cpp @@ -202,7 +202,7 @@ Ref Biome::_instance(const int seed, Ref inst) { inst->set_temperature_range(_temperature_range); #ifdef VOXELMAN_PRESENT - inst->set_environment(_environment); + inst->set_voxel_environment(_voxel_environment); #endif for (int i = 0; i < _prop_datas.size(); ++i) { @@ -229,13 +229,13 @@ Ref Biome::_instance(const int seed, Ref inst) { #endif #ifdef VOXELMAN_PRESENT - for (int i = 0; i < _environment_datas.size(); ++i) { - Ref d = _environment_datas[i]; + for (int i = 0; i < _voxel_environment_datas.size(); ++i) { + Ref d = _voxel_environment_datas[i]; if (!d.is_valid()) continue; - inst->add_environment_data(d); + inst->add_voxel_environment_data(d); } for (int i = 0; i < _voxel_surfaces.size(); ++i) { @@ -258,53 +258,53 @@ void Biome::setup() { } #ifdef VOXELMAN_PRESENT -Ref Biome::get_environment() { - return _environment; +Ref Biome::get_voxel_environment() { + return _voxel_environment; } -void Biome::set_environment(Ref value) { - _environment = value; +void Biome::set_voxel_environment(Ref value) { + _voxel_environment = value; } //Environments -Ref Biome::get_environment_data(const int index) const { - ERR_FAIL_INDEX_V(index, _environment_datas.size(), Ref()); +Ref Biome::get_voxel_environment_data(const int index) const { + ERR_FAIL_INDEX_V(index, _voxel_environment_datas.size(), Ref()); - return _environment_datas.get(index); + return _voxel_environment_datas.get(index); } -void Biome::set_environment_data(const int index, const Ref environment_data) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void Biome::set_voxel_environment_data(const int index, const Ref environment_data) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.set(index, environment_data); + _voxel_environment_datas.set(index, environment_data); } -void Biome::add_environment_data(const Ref environment_data) { - _environment_datas.push_back(environment_data); +void Biome::add_voxel_environment_data(const Ref environment_data) { + _voxel_environment_datas.push_back(environment_data); } -void Biome::remove_environment_data(const int index) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void Biome::remove_voxel_environment_data(const int index) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.remove(index); + _voxel_environment_datas.remove(index); } -int Biome::get_environment_data_count() const { - return _environment_datas.size(); +int Biome::get_voxel_environment_data_count() const { + return _voxel_environment_datas.size(); } -Vector Biome::get_environment_datas() { +Vector Biome::get_voxel_environment_datas() { Vector r; - for (int i = 0; i < _environment_datas.size(); i++) { + for (int i = 0; i < _voxel_environment_datas.size(); i++) { #if VERSION_MAJOR < 4 - r.push_back(_environment_datas[i].get_ref_ptr()); + r.push_back(_voxel_environment_datas[i].get_ref_ptr()); #else - r.push_back(_environment_datas[i]); + r.push_back(_voxel_environment_datas[i]); #endif } return r; } -void Biome::set_environment_datas(const Vector &environment_datas) { - _environment_datas.clear(); +void Biome::set_voxel_environment_datas(const Vector &environment_datas) { + _voxel_environment_datas.clear(); for (int i = 0; i < environment_datas.size(); i++) { Ref environment_data = Ref(environment_datas[i]); - _environment_datas.push_back(environment_data); + _voxel_environment_datas.push_back(environment_data); } } @@ -351,30 +351,30 @@ void Biome::set_voxel_surfaces(const Vector &voxel_surfaces) { } } -void Biome::generate_chunk(Ref chunk, bool spawn_mobs) { +void Biome::generate_voxel_chunk(Ref chunk, bool spawn_mobs) { ERR_FAIL_COND(!chunk.is_valid()); - if (has_method("_generate_chunk")) { - call("_generate_chunk", chunk, spawn_mobs); + if (has_method("_generate_voxel_chunk")) { + call("_generate_voxel_chunk", chunk, spawn_mobs); } } -void Biome::generate_stack(Ref chunk, int x, int z, bool spawn_mobs) { +void Biome::generate_voxel_stack(Ref chunk, int x, int z, bool spawn_mobs) { ERR_FAIL_COND(!chunk.is_valid()); - if (has_method("_generate_stack")) { - call("_generate_stack", chunk, x, z, spawn_mobs); + if (has_method("_generate_voxel_stack")) { + call("_generate_voxel_stack", chunk, x, z, spawn_mobs); } } -void Biome::setup_library(Ref library) { +void Biome::setup_voxel_library(Ref library) { ERR_FAIL_COND(!library.is_valid()); - if (has_method("_setup_library")) { - call("_setup_library", library); + if (has_method("_setup_voxel_library")) { + call("_setup_voxel_library", library); } } -void Biome::_setup_library(Ref library) { +void Biome::_setup_voxel_library(Ref library) { for (int i = 0; i < get_voxel_surface_count(); ++i) { Ref s = get_voxel_surface(i); @@ -387,7 +387,7 @@ void Biome::_setup_library(Ref library) { Ref d = get_dungeon(i); if (d.is_valid()) { - d->setup_library(library); + d->setup_voxel_library(library); } } @@ -425,9 +425,9 @@ Biome::~Biome() { #endif #ifdef VOXELMAN_PRESENT - _environment.unref(); + _voxel_environment.unref(); - _environment_datas.clear(); + _voxel_environment_datas.clear(); _voxel_surfaces.clear(); #endif } @@ -444,7 +444,6 @@ void Biome::_bind_methods() { 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); ClassDB::bind_method(D_METHOD("get_current_seed"), &Biome::get_current_seed); ClassDB::bind_method(D_METHOD("set_current_seed", "value"), &Biome::set_current_seed); @@ -498,29 +497,30 @@ void Biome::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "dungeons", PROPERTY_HINT_NONE, "17/17:Dungeon", PROPERTY_USAGE_DEFAULT, "Dungeon"), "set_dungeons", "get_dungeons"); #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"))); - 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"))); + 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_library", "library"), &Biome::_setup_library); + 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); - 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); + ClassDB::bind_method(D_METHOD("generate_voxel_chunk", "chunk", "spawn_mobs"), &Biome::generate_voxel_chunk); + ClassDB::bind_method(D_METHOD("generate_voxel_stack", "chunk", "x", "z", "spawn_mobs"), &Biome::generate_voxel_stack); - ClassDB::bind_method(D_METHOD("get_environment"), &Biome::get_environment); - ClassDB::bind_method(D_METHOD("set_environment", "value"), &Biome::set_environment); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_environment", "get_environment"); + ClassDB::bind_method(D_METHOD("get_voxel_environment"), &Biome::get_voxel_environment); + ClassDB::bind_method(D_METHOD("set_voxel_environment", "value"), &Biome::set_voxel_environment); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_voxel_environment", "get_voxel_environment"); //Environments - ClassDB::bind_method(D_METHOD("get_environment_data", "index"), &Biome::get_environment_data); - ClassDB::bind_method(D_METHOD("set_environment_data", "index", "data"), &Biome::set_environment_data); - ClassDB::bind_method(D_METHOD("add_environment_data", "environment_data"), &Biome::add_environment_data); - ClassDB::bind_method(D_METHOD("remove_environment_data", "index"), &Biome::remove_environment_data); - ClassDB::bind_method(D_METHOD("get_environment_data_count"), &Biome::get_environment_data_count); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data", "index"), &Biome::get_voxel_environment_data); + ClassDB::bind_method(D_METHOD("set_voxel_environment_data", "index", "data"), &Biome::set_voxel_environment_data); + ClassDB::bind_method(D_METHOD("add_voxel_environment_data", "environment_data"), &Biome::add_voxel_environment_data); + ClassDB::bind_method(D_METHOD("remove_voxel_environment_data", "index"), &Biome::remove_voxel_environment_data); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data_count"), &Biome::get_voxel_environment_data_count); - ClassDB::bind_method(D_METHOD("get_environment_datas"), &Biome::get_environment_datas); - ClassDB::bind_method(D_METHOD("set_environment_datas", "environment_datas"), &Biome::set_environment_datas); - ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_environment_datas", "get_environment_datas"); + ClassDB::bind_method(D_METHOD("get_voxel_environment_datas"), &Biome::get_voxel_environment_datas); + ClassDB::bind_method(D_METHOD("set_voxel_environment_datas", "environment_datas"), &Biome::set_voxel_environment_datas); + ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_voxel_environment_datas", "get_voxel_environment_datas"); //Surfaces ClassDB::bind_method(D_METHOD("get_voxel_surface", "index"), &Biome::get_voxel_surface); diff --git a/main/biome.h b/main/biome.h index c216457..94bc3aa 100644 --- a/main/biome.h +++ b/main/biome.h @@ -104,18 +104,18 @@ public: #ifdef VOXELMAN_PRESENT //Environment - Ref get_environment(); - void set_environment(Ref value); + Ref get_voxel_environment(); + void set_voxel_environment(Ref value); //Environments - Ref get_environment_data(const int index) const; - void set_environment_data(const int index, const Ref environment_data); - void add_environment_data(const Ref environment_data); - void remove_environment_data(const int index); - int get_environment_data_count() const; + Ref get_voxel_environment_data(const int index) const; + void set_voxel_environment_data(const int index, const Ref environment_data); + void add_voxel_environment_data(const Ref environment_data); + void remove_voxel_environment_data(const int index); + int get_voxel_environment_data_count() const; - Vector get_environment_datas(); - void set_environment_datas(const Vector &environment_datas); + Vector get_voxel_environment_datas(); + void set_voxel_environment_datas(const Vector &environment_datas); //Surfaces Ref get_voxel_surface(const int index) const; @@ -127,11 +127,11 @@ public: Vector get_voxel_surfaces(); void set_voxel_surfaces(const Vector &voxel_surfaces); - void generate_chunk(Ref chunk, bool spawn_mobs); - void generate_stack(Ref chunk, int x, int z, bool spawn_mobs); + void generate_voxel_chunk(Ref chunk, bool spawn_mobs); + void generate_voxel_stack(Ref chunk, int x, int z, bool spawn_mobs); - void setup_library(Ref library); - void _setup_library(Ref library); + void setup_voxel_library(Ref library); + void _setup_voxel_library(Ref library); #endif Biome(); @@ -157,9 +157,9 @@ private: Vector > _dungeons; #ifdef VOXELMAN_PRESENT - Ref _environment; + Ref _voxel_environment; - Vector > _environment_datas; + Vector > _voxel_environment_datas; Vector > _voxel_surfaces; #endif }; diff --git a/main/dungeon.cpp b/main/dungeon.cpp index 8b1b219..23e2c2b 100644 --- a/main/dungeon.cpp +++ b/main/dungeon.cpp @@ -578,7 +578,7 @@ Ref Dungeon::_instance(const int seed, Ref inst) { inst->set_max_room_count(_max_room_count); #ifdef VOXELMAN_PRESENT - inst->set_environment(_environment); + inst->set_voxel_environment(_voxel_environment); #endif for (int i = 0; i < _dungeon_rooms.size(); ++i) { @@ -662,13 +662,13 @@ Ref Dungeon::_instance(const int seed, Ref inst) { #endif #ifdef VOXELMAN_PRESENT - for (int i = 0; i < _environment_datas.size(); ++i) { - Ref d = _environment_datas[i]; + for (int i = 0; i < _voxel_environment_datas.size(); ++i) { + Ref d = _voxel_environment_datas[i]; if (!d.is_valid()) continue; - inst->add_environment_data(d); + inst->add_voxel_environment_data(d); } for (int i = 0; i < _voxel_surfaces.size(); ++i) { @@ -692,11 +692,11 @@ void Dungeon::setup() { #ifdef VOXELMAN_PRESENT -Ref Dungeon::get_environment() { - return _environment; +Ref Dungeon::get_voxel_environment() { + return _voxel_environment; } -void Dungeon::set_environment(Ref value) { - _environment = value; +void Dungeon::set_voxel_environment(Ref value) { + _voxel_environment = value; } //// Surfaces //// @@ -743,55 +743,55 @@ void Dungeon::set_voxel_surfaces(const Vector &voxel_surfaces) { } //Environments -Ref Dungeon::get_environment_data(const int index) const { - ERR_FAIL_INDEX_V(index, _environment_datas.size(), Ref()); +Ref Dungeon::get_voxel_environment_data(const int index) const { + ERR_FAIL_INDEX_V(index, _voxel_environment_datas.size(), Ref()); - return _environment_datas.get(index); + return _voxel_environment_datas.get(index); } -void Dungeon::set_environment_data(const int index, const Ref environment_data) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void Dungeon::set_voxel_environment_data(const int index, const Ref environment_data) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.set(index, environment_data); + _voxel_environment_datas.set(index, environment_data); } -void Dungeon::add_environment_data(const Ref environment_data) { - _environment_datas.push_back(environment_data); +void Dungeon::add_voxel_environment_data(const Ref environment_data) { + _voxel_environment_datas.push_back(environment_data); } -void Dungeon::remove_environment_data(const int index) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void Dungeon::remove_voxel_environment_data(const int index) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.remove(index); + _voxel_environment_datas.remove(index); } -int Dungeon::get_environment_data_count() const { - return _environment_datas.size(); +int Dungeon::get_voxel_environment_data_count() const { + return _voxel_environment_datas.size(); } -Vector Dungeon::get_environment_datas() { +Vector Dungeon::get_voxel_environment_datas() { Vector r; - for (int i = 0; i < _environment_datas.size(); i++) { + for (int i = 0; i < _voxel_environment_datas.size(); i++) { #if VERSION_MAJOR < 4 - r.push_back(_environment_datas[i].get_ref_ptr()); + r.push_back(_voxel_environment_datas[i].get_ref_ptr()); #else - r.push_back(_environment_datas[i]); + r.push_back(_voxel_environment_datas[i]); #endif } return r; } -void Dungeon::set_environment_datas(const Vector &environment_datas) { - _environment_datas.clear(); +void Dungeon::set_voxel_environment_datas(const Vector &environment_datas) { + _voxel_environment_datas.clear(); for (int i = 0; i < environment_datas.size(); i++) { Ref environment_data = Ref(environment_datas[i]); - _environment_datas.push_back(environment_data); + _voxel_environment_datas.push_back(environment_data); } } -void Dungeon::setup_library(Ref library) { - if (has_method("_setup_library")) { - call("_setup_library", library); +void Dungeon::setup_voxel_library(Ref library) { + if (has_method("_setup_voxel_library")) { + call("_setup_voxel_library", library); } } -void Dungeon::_setup_library(Ref library) { +void Dungeon::_setup_voxel_library(Ref library) { for (int i = 0; i < get_voxel_surface_count(); ++i) { Ref s = get_voxel_surface(i); @@ -804,7 +804,7 @@ void Dungeon::_setup_library(Ref library) { Ref d = get_dungeon_corridor(i); if (d.is_valid()) { - d->setup_library(library); + d->setup_voxel_library(library); } } @@ -812,7 +812,7 @@ void Dungeon::_setup_library(Ref library) { Ref d = get_dungeon_end_room(i); if (d.is_valid()) { - d->setup_library(library); + d->setup_voxel_library(library); } } @@ -820,7 +820,7 @@ void Dungeon::_setup_library(Ref library) { Ref d = get_dungeon_room(i); if (d.is_valid()) { - d->setup_library(library); + d->setup_voxel_library(library); } } @@ -828,22 +828,22 @@ void Dungeon::_setup_library(Ref library) { Ref d = get_dungeon_start_room(i); if (d.is_valid()) { - d->setup_library(library); + d->setup_voxel_library(library); } } } -void Dungeon::generate_chunk(Ref chunk, bool spawn_mobs) { +void Dungeon::generate_voxel_chunk(Ref chunk, bool spawn_mobs) { ERR_FAIL_COND(!chunk.is_valid()); - if (has_method("_generate_chunk")) { - call("_generate_chunk", chunk, spawn_mobs); + if (has_method("_generate_voxel_chunk")) { + call("_generate_voxel_chunk", chunk, spawn_mobs); } } -void Dungeon::generate_structure(Ref structure, bool spawn_mobs) { - if (has_method("_generate_structure")) { - call("_generate_structure", structure, spawn_mobs); +void Dungeon::generate_voxel_structure(Ref structure, bool spawn_mobs) { + if (has_method("_generate_voxel_structure")) { + call("_generate_voxel_structure", structure, spawn_mobs); } } #endif @@ -889,9 +889,9 @@ Dungeon::~Dungeon() { #endif #ifdef VOXELMAN_PRESENT - _environment.unref(); + _voxel_environment.unref(); - _environment_datas.clear(); + _voxel_environment_datas.clear(); _voxel_surfaces.clear(); #endif } @@ -1090,31 +1090,31 @@ void Dungeon::_bind_methods() { #endif #ifdef VOXELMAN_PRESENT - 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"))); + 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_library", "library"), &Dungeon::setup_library); - ClassDB::bind_method(D_METHOD("_setup_library", "library"), &Dungeon::_setup_library); + ClassDB::bind_method(D_METHOD("setup_voxel_library", "library"), &Dungeon::setup_voxel_library); + ClassDB::bind_method(D_METHOD("_setup_voxel_library", "library"), &Dungeon::_setup_voxel_library); - 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); + ClassDB::bind_method(D_METHOD("generate_voxel_chunk", "chunk", "spawn_mobs"), &Dungeon::generate_voxel_chunk); + ClassDB::bind_method(D_METHOD("generate_voxel_structure", "structure", "spawn_mobs"), &Dungeon::generate_voxel_structure); //Environment - ClassDB::bind_method(D_METHOD("get_environment"), &Dungeon::get_environment); - ClassDB::bind_method(D_METHOD("set_environment", "value"), &Dungeon::set_environment); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_environment", "get_environment"); + ClassDB::bind_method(D_METHOD("get_voxel_environment"), &Dungeon::get_voxel_environment); + ClassDB::bind_method(D_METHOD("set_voxel_environment", "value"), &Dungeon::set_voxel_environment); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_voxel_environment", "get_voxel_environment"); //Environments - ClassDB::bind_method(D_METHOD("get_environment_data", "index"), &Dungeon::get_environment_data); - ClassDB::bind_method(D_METHOD("set_environment_data", "index", "data"), &Dungeon::set_environment_data); - ClassDB::bind_method(D_METHOD("add_environment_data", "environment_data"), &Dungeon::add_environment_data); - ClassDB::bind_method(D_METHOD("remove_environment_data", "index"), &Dungeon::remove_environment_data); - ClassDB::bind_method(D_METHOD("get_environment_data_count"), &Dungeon::get_environment_data_count); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data", "index"), &Dungeon::get_voxel_environment_data); + ClassDB::bind_method(D_METHOD("set_voxel_environment_data", "index", "data"), &Dungeon::set_voxel_environment_data); + ClassDB::bind_method(D_METHOD("add_voxel_environment_data", "environment_data"), &Dungeon::add_voxel_environment_data); + ClassDB::bind_method(D_METHOD("remove_voxel_environment_data", "index"), &Dungeon::remove_voxel_environment_data); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data_count"), &Dungeon::get_voxel_environment_data_count); - ClassDB::bind_method(D_METHOD("get_environment_datas"), &Dungeon::get_environment_datas); - ClassDB::bind_method(D_METHOD("set_environment_datas", "environment_datas"), &Dungeon::set_environment_datas); - ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_environment_datas", "get_environment_datas"); + ClassDB::bind_method(D_METHOD("get_voxel_environment_datas"), &Dungeon::get_voxel_environment_datas); + ClassDB::bind_method(D_METHOD("set_voxel_environment_datas", "environment_datas"), &Dungeon::set_voxel_environment_datas); + ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_voxel_environment_datas", "get_voxel_environment_datas"); //Surfaces ClassDB::bind_method(D_METHOD("get_voxel_surface", "index"), &Dungeon::get_voxel_surface); diff --git a/main/dungeon.h b/main/dungeon.h index 68bcfc5..c1339cd 100644 --- a/main/dungeon.h +++ b/main/dungeon.h @@ -209,18 +209,18 @@ public: #ifdef VOXELMAN_PRESENT //Environment - Ref get_environment(); - void set_environment(Ref value); + Ref get_voxel_environment(); + void set_voxel_environment(Ref value); //Environments - Ref get_environment_data(const int index) const; - void set_environment_data(const int index, const Ref environment_data); - void add_environment_data(const Ref environment_data); - void remove_environment_data(const int index); - int get_environment_data_count() const; + Ref get_voxel_environment_data(const int index) const; + void set_voxel_environment_data(const int index, const Ref environment_data); + void add_voxel_environment_data(const Ref environment_data); + void remove_voxel_environment_data(const int index); + int get_voxel_environment_data_count() const; - Vector get_environment_datas(); - void set_environment_datas(const Vector &environment_datas); + Vector get_voxel_environment_datas(); + void set_voxel_environment_datas(const Vector &environment_datas); //Surfaces Ref get_voxel_surface(const int index) const; @@ -232,11 +232,11 @@ public: Vector get_voxel_surfaces(); void set_voxel_surfaces(const Vector &voxel_surfaces); - void setup_library(Ref library); - void _setup_library(Ref library); + void setup_voxel_library(Ref library); + void _setup_voxel_library(Ref library); - void generate_chunk(Ref chunk, bool spawn_mobs); - void generate_structure(Ref structure, bool spawn_mobs); + void generate_voxel_chunk(Ref chunk, bool spawn_mobs); + void generate_voxel_structure(Ref structure, bool spawn_mobs); #endif Ref generate_map(); @@ -289,9 +289,9 @@ private: #endif #ifdef VOXELMAN_PRESENT - Ref _environment; + Ref _voxel_environment; - Vector > _environment_datas; + Vector > _voxel_environment_datas; Vector > _voxel_surfaces; #endif }; diff --git a/main/dungeon_room.cpp b/main/dungeon_room.cpp index 111faf5..b3207e1 100644 --- a/main/dungeon_room.cpp +++ b/main/dungeon_room.cpp @@ -246,7 +246,7 @@ Ref DungeonRoom::_instance(const int seed, Ref inst) { inst->set_max_sizez(_max_sizez); #ifdef VOXELMAN_PRESENT - inst->set_environment(_environment); + inst->set_voxel_environment(_voxel_environment); //don't //inst->set_structure(_structure); #endif @@ -266,13 +266,13 @@ Ref DungeonRoom::_instance(const int seed, Ref inst) { #endif #ifdef VOXELMAN_PRESENT - for (int i = 0; i < _environment_datas.size(); ++i) { - Ref d = _environment_datas[i]; + for (int i = 0; i < _voxel_environment_datas.size(); ++i) { + Ref d = _voxel_environment_datas[i]; if (!d.is_valid()) continue; - inst->add_environment_data(d); + inst->add_voxel_environment_data(d); } for (int i = 0; i < _voxel_surfaces.size(); ++i) { @@ -296,60 +296,60 @@ void DungeonRoom::setup() { #ifdef VOXELMAN_PRESENT -Ref DungeonRoom::get_environment() { - return _environment; +Ref DungeonRoom::get_voxel_environment() { + return _voxel_environment; } -void DungeonRoom::set_environment(Ref value) { - _environment = value; +void DungeonRoom::set_voxel_environment(Ref value) { + _voxel_environment = value; } -Ref DungeonRoom::get_structure() { - return _structure; +Ref DungeonRoom::get_voxel_structure() { + return _voxel_structure; } -void DungeonRoom::set_structure(Ref structure) { - _structure = structure; +void DungeonRoom::set_voxel_structure(Ref structure) { + _voxel_structure = structure; } //Environments -Ref DungeonRoom::get_environment_data(const int index) const { - ERR_FAIL_INDEX_V(index, _environment_datas.size(), Ref()); +Ref DungeonRoom::get_voxel_environment_data(const int index) const { + ERR_FAIL_INDEX_V(index, _voxel_environment_datas.size(), Ref()); - return _environment_datas.get(index); + return _voxel_environment_datas.get(index); } -void DungeonRoom::set_environment_data(const int index, const Ref environment_data) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void DungeonRoom::set_voxel_environment_data(const int index, const Ref environment_data) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.set(index, environment_data); + _voxel_environment_datas.set(index, environment_data); } -void DungeonRoom::add_environment_data(const Ref environment_data) { - _environment_datas.push_back(environment_data); +void DungeonRoom::add_voxel_environment_data(const Ref environment_data) { + _voxel_environment_datas.push_back(environment_data); } -void DungeonRoom::remove_environment_data(const int index) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void DungeonRoom::remove_voxel_environment_data(const int index) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.remove(index); + _voxel_environment_datas.remove(index); } -int DungeonRoom::get_environment_data_count() const { - return _environment_datas.size(); +int DungeonRoom::get_voxel_environment_data_count() const { + return _voxel_environment_datas.size(); } -Vector DungeonRoom::get_environment_datas() { +Vector DungeonRoom::get_voxel_environment_datas() { Vector r; - for (int i = 0; i < _environment_datas.size(); i++) { + for (int i = 0; i < _voxel_environment_datas.size(); i++) { #if VERSION_MAJOR < 4 - r.push_back(_environment_datas[i].get_ref_ptr()); + r.push_back(_voxel_environment_datas[i].get_ref_ptr()); #else - r.push_back(_environment_datas[i]); + r.push_back(_voxel_environment_datas[i]); #endif } return r; } -void DungeonRoom::set_environment_datas(const Vector &environment_datas) { - _environment_datas.clear(); +void DungeonRoom::set_voxel_environment_datas(const Vector &environment_datas) { + _voxel_environment_datas.clear(); for (int i = 0; i < environment_datas.size(); i++) { Ref environment_data = Ref(environment_datas[i]); - _environment_datas.push_back(environment_data); + _voxel_environment_datas.push_back(environment_data); } } @@ -396,13 +396,13 @@ void DungeonRoom::set_voxel_surfaces(const Vector &voxel_surfaces) { } } -void DungeonRoom::setup_library(Ref library) { - if (has_method("_setup_library")) { - call("_setup_library", library); +void DungeonRoom::setup_voxel_library(Ref library) { + if (has_method("_setup_voxel_library")) { + call("_setup_voxel_library", library); } } -void DungeonRoom::_setup_library(Ref library) { +void DungeonRoom::_setup_voxel_library(Ref library) { for (int i = 0; i < get_voxel_surface_count(); ++i) { Ref s = get_voxel_surface(i); @@ -425,17 +425,17 @@ void DungeonRoom::_setup_library(Ref library) { #endif } -void DungeonRoom::generate_chunk(Ref chunk, bool spawn_mobs) { +void DungeonRoom::generate_voxel_chunk(Ref chunk, bool spawn_mobs) { ERR_FAIL_COND(!chunk.is_valid()); - if (has_method("_generate_chunk")) { - call("_generate_chunk", chunk, spawn_mobs); + if (has_method("_generate_voxel_chunk")) { + call("_generate_voxel_chunk", chunk, spawn_mobs); } } -void DungeonRoom::generate_room(Ref structure, bool spawn_mobs) { - if (has_method("_generate_room")) { - call("_generate_room", structure, spawn_mobs); +void DungeonRoom::generate_voxel_room(Ref structure, bool spawn_mobs) { + if (has_method("_generate_voxel_room")) { + call("_generate_voxel_room", structure, spawn_mobs); } } #endif @@ -467,10 +467,10 @@ DungeonRoom::~DungeonRoom() { #endif #ifdef VOXELMAN_PRESENT - _environment.unref(); - _structure.unref(); + _voxel_environment.unref(); + _voxel_structure.unref(); - _environment_datas.clear(); + _voxel_environment_datas.clear(); _voxel_surfaces.clear(); #endif } @@ -487,7 +487,6 @@ void DungeonRoom::_bind_methods() { 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); ClassDB::bind_method(D_METHOD("get_current_seed"), &DungeonRoom::get_current_seed); ClassDB::bind_method(D_METHOD("set_current_seed", "value"), &DungeonRoom::set_current_seed); @@ -574,24 +573,24 @@ void DungeonRoom::_bind_methods() { #endif #ifdef VOXELMAN_PRESENT - ClassDB::bind_method(D_METHOD("get_environment"), &DungeonRoom::get_environment); - ClassDB::bind_method(D_METHOD("set_environment", "value"), &DungeonRoom::set_environment); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_environment", "get_environment"); + ClassDB::bind_method(D_METHOD("get_voxel_environment"), &DungeonRoom::get_voxel_environment); + ClassDB::bind_method(D_METHOD("set_voxel_environment", "value"), &DungeonRoom::set_voxel_environment); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_voxel_environment", "get_voxel_environment"); - ClassDB::bind_method(D_METHOD("get_structure"), &DungeonRoom::get_structure); - ClassDB::bind_method(D_METHOD("set_structure", "value"), &DungeonRoom::set_structure); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "structure", PROPERTY_HINT_RESOURCE_TYPE, "VoxelStructure"), "set_structure", "get_structure"); + ClassDB::bind_method(D_METHOD("get_voxel_structure"), &DungeonRoom::get_voxel_structure); + ClassDB::bind_method(D_METHOD("set_voxel_structure", "value"), &DungeonRoom::set_voxel_structure); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_structure", PROPERTY_HINT_RESOURCE_TYPE, "VoxelStructure"), "set_voxel_structure", "get_voxel_structure"); //Environments - ClassDB::bind_method(D_METHOD("get_environment_data", "index"), &DungeonRoom::get_environment_data); - ClassDB::bind_method(D_METHOD("set_environment_data", "index", "data"), &DungeonRoom::set_environment_data); - ClassDB::bind_method(D_METHOD("add_environment_data", "environment_data"), &DungeonRoom::add_environment_data); - ClassDB::bind_method(D_METHOD("remove_environment_data", "index"), &DungeonRoom::remove_environment_data); - ClassDB::bind_method(D_METHOD("get_environment_data_count"), &DungeonRoom::get_environment_data_count); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data", "index"), &DungeonRoom::get_voxel_environment_data); + ClassDB::bind_method(D_METHOD("set_voxel_environment_data", "index", "data"), &DungeonRoom::set_voxel_environment_data); + ClassDB::bind_method(D_METHOD("add_voxel_environment_data", "environment_data"), &DungeonRoom::add_voxel_environment_data); + ClassDB::bind_method(D_METHOD("remove_voxel_environment_data", "index"), &DungeonRoom::remove_voxel_environment_data); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data_count"), &DungeonRoom::get_voxel_environment_data_count); - ClassDB::bind_method(D_METHOD("get_environment_datas"), &DungeonRoom::get_environment_datas); - ClassDB::bind_method(D_METHOD("set_environment_datas", "environment_datas"), &DungeonRoom::set_environment_datas); - ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_environment_datas", "get_environment_datas"); + ClassDB::bind_method(D_METHOD("get_voxel_environment_datas"), &DungeonRoom::get_voxel_environment_datas); + ClassDB::bind_method(D_METHOD("set_voxel_environment_datas", "voxel_environment_datas"), &DungeonRoom::set_voxel_environment_datas); + ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_voxel_environment_datas", "get_voxel_environment_datas"); //Surfaces ClassDB::bind_method(D_METHOD("get_voxel_surface", "index"), &DungeonRoom::get_voxel_surface); @@ -604,14 +603,15 @@ void DungeonRoom::_bind_methods() { ClassDB::bind_method(D_METHOD("set_voxel_surfaces", "voxel_surfaces"), &DungeonRoom::set_voxel_surfaces); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_surfaces", PROPERTY_HINT_NONE, "17/17:VoxelSurface", PROPERTY_USAGE_DEFAULT, "VoxelSurface"), "set_voxel_surfaces", "get_voxel_surfaces"); - BIND_VMETHOD(MethodInfo("_setup_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); - BIND_VMETHOD(MethodInfo("_generate_room", 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"))); + BIND_VMETHOD(MethodInfo("_setup_voxel_library", PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "VoxelmanLibrary"))); + BIND_VMETHOD(MethodInfo("_generate_voxel_room", 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_library", "library"), &DungeonRoom::_setup_library); + ClassDB::bind_method(D_METHOD("setup_voxel_library", "library"), &DungeonRoom::setup_voxel_library); + ClassDB::bind_method(D_METHOD("_setup_voxel_library", "library"), &DungeonRoom::_setup_voxel_library); - ClassDB::bind_method(D_METHOD("generate_chunk", "chunk", "spawn_mobs"), &DungeonRoom::generate_chunk); - ClassDB::bind_method(D_METHOD("generate_room", "structure", "spawn_mobs"), &DungeonRoom::generate_room); + ClassDB::bind_method(D_METHOD("generate_voxel_chunk", "chunk", "spawn_mobs"), &DungeonRoom::generate_voxel_chunk); + ClassDB::bind_method(D_METHOD("generate_voxel_room", "structure", "spawn_mobs"), &DungeonRoom::generate_voxel_room); #endif diff --git a/main/dungeon_room.h b/main/dungeon_room.h index 6489340..05b066d 100644 --- a/main/dungeon_room.h +++ b/main/dungeon_room.h @@ -132,22 +132,22 @@ public: #ifdef VOXELMAN_PRESENT //Environment - Ref get_environment(); - void set_environment(Ref value); + Ref get_voxel_environment(); + void set_voxel_environment(Ref value); //Structure - Ref get_structure(); - void set_structure(Ref structure); + Ref get_voxel_structure(); + void set_voxel_structure(Ref structure); //Environments - Ref get_environment_data(const int index) const; - void set_environment_data(const int index, const Ref environment_data); - void add_environment_data(const Ref environment_data); - void remove_environment_data(const int index); - int get_environment_data_count() const; + Ref get_voxel_environment_data(const int index) const; + void set_voxel_environment_data(const int index, const Ref environment_data); + void add_voxel_environment_data(const Ref environment_data); + void remove_voxel_environment_data(const int index); + int get_voxel_environment_data_count() const; - Vector get_environment_datas(); - void set_environment_datas(const Vector &environment_datas); + Vector get_voxel_environment_datas(); + void set_voxel_environment_datas(const Vector &environment_datas); //Surfaces Ref get_voxel_surface(const int index) const; @@ -159,11 +159,11 @@ public: Vector get_voxel_surfaces(); void set_voxel_surfaces(const Vector &voxel_surfaces); - void setup_library(Ref library); - void _setup_library(Ref library); + void setup_voxel_library(Ref library); + void _setup_voxel_library(Ref library); - void generate_chunk(Ref chunk, bool spawn_mobs); - void generate_room(Ref structure, bool spawn_mobs); + void generate_voxel_chunk(Ref chunk, bool spawn_mobs); + void generate_voxel_room(Ref structure, bool spawn_mobs); #endif DungeonRoom(); @@ -200,10 +200,10 @@ private: #endif #ifdef VOXELMAN_PRESENT - Ref _environment; - Ref _structure; + Ref _voxel_environment; + Ref _voxel_structure; - Vector > _environment_datas; + Vector > _voxel_environment_datas; Vector > _voxel_surfaces; #endif }; diff --git a/main/planet.cpp b/main/planet.cpp index 1c0183f..5d953f2 100644 --- a/main/planet.cpp +++ b/main/planet.cpp @@ -145,7 +145,7 @@ Ref Planet::_instance(const int seed, Ref inst) { inst->set_level_range(_level_range); #ifdef VOXELMAN_PRESENT - inst->set_environment(_environment); + inst->set_voxel_environment(_voxel_environment); #endif for (int i = 0; i < _biomes.size(); ++i) { @@ -175,13 +175,13 @@ Ref Planet::_instance(const int seed, Ref inst) { #endif #ifdef VOXELMAN_PRESENT - for (int i = 0; i < _environment_datas.size(); ++i) { - Ref d = _environment_datas[i]; + for (int i = 0; i < _voxel_environment_datas.size(); ++i) { + Ref d = _voxel_environment_datas[i]; if (!d.is_valid()) continue; - inst->add_environment_data(d); + inst->add_voxel_environment_data(d); } for (int i = 0; i < _voxel_surfaces.size(); ++i) { @@ -210,53 +210,53 @@ Ref Planet::generate_map() { } #ifdef VOXELMAN_PRESENT -Ref Planet::get_environment() { - return _environment; +Ref Planet::get_voxel_environment() { + return _voxel_environment; } -void Planet::set_environment(Ref value) { - _environment = value; +void Planet::set_voxel_environment(Ref value) { + _voxel_environment = value; } //Environments -Ref Planet::get_environment_data(const int index) const { - ERR_FAIL_INDEX_V(index, _environment_datas.size(), Ref()); +Ref Planet::get_voxel_environment_data(const int index) const { + ERR_FAIL_INDEX_V(index, _voxel_environment_datas.size(), Ref()); - return _environment_datas.get(index); + return _voxel_environment_datas.get(index); } -void Planet::set_environment_data(const int index, const Ref environment_data) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void Planet::set_voxel_environment_data(const int index, const Ref environment_data) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.set(index, environment_data); + _voxel_environment_datas.set(index, environment_data); } -void Planet::add_environment_data(const Ref environment_data) { - _environment_datas.push_back(environment_data); +void Planet::add_voxel_environment_data(const Ref environment_data) { + _voxel_environment_datas.push_back(environment_data); } -void Planet::remove_environment_data(const int index) { - ERR_FAIL_INDEX(index, _environment_datas.size()); +void Planet::remove_voxel_environment_data(const int index) { + ERR_FAIL_INDEX(index, _voxel_environment_datas.size()); - _environment_datas.remove(index); + _voxel_environment_datas.remove(index); } -int Planet::get_environment_data_count() const { - return _environment_datas.size(); +int Planet::get_voxel_environment_data_count() const { + return _voxel_environment_datas.size(); } -Vector Planet::get_environment_datas() { +Vector Planet::get_voxel_environment_datas() { Vector r; - for (int i = 0; i < _environment_datas.size(); i++) { + for (int i = 0; i < _voxel_environment_datas.size(); i++) { #if VERSION_MAJOR < 4 - r.push_back(_environment_datas[i].get_ref_ptr()); + r.push_back(_voxel_environment_datas[i].get_ref_ptr()); #else - r.push_back(_environment_datas[i]); + r.push_back(_voxel_environment_datas[i]); #endif } return r; } -void Planet::set_environment_datas(const Vector &environment_datas) { - _environment_datas.clear(); +void Planet::set_voxel_environment_datas(const Vector &environment_datas) { + _voxel_environment_datas.clear(); for (int i = 0; i < environment_datas.size(); i++) { Ref environment_data = Ref(environment_datas[i]); - _environment_datas.push_back(environment_data); + _voxel_environment_datas.push_back(environment_data); } } @@ -303,15 +303,15 @@ void Planet::set_voxel_surfaces(const Vector &voxel_surfaces) { } } -void Planet::setup_library(Ref library) { +void Planet::setup_voxel_library(Ref library) { ERR_FAIL_COND(!library.is_valid()); - if (has_method("_setup_library")) { - call("_setup_library", library); + if (has_method("_setup_voxel_library")) { + call("_setup_voxel_library", library); } } -void Planet::_setup_library(Ref library) { +void Planet::_setup_voxel_library(Ref library) { for (int i = 0; i < get_voxel_surface_count(); ++i) { Ref s = get_voxel_surface(i); @@ -324,7 +324,7 @@ void Planet::_setup_library(Ref library) { Ref s = get_biome(i); if (s.is_valid()) { - s->setup_library(library); + s->setup_voxel_library(library); } } @@ -332,16 +332,16 @@ void Planet::_setup_library(Ref library) { Ref d = get_dungeon(i); if (d.is_valid()) { - d->setup_library(library); + d->setup_voxel_library(library); } } } -void Planet::generate_chunk(Ref chunk, bool spawn_mobs) { +void Planet::generate_voxel_chunk(Ref chunk, bool spawn_mobs) { ERR_FAIL_COND(!chunk.is_valid()); - if (has_method("_generate_chunk")) { - call("_generate_chunk", chunk, spawn_mobs); + if (has_method("_generate_voxel_chunk")) { + call("_generate_voxel_chunk", chunk, spawn_mobs); } } @@ -361,9 +361,9 @@ Planet::~Planet() { #endif #ifdef VOXELMAN_PRESENT - _environment.unref(); + _voxel_environment.unref(); - _environment_datas.clear(); + _voxel_environment_datas.clear(); _voxel_surfaces.clear(); #endif } @@ -381,8 +381,6 @@ void Planet::_bind_methods() { ClassDB::bind_method(D_METHOD("setup"), &Planet::setup); - ClassDB::bind_method(D_METHOD("setup_library", "library"), &Planet::setup_library); - ClassDB::bind_method(D_METHOD("get_id"), &Planet::get_id); ClassDB::bind_method(D_METHOD("set_id", "value"), &Planet::set_id); ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id"); @@ -431,23 +429,24 @@ void Planet::_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"))); - ClassDB::bind_method(D_METHOD("generate_chunk", "chunk"), &Planet::generate_chunk); - ClassDB::bind_method(D_METHOD("_setup_library", "library"), &Planet::_setup_library); + 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); + ClassDB::bind_method(D_METHOD("setup_voxel_library", "library"), &Planet::setup_voxel_library); - ClassDB::bind_method(D_METHOD("get_environment"), &Planet::get_environment); - ClassDB::bind_method(D_METHOD("set_environment", "value"), &Planet::set_environment); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_environment", "get_environment"); + ClassDB::bind_method(D_METHOD("get_voxel_environment"), &Planet::get_voxel_environment); + ClassDB::bind_method(D_METHOD("set_voxel_environment", "value"), &Planet::set_voxel_environment); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "voxel_environment", PROPERTY_HINT_RESOURCE_TYPE, "EnvironmentData"), "set_voxel_environment", "get_voxel_environment"); //Environments - ClassDB::bind_method(D_METHOD("get_environment_data", "index"), &Planet::get_environment_data); - ClassDB::bind_method(D_METHOD("set_environment_data", "index", "data"), &Planet::set_environment_data); - ClassDB::bind_method(D_METHOD("add_environment_data", "environment_data"), &Planet::add_environment_data); - ClassDB::bind_method(D_METHOD("remove_environment_data", "index"), &Planet::remove_environment_data); - ClassDB::bind_method(D_METHOD("get_environment_data_count"), &Planet::get_environment_data_count); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data", "index"), &Planet::get_voxel_environment_data); + ClassDB::bind_method(D_METHOD("set_voxel_environment_data", "index", "data"), &Planet::set_voxel_environment_data); + ClassDB::bind_method(D_METHOD("add_voxel_environment_data", "environment_data"), &Planet::add_voxel_environment_data); + ClassDB::bind_method(D_METHOD("remove_voxel_environment_data", "index"), &Planet::remove_voxel_environment_data); + ClassDB::bind_method(D_METHOD("get_voxel_environment_data_count"), &Planet::get_voxel_environment_data_count); - ClassDB::bind_method(D_METHOD("get_environment_datas"), &Planet::get_environment_datas); - ClassDB::bind_method(D_METHOD("set_environment_datas", "environment_datas"), &Planet::set_environment_datas); - ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_environment_datas", "get_environment_datas"); + ClassDB::bind_method(D_METHOD("get_voxel_environment_datas"), &Planet::get_voxel_environment_datas); + ClassDB::bind_method(D_METHOD("set_voxel_environment_datas", "environment_datas"), &Planet::set_voxel_environment_datas); + ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "voxel_environment_datas", PROPERTY_HINT_NONE, "17/17:EnvironmentData", PROPERTY_USAGE_DEFAULT, "EnvironmentData"), "set_voxel_environment_datas", "get_voxel_environment_datas"); //Surfaces ClassDB::bind_method(D_METHOD("get_voxel_surface", "index"), &Planet::get_voxel_surface); diff --git a/main/planet.h b/main/planet.h index 0f11112..b381c49 100644 --- a/main/planet.h +++ b/main/planet.h @@ -96,18 +96,18 @@ public: #ifdef VOXELMAN_PRESENT //Environment - Ref get_environment(); - void set_environment(Ref value); + Ref get_voxel_environment(); + void set_voxel_environment(Ref value); //Environments - Ref get_environment_data(const int index) const; - void set_environment_data(const int index, const Ref environment_data); - void add_environment_data(const Ref environment_data); - void remove_environment_data(const int index); - int get_environment_data_count() const; + Ref get_voxel_environment_data(const int index) const; + void set_voxel_environment_data(const int index, const Ref environment_data); + void add_voxel_environment_data(const Ref environment_data); + void remove_voxel_environment_data(const int index); + int get_voxel_environment_data_count() const; - Vector get_environment_datas(); - void set_environment_datas(const Vector &environment_datas); + Vector get_voxel_environment_datas(); + void set_voxel_environment_datas(const Vector &environment_datas); //Surfaces Ref get_voxel_surface(const int index) const; @@ -119,10 +119,10 @@ public: Vector get_voxel_surfaces(); void set_voxel_surfaces(const Vector &voxel_surfaces); - void setup_library(Ref library); - void _setup_library(Ref library); + void setup_voxel_library(Ref library); + void _setup_voxel_library(Ref library); - void generate_chunk(Ref chunk, bool spawn_mobs); + void generate_voxel_chunk(Ref chunk, bool spawn_mobs); #endif Planet(); @@ -146,9 +146,9 @@ private: #endif #ifdef VOXELMAN_PRESENT - Ref _environment; + Ref _voxel_environment; - Vector > _environment_datas; + Vector > _voxel_environment_datas; Vector > _voxel_surfaces; #endif };