BAR105 Smooth Mesh dynamic updates

rts/Game/Game.cpp

@@ -574,7 +574,7 @@ void CGame::PreLoadSimulation(LuaParser* defsParser)
 	ENTER_SYNCED_CODE();
 
 	loadscreen->SetLoadMessage("Creating Smooth Height Mesh");
-	smoothGround.Init(float3::maxxpos, float3::maxzpos, SQUARE_SIZE * 2, SQUARE_SIZE * 40);
+	smoothGround.Init(int2(mapDims.mapx, mapDims.mapy), 2, 40);
 
 	loadscreen->SetLoadMessage("Creating QuadField & CEGs");
 	moveDefHandler.Init(defsParser);
@@ -1761,6 +1761,7 @@ void CGame::SimFrame() {
 
 		helper->Update();
 		readMap->Update();
+		smoothGround.UpdateSmoothMesh();
 		mapDamage->Update();
 		pathManager->Update();
 		unitHandler.Update();

rts/Lua/LuaSyncedCtrl.cpp

@@ -4214,8 +4214,10 @@ static inline void ParseSmoothMeshParams(lua_State* L, const char* caller,
 		float& factor, int& x1, int& z1, int& x2, int& z2)
 {
 	ParseParams(L, caller, factor, x1, z1, x2, z2,
-			smoothGround.GetResolution(), smoothGround.GetMaxX(),
-			smoothGround.GetMaxY());
+			smoothGround.GetResolution(),
+			smoothGround.GetMaxX() - 1,
+			smoothGround.GetMaxY() - 1);
+
 }
 
 
@@ -4231,6 +4233,7 @@ int LuaSyncedCtrl::LevelSmoothMesh(lua_State* L)
 			smoothGround.SetHeight(index, height);
 		}
 	}
+
 	return 0;
 }
 
@@ -4298,8 +4301,8 @@ int LuaSyncedCtrl::AddSmoothMesh(lua_State* L)
 	const int z = (int)(zl / smoothGround.GetResolution());
 
 	// discard invalid coordinates
-	if ((x < 0) || (x > smoothGround.GetMaxX()) ||
-	    (z < 0) || (z > smoothGround.GetMaxY())) {
+	if ((x < 0) || (x > smoothGround.GetMaxX() - 1) ||
+	    (z < 0) || (z > smoothGround.GetMaxY() - 1)) {
 		return 0;
 	}
 
@@ -4328,8 +4331,8 @@ int LuaSyncedCtrl::SetSmoothMesh(lua_State* L)
 	const int z = (int)(zl / smoothGround.GetResolution());
 
 	// discard invalid coordinates
-	if ((x < 0) || (x > smoothGround.GetMaxX()) ||
-	    (z < 0) || (z > smoothGround.GetMaxY())) {
+	if ((x < 0) || (x > smoothGround.GetMaxX() - 1) ||
+	    (z < 0) || (z > smoothGround.GetMaxY() - 1)) {
 		return 0;
 	}
 

rts/Map/BasicMapDamage.cpp

@@ -8,6 +8,7 @@
 #include "Sim/Misc/GroundBlockingObjectMap.h"
 #include "Sim/Misc/LosHandler.h"
 #include "Sim/Misc/QuadField.h"
+#include "Sim/Misc/SmoothHeightMesh.h"
 #include "Sim/Units/Unit.h"
 #include "Sim/Units/UnitHandler.h"
 #include "Sim/Path/IPathManager.h"
@@ -227,6 +228,7 @@ void CBasicMapDamage::RecalcArea(int x1, int x2, int y1, int y2)
 
 	readMap->UpdateHeightMapSynced(updRect);
 	featureHandler.TerrainChanged(x1, y1, x2, y2);
+	smoothGround.MapChanged(x1, y1, x2, y2);
 	{
 		SCOPED_TIMER("Sim::BasicMapDamage::Los");
 		losHandler->UpdateHeightMapSynced(updRect);

rts/Rendering/SmoothHeightMeshDrawer.cpp

@@ -1,18 +1,86 @@
 /* This file is part of the Spring engine (GPL v2 or later), see LICENSE.html */
 
 #include "SmoothHeightMeshDrawer.h"
-#include "Sim/Misc/SmoothHeightMesh.h"
+
+#include "Game/UI/MiniMap.h"
+#include "Map/ReadMap.h"
+#include "Rendering/GL/myGL.h"
 #include "Rendering/GL/VertexArray.h"
+#include "Sim/Misc/GlobalSynced.h"
+#include "Sim/Misc/SmoothHeightMesh.h"
+#include "System/EventHandler.h"
 #include "System/float3.h"
+#include "System/SafeUtil.h"
 
+using namespace SmoothHeightMeshNamespace;
+
+static SmoothHeightMeshDrawer* smoothMeshDrawer = nullptr;
 
 SmoothHeightMeshDrawer* SmoothHeightMeshDrawer::GetInstance() {
-	static SmoothHeightMeshDrawer drawer;
-	return &drawer;
+	if (smoothMeshDrawer == nullptr) {
+		smoothMeshDrawer = new SmoothHeightMeshDrawer();
+	}
+	return smoothMeshDrawer;
+}
+
+void SmoothHeightMeshDrawer::FreeInstance() {
+	if (smoothMeshDrawer != nullptr) {
+		spring::SafeDelete(smoothMeshDrawer);
+	}
+}
+
+SmoothHeightMeshDrawer::SmoothHeightMeshDrawer()
+	: CEventClient("[SmoothHeightMeshDrawer]", 300002, false)
+	, drawEnabled(false)
+{
+	eventHandler.AddClient(this);
+}
+SmoothHeightMeshDrawer::~SmoothHeightMeshDrawer() {
+	eventHandler.RemoveClient(this);
+}
+
+void SmoothHeightMeshDrawer::DrawInMiniMap()
+{
+	if (!(drawEnabled && gs->cheatEnabled))
+		return;
+
+	glMatrixMode(GL_PROJECTION);
+		glPushMatrix();
+		glLoadIdentity();
+		glOrtho(0.0f, 1.0f, 0.0f, 1.0f, 0.0, -1.0);
+		minimap->ApplyConstraintsMatrix();
+	glMatrixMode(GL_MODELVIEW);
+		glPushMatrix();
+		glLoadIdentity();
+		glTranslatef3(UpVector);
+		glScalef(1.0f / mapDims.mapx, -1.0f / mapDims.mapy, 1.0f);
+
+	glDisable(GL_TEXTURE_2D);
+	glColor4f(1.0f, 1.0f, 0.0f, 0.7f);
+
+	const SmoothHeightMesh::MapChangeTrack& mapChangeTrack = smoothGround.mapChangeTrack;
+	const float tileSize = SAMPLES_PER_QUAD * smoothGround.resolution;
+	int i = 0;
+	for (auto changed : mapChangeTrack.damageMap) {
+		if (changed){
+			const float x = (i % mapChangeTrack.width) * tileSize;
+			const float y = (i / mapChangeTrack.width) * tileSize;
+			glRectf(x, y, x + tileSize, y + tileSize);
+		}
+		i++;
+	}
+
+	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+	glEnable(GL_TEXTURE_2D);
+
+	glMatrixMode(GL_PROJECTION);
+		glPopMatrix();
+	glMatrixMode(GL_MODELVIEW);
+		glPopMatrix();
 }
 
 void SmoothHeightMeshDrawer::Draw(float yoffset) {
-	if (!drawEnabled)
+	if (!(drawEnabled && gs->cheatEnabled))
 		return;
 
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
@@ -28,10 +96,10 @@ void SmoothHeightMeshDrawer::Draw(float yoffset) {
 
 	CVertexArray* va = GetVertexArray();
 	va->Initialize();
-	va->EnlargeArrays((numQuadsX + 1) * (numQuadsZ + 1) * 4, 0, VA_SIZE_0);
+	va->EnlargeArrays(numQuadsX * numQuadsZ * 4, 0, VA_SIZE_0);
 
-	for (unsigned int zq = 0; zq <= numQuadsZ; zq++) {
-		for (unsigned int xq = 0; xq <= numQuadsX; xq++) {
+	for (unsigned int zq = 0; zq < numQuadsZ; zq++) {
+		for (unsigned int xq = 0; xq < numQuadsX; xq++) {
 			const float x = xq * quadSize;
 			const float z = zq * quadSize;
 

rts/Rendering/SmoothHeightMeshDrawer.h

@@ -3,9 +3,22 @@
 #ifndef SMOOTH_HEIGHTMESH_DRAWER_H
 #define SMOOTH_HEIGHTMESH_DRAWER_H
 
-struct SmoothHeightMeshDrawer {
+#include "System/EventClient.h"
+
+struct SmoothHeightMeshDrawer: public CEventClient {
 public:
 	static SmoothHeightMeshDrawer* GetInstance();
+	static void FreeInstance();
+
+	SmoothHeightMeshDrawer();
+	~SmoothHeightMeshDrawer();
+
+	// CEventClient interface
+	bool WantsEvent(const std::string& eventName) override {
+		return (eventName == "DrawInMiniMap");
+	}
+	void DrawInMiniMap() override;
+
 
 	void Draw(float yoffset);
 	bool& DrawEnabled() { return drawEnabled; }

rts/Rendering/WorldDrawer.cpp

@@ -156,6 +156,7 @@ void CWorldDrawer::Kill()
 	IGroundDecalDrawer::FreeInstance();
 	CShaderHandler::FreeInstance(shaderHandler);
 	LuaObjectDrawer::Kill();
+	SmoothHeightMeshDrawer::FreeInstance();
 
 	numUpdates = 0;
 }

rts/Sim/Misc/ModInfo.cpp

@@ -98,6 +98,8 @@ void CModInfo::ResetState()
 		pfRawDistMult    = 1.25f;
 		pfUpdateRate     = 0.007f;
 
+		enableSmoothMesh = true;
+
 		allowTake = true;
 	}
 }
@@ -137,6 +139,8 @@ void CModInfo::Init(const std::string& modFileName)
 		pfRawDistMult = system.GetFloat("pathFinderRawDistMult", pfRawDistMult);
 		pfUpdateRate = system.GetFloat("pathFinderUpdateRate", pfUpdateRate);
 
+		enableSmoothMesh = system.GetBool("enableSmoothMesh", enableSmoothMesh);
+
 		allowTake = system.GetBool("allowTake", allowTake);
 	}
 

rts/Sim/Misc/ModInfo.h

@@ -168,6 +168,8 @@ class CModInfo
 	float pfRawDistMult;
 	float pfUpdateRate;
 
+	bool enableSmoothMesh;
+
 	bool allowTake;
 };