From 8eaa94f0dc0b2818d74549630f20e449d3a95bee Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Wed, 23 Feb 2022 00:15:25 +0100
Subject: [PATCH] Look for terraman 2d instead of just terraman.

---
 SCsub              |  4 ++--
 prop_2d_mesher.cpp | 15 ++++-----------
 prop_2d_mesher.h   |  8 ++++----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/SCsub b/SCsub
index 280e932..722495f 100644
--- a/SCsub
+++ b/SCsub
@@ -15,8 +15,8 @@ if os.path.isdir('../texture_packer'):
     has_texture_packer = True
     module_env.Append(CPPDEFINES=['TEXTURE_PACKER_PRESENT'])
 
-if os.path.isdir('../terraman'):
-    module_env.Append(CPPDEFINES=['TERRAMAN_PRESENT'])
+if os.path.isdir('../terraman_2d'):
+    module_env.Append(CPPDEFINES=['TERRAMAN_2D_PRESENT'])
 
 if os.path.isdir('../mesh_utils'):
     module_env.Append(CPPDEFINES=['MESH_UTILS_PRESENT'])
diff --git a/prop_2d_mesher.cpp b/prop_2d_mesher.cpp
index 0489538..b00216b 100644
--- a/prop_2d_mesher.cpp
+++ b/prop_2d_mesher.cpp
@@ -951,8 +951,9 @@ void Prop2DMesher::bake_colors_lights() {
 	}
 }
 
-#ifdef TERRAMAN_PRESENT
-void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &lights) {
+#ifdef TERRAMAN_2D_PRESENT
+void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights) {
+	/*
 	ERR_FAIL_COND(node == NULL);
 
 	Color darkColor(0, 0, 0, 1);
@@ -992,15 +993,6 @@ void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &li
 
 			value *= light->get_size();
 			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;
@@ -1037,6 +1029,7 @@ void Prop2DMesher::bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &li
 	//	for (int i = 0; i < _colors->size(); ++i) {
 	//		print_error(_colors->get(i));
 	//	}
+	*/
 }
 #endif
 
diff --git a/prop_2d_mesher.h b/prop_2d_mesher.h
index ff81b81..c11bfb4 100644
--- a/prop_2d_mesher.h
+++ b/prop_2d_mesher.h
@@ -56,8 +56,8 @@ using PoolVector = Vector<N>;
 #include "../mesh_data_resource/mesh_data_resource.h"
 #endif
 
-#ifdef TERRAMAN_PRESENT
-#include "../terraman/data/terrain_light.h"
+#ifdef TERRAMAN_2D_PRESENT
+#include "../terraman_2d/data/terrain_2d_light.h"
 #endif
 
 class OpenSimplexNoise;
@@ -172,8 +172,8 @@ public:
 	void bake_colors_lights_rao();
 	void bake_colors_lights();
 
-#ifdef TERRAMAN_PRESENT
-	void bake_lights(MeshInstance *node, Vector<Ref<TerrainLight>> &lights);
+#ifdef TERRAMAN_2D_PRESENT
+	void bake_lights(MeshInstance *node, Vector<Ref<Terrain2DLight>> &lights);
 #endif
 
 	Array build_mesh();