Relintai/props_2d
1
0
Fork 0
mirror of https://github.com/Relintai/props_2d.git synced 2025-02-12 16:50:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Look for terraman 2d instead of just terraman.

Browse Source
This commit is contained in:
Relintai 2022-02-23 00:15:25 +01:00
parent 875f338a88
commit 8eaa94f0dc
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SCsub
View File

@ -15,8 +15,8 @@ if os.path.isdir('../texture_packer'):
has_texture_packer = True has_texture_packer = True
module_env.Append(CPPDEFINES=['TEXTURE_PACKER_PRESENT']) module_env.Append(CPPDEFINES=['TEXTURE_PACKER_PRESENT'])
if os.path.isdir('../terraman'): if os.path.isdir('../terraman_2d'):
module_env.Append(CPPDEFINES=['TERRAMAN_PRESENT']) module_env.Append(CPPDEFINES=['TERRAMAN_2D_PRESENT'])
if os.path.isdir('../mesh_utils'): if os.path.isdir('../mesh_utils'):
module_env.Append(CPPDEFINES=['MESH_UTILS_PRESENT']) module_env.Append(CPPDEFINES=['MESH_UTILS_PRESENT'])

15
prop_2d_mesher.cpp
View File

@ -951,8 +951,9 @@ void Prop2DMesher::bake_colors_lights() {
} }
} }
#ifdef TERRAMAN_PRESENT #ifdef TERRAMAN_2D_PRESENT
void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &lights) { void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights) {
/*
ERR_FAIL_COND(node == NULL); ERR_FAIL_COND(node == NULL);
Color darkColor(0, 0, 0, 1); Color darkColor(0, 0, 0, 1);
@ -992,15 +993,6 @@ void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &li
value *= light->get_size(); value *= light->get_size();
v_lightDiffuse += value; v_lightDiffuse += value;
/*
float dist2 = Mathf.Clamp(Vector3.Distance(transformedLights[i], vertices), 0f, 15f);
dist2 /= 35f;
Vector3 value = Vector3.one;
value *= ((float) lights[i].Strength) / 255f;
value *= (1 - dist2);
v_lightDiffuse += value;*/
} }
Color f = vertexv.color; Color f = vertexv.color;
@ -1037,6 +1029,7 @@ void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &li
// for (int i = 0; i < _colors->size(); ++i) { // for (int i = 0; i < _colors->size(); ++i) {
// print_error(_colors->get(i)); // print_error(_colors->get(i));
// } // }
*/
} }
#endif #endif

8
prop_2d_mesher.h
View File

@ -56,8 +56,8 @@ using PoolVector = Vector<N>;
#include "../mesh_data_resource/mesh_data_resource.h" #include "../mesh_data_resource/mesh_data_resource.h"
#endif #endif
#ifdef TERRAMAN_PRESENT #ifdef TERRAMAN_2D_PRESENT
#include "../terraman/data/terrain_light.h" #include "../terraman_2d/data/terrain_2d_light.h"
#endif #endif
class OpenSimplexNoise; class OpenSimplexNoise;
@ -172,8 +172,8 @@ public:
void bake_colors_lights_rao(); void bake_colors_lights_rao();
void bake_colors_lights(); void bake_colors_lights();
#ifdef TERRAMAN_PRESENT #ifdef TERRAMAN_2D_PRESENT
void bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &lights); void bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights);
#endif #endif
Array build_mesh(); Array build_mesh();