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

Fix compile without dependencies.

Browse Source
This commit is contained in:
Relintai 2020-04-06 22:35:30 +02:00
parent b03cbf18f7
commit ccd54e340b
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SCsub
View File

@ -10,6 +10,9 @@ if os.path.isdir('../entity_spell_system'):
if os.path.isdir('../voxelman'):
module_env.Append(CPPDEFINES=['VOXELMAN_PRESENT'])
if os.path.isdir('../fastnoise'):
module_env.Append(CPPDEFINES=['FASTNOISE_PRESENT'])
sources = [
"register_types.cpp",

6
data/planet_data.cpp
View File

@ -50,6 +50,7 @@ void PlanetData::set_level_range(Vector2 value) {
_level_range = value;
}
#ifdef FASTNOISE_PRESENT
Ref<FastnoiseNoiseParams> PlanetData::get_humidity_noise_params() {
return _humidity_noise_params;
}
@ -63,6 +64,7 @@ Ref<FastnoiseNoiseParams> PlanetData::get_temperature_noise_params() {
void PlanetData::set_temperature_noise_params(Ref<FastnoiseNoiseParams> value) {
_temperature_noise_params = value;
}
#endif
//Biomes
Ref<BiomeData> PlanetData::get_biome_data(const int index) const {
@ -226,8 +228,10 @@ PlanetData::PlanetData() {
_id = 0;
}
PlanetData::~PlanetData() {
#ifdef FASTNOISE_PRESENT
_humidity_noise_params.unref();
_temperature_noise_params.unref();
#endif
_biome_datas.clear();
@ -255,6 +259,7 @@ void PlanetData::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_level_range", "value"), &PlanetData::set_level_range);
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "level_range"), "set_level_range", "get_level_range");
#ifdef FASTNOISE_PRESENT
ClassDB::bind_method(D_METHOD("get_humidity_noise_params"), &PlanetData::get_humidity_noise_params);
ClassDB::bind_method(D_METHOD("set_humidity_noise_params", "value"), &PlanetData::set_humidity_noise_params);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "humidity_noise_params", PROPERTY_HINT_RESOURCE_TYPE, "FastnoiseNoiseParams"), "set_humidity_noise_params", "get_humidity_noise_params");
@ -262,6 +267,7 @@ void PlanetData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_temperature_noise_params"), &PlanetData::get_temperature_noise_params);
ClassDB::bind_method(D_METHOD("set_temperature_noise_params", "value"), &PlanetData::set_temperature_noise_params);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "temperature_noise_params", PROPERTY_HINT_RESOURCE_TYPE, "FastnoiseNoiseParams"), "set_temperature_noise_params", "get_temperature_noise_params");
#endif
//Biomes
ClassDB::bind_method(D_METHOD("get_biome_data", "index"), &PlanetData::get_biome_data);

7
data/planet_data.h
View File

@ -27,7 +27,9 @@ SOFTWARE.
#include "core/script_language.h"
#include "core/ustring.h"
#ifdef FASTNOISE_PRESENT
#include "../../fastnoise/fastnoise_noise_params.h"
#endif
#include "../data/biome_data.h"
#include "../main/planet.h"
@ -53,11 +55,13 @@ public:
Vector2 get_level_range();
void set_level_range(Vector2 value);
#ifdef FASTNOISE_PRESENT
Ref<FastnoiseNoiseParams> get_humidity_noise_params();
void set_humidity_noise_params(Ref<FastnoiseNoiseParams> value);
Ref<FastnoiseNoiseParams> get_temperature_noise_params();
void set_temperature_noise_params(Ref<FastnoiseNoiseParams> value);
#endif
//Biomes
Ref<BiomeData> get_biome_data(const int index) const;
@ -115,8 +119,11 @@ private:
Vector2 _level_range;
#ifdef FASTNOISE_PRESENT
Ref<FastnoiseNoiseParams> _humidity_noise_params;
Ref<FastnoiseNoiseParams> _temperature_noise_params;
#endif
Vector<Ref<BiomeData> > _biome_datas;
#ifdef VOXELMAN_PRESENT

2
main/biome.cpp
View File

@ -198,7 +198,7 @@ void Biome::setup_library(Ref<Resource> library) {
}
}
void Biome::generate_chunk(Ref<VoxelChunk> chunk, bool spawn_mobs) {
void Biome::generate_chunk(Ref<Resource> chunk, bool spawn_mobs) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_generate_chunk")) {

2
main/biome.h
View File

@ -96,7 +96,7 @@ public:
void setup_library(Ref<VoxelmanLibrary> library);
void _setup_library(Ref<VoxelmanLibrary> library);
#else
void generate_chunk(Ref<Reource> chunk, bool spawn_mobs);
void generate_chunk(Ref<Resource> chunk, bool spawn_mobs);
void setup_library(Ref<Resource> library);
#endif