Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-10 13:52:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved from the TERRAMAN_2D_PRESENT define to the module system's equivalent define aswell.

Browse Source
This commit is contained in:
Relintai 2022-10-05 15:19:59 +02:00
parent 7357a4f65c
commit 029a6671b4
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/props_2d/SCsub
View File

@ -6,9 +6,6 @@ module_env = env.Clone()
import version import version
if os.path.isdir('../terraman_2d'):
module_env.Append(CPPDEFINES=['TERRAMAN_2D_PRESENT'])
sources = [ sources = [
"register_types.cpp", "register_types.cpp",

2
modules/props_2d/prop_2d_mesher.cpp
View File

@ -871,7 +871,7 @@ void Prop2DMesher::bake_colors_lights() {
} }
} }
#ifdef TERRAMAN_2D_PRESENT #ifdef MODULE_TERRAMAN_2D_ENABLED
void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights) { void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights) {
/* /*
ERR_FAIL_COND(node == NULL); ERR_FAIL_COND(node == NULL);

4
modules/props_2d/prop_2d_mesher.h
View File

@ -41,7 +41,7 @@ SOFTWARE.
#include "../mesh_data_resource/mesh_data_resource.h" #include "../mesh_data_resource/mesh_data_resource.h"
#endif #endif
#ifdef TERRAMAN_2D_PRESENT #ifdef MODULE_TERRAMAN_2D_ENABLED
#include "../terraman_2d/data/terrain_2d_light.h" #include "../terraman_2d/data/terrain_2d_light.h"
#endif #endif
@ -149,7 +149,7 @@ public:
void bake_colors_lights_rao(); void bake_colors_lights_rao();
void bake_colors_lights(); void bake_colors_lights();
#ifdef TERRAMAN_2D_PRESENT #ifdef MODULE_TERRAMAN_2D_ENABLED
void bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights); void bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights);
#endif #endif