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

Removed the CALL macros.

Browse Source
This commit is contained in:
Relintai 2022-03-18 10:56:48 +01:00
parent 4050779e1f
commit 7b1eadb465
12 changed files with 48 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/terraman/defines.h
View File

@ -16,31 +16,4 @@
arr_into.push_back(e); \
}
#define CALL(func, ...) \
call(#func, ##__VA_ARGS__);
#define RETURN_CALL(ret_type, func) \
return call(#func);
#define RETURN_CALLP(ret_type, func, ...) \
return call(#func, ##__VA_ARGS__);
#define GET_CALL(ret_type, ret_var, func) \
ret_var = call(#func);
#define GET_CALLP(ret_type, ret_var, func, ...) \
ret_var = call(#func, ##__VA_ARGS__);
#define RETURN_CALLD(ret_type, def_val, func) \
return call(#func);
#define RETURN_CALLPD(ret_type, def_val, func, ...) \
return call(#func, ##__VA_ARGS__);
#define GET_CALLD(ret_type, def_val, ret_var, func) \
ret_var = call(#func);
#define GET_CALLPD(ret_type, def_val, ret_var, func, ...) \
return call(#func, ##__VA_ARGS__);
#endif

22
modules/terraman/library/terrain_library.cpp
View File

@ -40,7 +40,7 @@ void TerrainLibrary::set_initialized(const bool value) {
}
bool TerrainLibrary::supports_caching() {
RETURN_CALLD(bool, false, _supports_caching);
return call("_supports_caching");
}
bool TerrainLibrary::_supports_caching() {
return false;
@ -68,14 +68,14 @@ Ref<Material> TerrainLibrary::material_lod_get(const int index) {
}
void TerrainLibrary::material_cache_get_key(Ref<TerrainChunk> chunk) {
CALL(_material_cache_get_key, chunk);
call("_material_cache_get_key", chunk);
}
void TerrainLibrary::_material_cache_get_key(Ref<TerrainChunk> chunk) {
}
Ref<TerrainMaterialCache> TerrainLibrary::material_cache_get(const int key) {
RETURN_CALLP(Ref<TerrainMaterialCache>, _material_cache_get, key);
return call("_material_cache_get", key);
}
Ref<TerrainMaterialCache> TerrainLibrary::_material_cache_get(const int key) {
@ -83,7 +83,7 @@ Ref<TerrainMaterialCache> TerrainLibrary::_material_cache_get(const int key) {
}
void TerrainLibrary::material_cache_unref(const int key) {
CALL(_material_cache_unref, key);
call("_material_cache_unref", key);
}
void TerrainLibrary::_material_cache_unref(const int key) {
}
@ -148,14 +148,14 @@ Ref<Material> TerrainLibrary::liquid_material_lod_get(const int index) {
}
void TerrainLibrary::liquid_material_cache_get_key(Ref<TerrainChunk> chunk) {
CALL(_liquid_material_cache_get_key, chunk);
call("_liquid_material_cache_get_key", chunk);
}
void TerrainLibrary::_liquid_material_cache_get_key(Ref<TerrainChunk> chunk) {
}
Ref<TerrainMaterialCache> TerrainLibrary::liquid_material_cache_get(const int key) {
RETURN_CALLP(Ref<TerrainMaterialCache>, _liquid_material_cache_get, key);
return call("_liquid_material_cache_get", key);
}
Ref<TerrainMaterialCache> TerrainLibrary::_liquid_material_cache_get(const int key) {
@ -163,7 +163,7 @@ Ref<TerrainMaterialCache> TerrainLibrary::_liquid_material_cache_get(const int k
}
void TerrainLibrary::liquid_material_cache_unref(const int key) {
CALL(_liquid_material_cache_unref, key);
call("_liquid_material_cache_unref", key);
}
void TerrainLibrary::_liquid_material_cache_unref(const int key) {
}
@ -228,14 +228,14 @@ Ref<Material> TerrainLibrary::prop_material_lod_get(const int index) {
}
void TerrainLibrary::prop_material_cache_get_key(Ref<TerrainChunk> chunk) {
CALL(_prop_material_cache_get_key, chunk);
call("_prop_material_cache_get_key", chunk);
}
void TerrainLibrary::_prop_material_cache_get_key(Ref<TerrainChunk> chunk) {
}
Ref<TerrainMaterialCache> TerrainLibrary::prop_material_cache_get(const int key) {
RETURN_CALLP(Ref<TerrainMaterialCache>, _prop_material_cache_get, key);
return call("_prop_material_cache_get", key);
}
Ref<TerrainMaterialCache> TerrainLibrary::_prop_material_cache_get(const int key) {
@ -243,7 +243,7 @@ Ref<TerrainMaterialCache> TerrainLibrary::_prop_material_cache_get(const int key
}
void TerrainLibrary::prop_material_cache_unref(const int key) {
CALL(_prop_material_cache_unref, key);
call("_prop_material_cache_unref", key);
}
void TerrainLibrary::_prop_material_cache_unref(const int key) {
}
@ -342,7 +342,7 @@ void TerrainLibrary::refresh_rects() {
void TerrainLibrary::setup_material_albedo(int material_index, Ref<Texture> texture) {
if (has_method("_setup_material_albedo")) {
CALL(_setup_material_albedo, material_index, texture);
call("_setup_material_albedo", material_index, texture);
}
}

8
modules/terraman/meshers/terrain_mesher.cpp
View File

@ -430,7 +430,7 @@ void TerrainMesher::add_chunk(Ref<TerrainChunk> chunk) {
ERR_FAIL_COND(!has_method("_add_chunk"));
ERR_FAIL_COND(!chunk.is_valid());
CALL(_add_chunk, chunk);
call("_add_chunk", chunk);
}
#ifdef MESH_DATA_RESOURCE_PRESENT
@ -529,7 +529,7 @@ void TerrainMesher::add_mesh_data_resource_transform_colored(Ref<MeshDataResourc
#endif
void TerrainMesher::add_mesher(const Ref<TerrainMesher> &mesher) {
CALL(_add_mesher, mesher);
call("_add_mesher", mesher);
}
void TerrainMesher::_add_mesher(const Ref<TerrainMesher> &mesher) {
int orig_size = _vertices.size();
@ -553,7 +553,7 @@ void TerrainMesher::bake_colors(Ref<TerrainChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_bake_colors")) {
CALL(_bake_colors, chunk);
call("_bake_colors", chunk);
}
}
@ -561,7 +561,7 @@ void TerrainMesher::bake_liquid_colors(Ref<TerrainChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_bake_liquid_colors")) {
CALL(_bake_liquid_colors, chunk);
call("_bake_liquid_colors", chunk);
}
}

2
modules/terraman/world/terrain_environment_data.cpp
View File

@ -64,7 +64,7 @@ void TerrainEnvironmentData::set_indirect_energy(const int index, const float va
void TerrainEnvironmentData::setup(WorldEnvironment *world_environment, DirectionalLight *primary_light, DirectionalLight *secondary_light) {
if (has_method("_setup")) {
CALL(_setup, world_environment, primary_light, secondary_light);
call("_setup", world_environment, primary_light, secondary_light);
}
}
void TerrainEnvironmentData::setup_bind(Node *world_environment, Node *primary_light, Node *secondary_light) {

2
modules/terraman/world/terrain_structure.cpp
View File

@ -67,7 +67,7 @@ void TerrainStructure::write_to_chunk(Ref<TerrainChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_write_to_chunk")) {
CALL(_write_to_chunk, chunk);
call("_write_to_chunk", chunk);
}
}

14
modules/terraman/world/terrain_world.cpp
View File

@ -271,7 +271,7 @@ void TerrainWorld::chunk_add(Ref<TerrainChunk> chunk, const int x, const int z)
chunk->enter_tree();
if (has_method("_chunk_added")) {
CALL(_chunk_added, chunk);
call("_chunk_added", chunk);
}
emit_signal("chunk_added", chunk);
@ -388,7 +388,7 @@ Ref<TerrainChunk> TerrainWorld::chunk_get_or_create(int x, int z) {
Ref<TerrainChunk> TerrainWorld::chunk_create(const int x, const int z) {
Ref<TerrainChunk> c;
GET_CALLP(Ref<TerrainChunk>, c, _create_chunk, x, z, Ref<TerrainChunk>());
c = call("_create_chunk", x, z, Ref<TerrainChunk>());
generation_queue_add_to(c);
@ -434,10 +434,10 @@ void TerrainWorld::chunk_generate(Ref<TerrainChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_prepare_chunk_for_generation")) {
CALL(_prepare_chunk_for_generation, chunk);
call("_prepare_chunk_for_generation", chunk);
}
CALL(_generate_chunk, chunk);
call("_generate_chunk", chunk);
chunk->build();
}
@ -848,11 +848,11 @@ Ref<TerrainChunk> TerrainWorld::get_or_create_chunk_at_world_position(const Vect
}
void TerrainWorld::set_voxel_with_tool(const bool mode_add, const Vector3 hit_position, const Vector3 hit_normal, const int selected_voxel, const int isolevel) {
CALL(_set_voxel_with_tool, mode_add, hit_position, hit_normal, selected_voxel, isolevel);
call("_set_voxel_with_tool", mode_add, hit_position, hit_normal, selected_voxel, isolevel);
}
int TerrainWorld::get_channel_index_info(const TerrainWorld::ChannelTypeInfo channel_type) {
RETURN_CALLP(int, _get_channel_index_info, channel_type);
return call("_get_channel_index_info", channel_type);
}
Spatial *TerrainWorld::get_editor_camera() {
@ -979,7 +979,7 @@ void TerrainWorld::_notification(int p_what) {
if (_is_priority_generation && _generation_queue.empty() && _generating.empty()) {
_is_priority_generation = false;
CALL(_generation_finished);
call("_generation_finished");
emit_signal("generation_finished");

27
modules/terraman_2d/defines.h
View File

@ -16,31 +16,4 @@
arr_into.push_back(e); \
}
#define CALL(func, ...) \
call(#func, ##__VA_ARGS__);
#define RETURN_CALL(ret_type, func) \
return call(#func);
#define RETURN_CALLP(ret_type, func, ...) \
return call(#func, ##__VA_ARGS__);
#define GET_CALL(ret_type, ret_var, func) \
ret_var = call(#func);
#define GET_CALLP(ret_type, ret_var, func, ...) \
ret_var = call(#func, ##__VA_ARGS__);
#define RETURN_CALLD(ret_type, def_val, func) \
return call(#func);
#define RETURN_CALLPD(ret_type, def_val, func, ...) \
return call(#func, ##__VA_ARGS__);
#define GET_CALLD(ret_type, def_val, ret_var, func) \
ret_var = call(#func);
#define GET_CALLPD(ret_type, def_val, ret_var, func, ...) \
return call(#func, ##__VA_ARGS__);
#endif

22
modules/terraman_2d/library/terrain_2d_library.cpp
View File

@ -42,7 +42,7 @@ void Terrain2DLibrary::set_initialized(const bool value) {
}
bool Terrain2DLibrary::supports_caching() {
RETURN_CALLD(bool, false, _supports_caching);
return call("_supports_caching");
}
bool Terrain2DLibrary::_supports_caching() {
return false;
@ -74,14 +74,14 @@ void Terrain2DLibrary::prop_texture_set(const Ref<Texture> &value) {
//Materials
void Terrain2DLibrary::material_cache_get_key(Ref<Terrain2DChunk> chunk) {
CALL(_material_cache_get_key, chunk);
call("_material_cache_get_key", chunk);
}
void Terrain2DLibrary::_material_cache_get_key(Ref<Terrain2DChunk> chunk) {
}
Ref<Terrain2DMaterialCache> Terrain2DLibrary::material_cache_get(const int key) {
RETURN_CALLP(Ref<Terrain2DMaterialCache>, _material_cache_get, key);
return call("_material_cache_get", key);
}
Ref<Terrain2DMaterialCache> Terrain2DLibrary::_material_cache_get(const int key) {
@ -89,7 +89,7 @@ Ref<Terrain2DMaterialCache> Terrain2DLibrary::_material_cache_get(const int key)
}
void Terrain2DLibrary::material_cache_unref(const int key) {
CALL(_material_cache_unref, key);
call("_material_cache_unref", key);
}
void Terrain2DLibrary::_material_cache_unref(const int key) {
}
@ -104,14 +104,14 @@ void Terrain2DLibrary::material_set(const Ref<Material> &value) {
//Liquid Materials
void Terrain2DLibrary::liquid_material_cache_get_key(Ref<Terrain2DChunk> chunk) {
CALL(_liquid_material_cache_get_key, chunk);
call("_liquid_material_cache_get_key", chunk);
}
void Terrain2DLibrary::_liquid_material_cache_get_key(Ref<Terrain2DChunk> chunk) {
}
Ref<Terrain2DMaterialCache> Terrain2DLibrary::liquid_material_cache_get(const int key) {
RETURN_CALLP(Ref<Terrain2DMaterialCache>, _liquid_material_cache_get, key);
return call("_liquid_material_cache_get", key);
}
Ref<Terrain2DMaterialCache> Terrain2DLibrary::_liquid_material_cache_get(const int key) {
@ -119,7 +119,7 @@ Ref<Terrain2DMaterialCache> Terrain2DLibrary::_liquid_material_cache_get(const i
}
void Terrain2DLibrary::liquid_material_cache_unref(const int key) {
CALL(_liquid_material_cache_unref, key);
call("_liquid_material_cache_unref", key);
}
void Terrain2DLibrary::_liquid_material_cache_unref(const int key) {
}
@ -135,14 +135,14 @@ void Terrain2DLibrary::liquid_material_set(const Ref<Material> &value) {
//Prop2D Materials
void Terrain2DLibrary::prop_material_cache_get_key(Ref<Terrain2DChunk> chunk) {
CALL(_prop_material_cache_get_key, chunk);
call("_prop_material_cache_get_key", chunk);
}
void Terrain2DLibrary::_prop_material_cache_get_key(Ref<Terrain2DChunk> chunk) {
}
Ref<Terrain2DMaterialCache> Terrain2DLibrary::prop_material_cache_get(const int key) {
RETURN_CALLP(Ref<Terrain2DMaterialCache>, _prop_material_cache_get, key);
return call("_prop_material_cache_get", key);
}
Ref<Terrain2DMaterialCache> Terrain2DLibrary::_prop_material_cache_get(const int key) {
@ -150,7 +150,7 @@ Ref<Terrain2DMaterialCache> Terrain2DLibrary::_prop_material_cache_get(const int
}
void Terrain2DLibrary::prop_material_cache_unref(const int key) {
CALL(_prop_material_cache_unref, key);
call("_prop_material_cache_unref", key);
}
void Terrain2DLibrary::_prop_material_cache_unref(const int key) {
}
@ -225,7 +225,7 @@ void Terrain2DLibrary::refresh_rects() {
void Terrain2DLibrary::setup_material_albedo(int material_index, Ref<Texture> texture) {
if (has_method("_setup_material_albedo")) {
CALL(_setup_material_albedo, material_index, texture);
call("_setup_material_albedo", material_index, texture);
}
}

8
modules/terraman_2d/meshers/terrain_2d_mesher.cpp
View File

@ -479,7 +479,7 @@ void Terrain2DMesher::add_chunk(Ref<Terrain2DChunk> chunk) {
ERR_FAIL_COND(!has_method("_add_chunk"));
ERR_FAIL_COND(!chunk.is_valid());
CALL(_add_chunk, chunk);
call("_add_chunk", chunk);
}
#ifdef MESH_DATA_RESOURCE_PRESENT
@ -570,7 +570,7 @@ void Terrain2DMesher::add_mesh_data_resource_transform_colored(Ref<MeshDataResou
#endif
void Terrain2DMesher::add_mesher(const Ref<Terrain2DMesher> &mesher) {
CALL(_add_mesher, mesher);
call("_add_mesher", mesher);
}
void Terrain2DMesher::_add_mesher(const Ref<Terrain2DMesher> &mesher) {
int orig_size = _vertices.size();
@ -594,7 +594,7 @@ void Terrain2DMesher::bake_colors(Ref<Terrain2DChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_bake_colors")) {
CALL(_bake_colors, chunk);
call("_bake_colors", chunk);
}
}
@ -602,7 +602,7 @@ void Terrain2DMesher::bake_liquid_colors(Ref<Terrain2DChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_bake_liquid_colors")) {
CALL(_bake_liquid_colors, chunk);
call("_bake_liquid_colors", chunk);
}
}

2
modules/terraman_2d/world/terrain_2d_environment_data.cpp
View File

@ -64,7 +64,7 @@ void Terrain2DEnvironmentData::set_indirect_energy(const int index, const float
void Terrain2DEnvironmentData::setup(WorldEnvironment *world_environment, DirectionalLight *primary_light, DirectionalLight *secondary_light) {
if (has_method("_setup")) {
CALL(_setup, world_environment, primary_light, secondary_light);
call("_setup", world_environment, primary_light, secondary_light);
}
}
void Terrain2DEnvironmentData::setup_bind(Node *world_environment, Node *primary_light, Node *secondary_light) {

2
modules/terraman_2d/world/terrain_2d_structure.cpp
View File

@ -59,7 +59,7 @@ void Terrain2DStructure::write_to_chunk(Ref<Terrain2DChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_write_to_chunk")) {
CALL(_write_to_chunk, chunk);
call("_write_to_chunk", chunk);
}
}

14
modules/terraman_2d/world/terrain_2d_world.cpp
View File

@ -314,7 +314,7 @@ void Terrain2DWorld::chunk_add(Ref<Terrain2DChunk> chunk, const int x, const int
chunk->enter_tree();
if (has_method("_chunk_added")) {
CALL(_chunk_added, chunk);
call("_chunk_added", chunk);
}
emit_signal("chunk_added", chunk);
@ -437,7 +437,7 @@ Ref<Terrain2DChunk> Terrain2DWorld::chunk_get_or_create(int x, int z) {
Ref<Terrain2DChunk> Terrain2DWorld::chunk_create(const int x, const int z) {
Ref<Terrain2DChunk> c;
GET_CALLP(Ref<Terrain2DChunk>, c, _create_chunk, x, z, Ref<Terrain2DChunk>());
c = call("_create_chunk", x, z, Ref<Terrain2DChunk>());
generation_queue_add_to(c);
@ -491,10 +491,10 @@ void Terrain2DWorld::chunk_generate(Ref<Terrain2DChunk> chunk) {
ERR_FAIL_COND(!chunk.is_valid());
if (has_method("_prepare_chunk_for_generation")) {
CALL(_prepare_chunk_for_generation, chunk);
call("_prepare_chunk_for_generation", chunk);
}
CALL(_generate_chunk, chunk);
call("_generate_chunk", chunk);
chunk->build();
}
@ -913,11 +913,11 @@ Ref<Terrain2DChunk> Terrain2DWorld::get_or_create_chunk_at_world_position(const
}
void Terrain2DWorld::set_voxel_with_tool(const bool mode_add, const Vector2 hit_position, const int selected_voxel, const int isolevel) {
CALL(_set_voxel_with_tool, mode_add, hit_position, selected_voxel, isolevel);
call("_set_voxel_with_tool", mode_add, hit_position, selected_voxel, isolevel);
}
int Terrain2DWorld::get_channel_index_info(const Terrain2DWorld::ChannelTypeInfo channel_type) {
RETURN_CALLP(int, _get_channel_index_info, channel_type);
return call("_get_channel_index_info", channel_type);
}
Terrain2DWorld::Terrain2DWorld() {
@ -1035,7 +1035,7 @@ void Terrain2DWorld::_notification(int p_what) {
if (_is_priority_generation && _generation_queue.empty() && _generating.empty()) {
_is_priority_generation = false;
CALL(_generation_finished);
call("_generation_finished");
emit_signal("generation_finished");
update();