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

Update for the latest Voxelman.

Browse Source
This commit is contained in:
Relintai 2020-04-19 23:36:05 +02:00
parent 9d946f1623
commit 627a22dc2b
12 changed files with 0 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
data/biome_data.cpp
View File

@ -283,49 +283,6 @@ void BiomeData::set_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
}
}
//// Liquid Surfaces ////
Ref<VoxelSurface> BiomeData::get_liquid_voxel_surface(const int index) const {
ERR_FAIL_INDEX_V(index, _liquid_voxel_surfaces.size(), Ref<VoxelSurface>());
return _liquid_voxel_surfaces.get(index);
}
void BiomeData::set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.set(index, voxel_surface);
}
void BiomeData::add_liquid_surface(const Ref<VoxelSurface> voxel_surface) {
_liquid_voxel_surfaces.push_back(voxel_surface);
}
void BiomeData::remove_liquid_voxel_surface(const int index) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.remove(index);
}
int BiomeData::get_liquid_voxel_surface_count() const {
return _liquid_voxel_surfaces.size();
}
Vector<Variant> BiomeData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}
void BiomeData::set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
_liquid_voxel_surfaces.clear();
for (int i = 0; i < voxel_surfaces.size(); i++) {
Ref<EnvironmentData> voxel_surface = Ref<EnvironmentData>(voxel_surfaces[i]);
_liquid_voxel_surfaces.push_back(voxel_surface);
}
}
#endif
BiomeData::BiomeData() {
@ -423,16 +380,5 @@ void BiomeData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_voxel_surfaces"), &BiomeData::get_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_voxel_surfaces", "voxel_surfaces"), &BiomeData::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");
//Liquid Surfaces
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface", "index"), &BiomeData::get_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surface", "index", "data"), &BiomeData::set_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("add_liquid_surface", "voxel_surface"), &BiomeData::add_liquid_surface);
ClassDB::bind_method(D_METHOD("remove_liquid_voxel_surface", "index"), &BiomeData::remove_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface_count"), &BiomeData::get_liquid_voxel_surface_count);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surfaces"), &BiomeData::get_liquid_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surfaces", "voxel_surfaces"), &BiomeData::set_liquid_voxel_surfaces);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "liquid_voxel_surfaces", PROPERTY_HINT_NONE, "17/17:VoxelSurface", PROPERTY_USAGE_DEFAULT, "VoxelSurface"), "set_liquid_voxel_surfaces", "get_liquid_voxel_surfaces");
#endif
}

10
data/biome_data.h
View File

@ -114,16 +114,6 @@ public:
Vector<Variant> get_voxel_surfaces();
void set_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
//Liquid Surfaces
Ref<VoxelSurface> get_liquid_voxel_surface(const int index) const;
void set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface);
void add_liquid_surface(const Ref<VoxelSurface> voxel_surface);
void remove_liquid_voxel_surface(const int index);
int get_liquid_voxel_surface_count() const;
Vector<Variant> get_liquid_voxel_surfaces();
void set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
#endif
BiomeData();

54
data/dungeon_data.cpp
View File

@ -368,49 +368,6 @@ void DungeonData::set_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
}
}
//// Liquid Surfaces ////
Ref<VoxelSurface> DungeonData::get_liquid_voxel_surface(const int index) const {
ERR_FAIL_INDEX_V(index, _liquid_voxel_surfaces.size(), Ref<VoxelSurface>());
return _liquid_voxel_surfaces.get(index);
}
void DungeonData::set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.set(index, voxel_surface);
}
void DungeonData::add_liquid_surface(const Ref<VoxelSurface> voxel_surface) {
_liquid_voxel_surfaces.push_back(voxel_surface);
}
void DungeonData::remove_liquid_voxel_surface(const int index) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.remove(index);
}
int DungeonData::get_liquid_voxel_surface_count() const {
return _liquid_voxel_surfaces.size();
}
Vector<Variant> DungeonData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}
void DungeonData::set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
_liquid_voxel_surfaces.clear();
for (int i = 0; i < voxel_surfaces.size(); i++) {
Ref<EnvironmentData> voxel_surface = Ref<EnvironmentData>(voxel_surfaces[i]);
_liquid_voxel_surfaces.push_back(voxel_surface);
}
}
//Environments
Ref<EnvironmentData> DungeonData::get_environment_data(const int index) const {
ERR_FAIL_INDEX_V(index, _environment_datas.size(), Ref<EnvironmentData>());
@ -615,16 +572,5 @@ void DungeonData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_voxel_surfaces"), &DungeonData::get_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_voxel_surfaces", "voxel_surfaces"), &DungeonData::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");
//Liquid Surfaces
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface", "index"), &DungeonData::get_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surface", "index", "data"), &DungeonData::set_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("add_liquid_surface", "voxel_surface"), &DungeonData::add_liquid_surface);
ClassDB::bind_method(D_METHOD("remove_liquid_voxel_surface", "index"), &DungeonData::remove_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface_count"), &DungeonData::get_liquid_voxel_surface_count);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surfaces"), &DungeonData::get_liquid_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surfaces", "voxel_surfaces"), &DungeonData::set_liquid_voxel_surfaces);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "liquid_voxel_surfaces", PROPERTY_HINT_NONE, "17/17:VoxelSurface", PROPERTY_USAGE_DEFAULT, "VoxelSurface"), "set_liquid_voxel_surfaces", "get_liquid_voxel_surfaces");
#endif
}

9
data/dungeon_data.h
View File

@ -156,15 +156,6 @@ public:
Vector<Variant> get_voxel_surfaces();
void set_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
//Liquid Surfaces
Ref<VoxelSurface> get_liquid_voxel_surface(const int index) const;
void set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface);
void add_liquid_surface(const Ref<VoxelSurface> voxel_surface);
void remove_liquid_voxel_surface(const int index);
int get_liquid_voxel_surface_count() const;
Vector<Variant> get_liquid_voxel_surfaces();
void set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
#endif
DungeonData();

54
data/dungeon_room_data.cpp
View File

@ -219,49 +219,6 @@ void DungeonRoomData::set_voxel_surfaces(const Vector<Variant> &voxel_surfaces)
}
}
//// Liquid Surfaces ////
Ref<VoxelSurface> DungeonRoomData::get_liquid_voxel_surface(const int index) const {
ERR_FAIL_INDEX_V(index, _liquid_voxel_surfaces.size(), Ref<VoxelSurface>());
return _liquid_voxel_surfaces.get(index);
}
void DungeonRoomData::set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.set(index, voxel_surface);
}
void DungeonRoomData::add_liquid_surface(const Ref<VoxelSurface> voxel_surface) {
_liquid_voxel_surfaces.push_back(voxel_surface);
}
void DungeonRoomData::remove_liquid_voxel_surface(const int index) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.remove(index);
}
int DungeonRoomData::get_liquid_voxel_surface_count() const {
return _liquid_voxel_surfaces.size();
}
Vector<Variant> DungeonRoomData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}
void DungeonRoomData::set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
_liquid_voxel_surfaces.clear();
for (int i = 0; i < voxel_surfaces.size(); i++) {
Ref<EnvironmentData> voxel_surface = Ref<EnvironmentData>(voxel_surfaces[i]);
_liquid_voxel_surfaces.push_back(voxel_surface);
}
}
#endif
#ifdef ESS_PRESENT
@ -419,16 +376,5 @@ void DungeonRoomData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_voxel_surfaces"), &DungeonRoomData::get_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_voxel_surfaces", "voxel_surfaces"), &DungeonRoomData::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");
//Liquid Surfaces
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface", "index"), &DungeonRoomData::get_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surface", "index", "data"), &DungeonRoomData::set_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("add_liquid_surface", "voxel_surface"), &DungeonRoomData::add_liquid_surface);
ClassDB::bind_method(D_METHOD("remove_liquid_voxel_surface", "index"), &DungeonRoomData::remove_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface_count"), &DungeonRoomData::get_liquid_voxel_surface_count);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surfaces"), &DungeonRoomData::get_liquid_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surfaces", "voxel_surfaces"), &DungeonRoomData::set_liquid_voxel_surfaces);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "liquid_voxel_surfaces", PROPERTY_HINT_NONE, "17/17:VoxelSurface", PROPERTY_USAGE_DEFAULT, "VoxelSurface"), "set_liquid_voxel_surfaces", "get_liquid_voxel_surfaces");
#endif
}

9
data/dungeon_room_data.h
View File

@ -105,15 +105,6 @@ public:
Vector<Variant> get_voxel_surfaces();
void set_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
//Liquid Surfaces
Ref<VoxelSurface> get_liquid_voxel_surface(const int index) const;
void set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface);
void add_liquid_surface(const Ref<VoxelSurface> voxel_surface);
void remove_liquid_voxel_surface(const int index);
int get_liquid_voxel_surface_count() const;
Vector<Variant> get_liquid_voxel_surfaces();
void set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
#else
//TODO Create generic binds
#endif

53
data/planet_data.cpp
View File

@ -198,48 +198,6 @@ void PlanetData::set_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
}
}
//// Liquid Surfaces ////
Ref<VoxelSurface> PlanetData::get_liquid_voxel_surface(const int index) const {
ERR_FAIL_INDEX_V(index, _liquid_voxel_surfaces.size(), Ref<VoxelSurface>());
return _liquid_voxel_surfaces.get(index);
}
void PlanetData::set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.set(index, voxel_surface);
}
void PlanetData::add_liquid_surface(const Ref<VoxelSurface> voxel_surface) {
_liquid_voxel_surfaces.push_back(voxel_surface);
}
void PlanetData::remove_liquid_voxel_surface(const int index) {
ERR_FAIL_INDEX(index, _liquid_voxel_surfaces.size());
_liquid_voxel_surfaces.remove(index);
}
int PlanetData::get_liquid_voxel_surface_count() const {
return _liquid_voxel_surfaces.size();
}
Vector<Variant> PlanetData::get_liquid_voxel_surfaces() {
Vector<Variant> r;
for (int i = 0; i < _liquid_voxel_surfaces.size(); i++) {
#if VERSION_MAJOR < 4
r.push_back(_liquid_voxel_surfaces[i].get_ref_ptr());
#else
r.push_back(_liquid_voxel_surfaces[i]);
#endif
}
return r;
}
void PlanetData::set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces) {
_liquid_voxel_surfaces.clear();
for (int i = 0; i < voxel_surfaces.size(); i++) {
Ref<EnvironmentData> voxel_surface = Ref<EnvironmentData>(voxel_surfaces[i]);
_liquid_voxel_surfaces.push_back(voxel_surface);
}
}
#endif
PlanetData::PlanetData() {
@ -320,16 +278,5 @@ void PlanetData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_voxel_surfaces"), &PlanetData::get_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_voxel_surfaces", "voxel_surfaces"), &PlanetData::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");
//Liquid Surfaces
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface", "index"), &PlanetData::get_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surface", "index", "data"), &PlanetData::set_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("add_liquid_surface", "voxel_surface"), &PlanetData::add_liquid_surface);
ClassDB::bind_method(D_METHOD("remove_liquid_voxel_surface", "index"), &PlanetData::remove_liquid_voxel_surface);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surface_count"), &PlanetData::get_liquid_voxel_surface_count);
ClassDB::bind_method(D_METHOD("get_liquid_voxel_surfaces"), &PlanetData::get_liquid_voxel_surfaces);
ClassDB::bind_method(D_METHOD("set_liquid_voxel_surfaces", "voxel_surfaces"), &PlanetData::set_liquid_voxel_surfaces);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "liquid_voxel_surfaces", PROPERTY_HINT_NONE, "17/17:VoxelSurface", PROPERTY_USAGE_DEFAULT, "VoxelSurface"), "set_liquid_voxel_surfaces", "get_liquid_voxel_surfaces");
#endif
}

9
data/planet_data.h
View File

@ -94,15 +94,6 @@ public:
Vector<Variant> get_voxel_surfaces();
void set_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
//Liquid Surfaces
Ref<VoxelSurface> get_liquid_voxel_surface(const int index) const;
void set_liquid_voxel_surface(const int index, const Ref<VoxelSurface> voxel_surface);
void add_liquid_surface(const Ref<VoxelSurface> voxel_surface);
void remove_liquid_voxel_surface(const int index);
int get_liquid_voxel_surface_count() const;
Vector<Variant> get_liquid_voxel_surfaces();
void set_liquid_voxel_surfaces(const Vector<Variant> &voxel_surfaces);
#endif
PlanetData();

8
main/biome.cpp
View File

@ -169,14 +169,6 @@ void Biome::_setup_library(Ref<VoxelmanLibrary> library) {
}
}
for (int i = 0; i < _data->get_liquid_voxel_surface_count(); ++i) {
Ref<VoxelSurface> s = _data->get_liquid_voxel_surface(i);
if (s.is_valid()) {
library->add_liquid_surface(s);
}
}
for (int i = 0; i < _data->get_prop_data_count(); ++i) {
Ref<WorldGeneratorPropData> s = _data->get_prop_data(i);

8
main/dungeon.cpp
View File

@ -252,14 +252,6 @@ void Dungeon::_setup_library(Ref<VoxelmanLibrary> library) {
library->add_voxel_surface(s);
}
}
for (int i = 0; i < _data->get_liquid_voxel_surface_count(); ++i) {
Ref<VoxelSurface> s = _data->get_liquid_voxel_surface(i);
if (s.is_valid()) {
library->add_liquid_surface(s);
}
}
}
void Dungeon::generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs) {

8
main/dungeon_room.cpp
View File

@ -183,14 +183,6 @@ void DungeonRoom::_setup_library(Ref<VoxelmanLibrary> library) {
}
}
for (int i = 0; i < _data->get_liquid_voxel_surface_count(); ++i) {
Ref<VoxelSurface> s = _data->get_liquid_voxel_surface(i);
if (s.is_valid()) {
library->add_liquid_surface(s);
}
}
for (int i = 0; i < _data->get_prop_data_count(); ++i) {
Ref<WorldGeneratorPropData> s = _data->get_prop_data(i);

8
main/planet.cpp
View File

@ -127,14 +127,6 @@ void Planet::_setup_library(Ref<VoxelmanLibrary> library) {
library->add_voxel_surface(s);
}
}
for (int i = 0; i < _data->get_liquid_voxel_surface_count(); ++i) {
Ref<VoxelSurface> s = _data->get_liquid_voxel_surface(i);
if (s.is_valid()) {
library->add_liquid_surface(s);
}
}
}
void Planet::generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs) {