Added MM matrices to UniformConstants (TODO fix missing MM matrices)

beyond-all-reason · Mar 13, 2021 · 625af77 · 625af77
1 parent 992f292
commit 625af77
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/rts/Rendering/UniformConstants.cpp b/rts/Rendering/UniformConstants.cpp
@@ -9,6 +9,7 @@
 #include "Game/Camera.h"
 #include "Game/CameraHandler.h"
 #include "Game/GlobalUnsynced.h"
+#include "Game/UI/MiniMap.h"
 #include "Sim/Misc/GlobalConstants.h"
 #include "Sim/Misc/GlobalSynced.h"
 #include "Sim/Misc/TeamHandler.h"
@@ -87,6 +88,14 @@ void UniformConstants::UpdateMatricesImpl(UniformMatricesBuffer* updateBuffer)
 	updateBuffer->shadowViewProj = updateBuffer->shadowProj * updateBuffer->shadowView;
 
 	updateBuffer->orthoProj01 = CMatrix44f::ClipOrthoProj01();
+
+	updateBuffer->mmDrawView = minimap->GetViewMat(0);
+	updateBuffer->mmDrawIMMView = minimap->GetViewMat(1);
+	updateBuffer->mmDrawDimView = minimap->GetViewMat(2);
+
+	updateBuffer->mmDrawProj = minimap->GetProjMat(0);
+	updateBuffer->mmDrawIMMProj = minimap->GetProjMat(1);
+	updateBuffer->mmDrawDimProj = minimap->GetProjMat(2);
 }
 
 

diff --git a/rts/Rendering/UniformConstants.h b/rts/Rendering/UniformConstants.h
@@ -31,6 +31,15 @@ struct UniformMatricesBuffer {
 
 	CMatrix44f orthoProj01;
 	//TODO: minimap matrices
+
+	// transforms for [0] := Draw, [1] := DrawInMiniMap, [2] := Lua DrawInMiniMap
+	CMatrix44f mmDrawView; //world to MM
+	CMatrix44f mmDrawIMMView; //heightmap to MM
+	CMatrix44f mmDrawDimView; //mm dims
+
+	CMatrix44f mmDrawProj; //world to MM
+	CMatrix44f mmDrawIMMProj; //heightmap to MM
+	CMatrix44f mmDrawDimProj; //mm dims
 };
 
 struct UniformParamsBuffer {