mirror of
https://github.com/Relintai/props.git
synced 2024-11-14 10:17:30 +01:00
Fix compile after recent changes in Terraman.
This commit is contained in:
parent
73dae84e9b
commit
ce369408ca
@ -1001,7 +1001,7 @@ void PropMesher::bake_colors_lights() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TERRAMAN_PRESENT
|
#ifdef TERRAMAN_PRESENT
|
||||||
void PropMesher::bake_lights(MeshInstance *node, Vector<Ref<TerraLight>> &lights) {
|
void PropMesher::bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &lights) {
|
||||||
ERR_FAIL_COND(node == NULL);
|
ERR_FAIL_COND(node == NULL);
|
||||||
|
|
||||||
Color darkColor(0, 0, 0, 1);
|
Color darkColor(0, 0, 0, 1);
|
||||||
@ -1018,7 +1018,7 @@ void PropMesher::bake_lights(MeshInstance *node, Vector<Ref<TerraLight>> &lights
|
|||||||
|
|
||||||
//calculate the lights value
|
//calculate the lights value
|
||||||
for (int i = 0; i < lights.size(); ++i) {
|
for (int i = 0; i < lights.size(); ++i) {
|
||||||
Ref<TerraLight> light = lights.get(i);
|
Ref<TerrainLight> light = lights.get(i);
|
||||||
|
|
||||||
Vector3 lightDir = light->get_world_position() - vertex;
|
Vector3 lightDir = light->get_world_position() - vertex;
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ using PoolVector = Vector<N>;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TERRAMAN_PRESENT
|
#ifdef TERRAMAN_PRESENT
|
||||||
#include "../terraman/data/terra_light.h"
|
#include "../terraman/data/terrain_light.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
class OpenSimplexNoise;
|
class OpenSimplexNoise;
|
||||||
@ -173,7 +173,7 @@ public:
|
|||||||
void bake_colors_lights();
|
void bake_colors_lights();
|
||||||
|
|
||||||
#ifdef TERRAMAN_PRESENT
|
#ifdef TERRAMAN_PRESENT
|
||||||
void bake_lights(MeshInstance *node, Vector<Ref<TerraLight>> &lights);
|
void bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &lights);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
Array build_mesh();
|
Array build_mesh();
|
||||||
|
Loading…
Reference in New Issue
Block a user