use zdepth in places

Author: HeliumAnt

Source/Entities/PieMenu.cpp

@@ -632,6 +632,7 @@ void PieMenu::Update() {
 }
 
 void PieMenu::Draw(BITMAP* targetBitmap, const Vector& targetPos) const {
+	rlZDepth(c_GuiDepth);
 	Vector drawPos;
 	CalculateDrawPosition(targetBitmap, targetPos, drawPos);
 
@@ -656,6 +657,7 @@ void PieMenu::Draw(BITMAP* targetBitmap, const Vector& targetPos) const {
 	if (m_ActiveSubPieMenu) {
 		m_ActiveSubPieMenu->Draw(targetBitmap, targetPos);
 	}
+	rlZDepth(c_DefaultDrawDepth);
 }
 
 void PieMenu::UpdateWobbling() {

Source/Entities/SLBackground.cpp

@@ -38,6 +38,7 @@ void SLBackground::Clear() {
 	m_FillColorRight = ColorKeys::g_MaskColor;
 	m_FillColorUp = ColorKeys::g_MaskColor;
 	m_FillColorDown = ColorKeys::g_MaskColor;
+	m_ZOrder = c_BackgroundDepth;
 
 	m_IgnoreAutoScale = false;
 }
@@ -222,6 +223,7 @@ void SLBackground::Draw(const Box& targetDimensions, Box& targetBox, bool offset
 	int targetBoxWidth = static_cast<int>(targetBox.GetWidth());
 	int targetBoxHeight = static_cast<int>(targetBox.GetHeight());
 
+	rlZDepth(m_ZOrder);
 	// Detect if non-wrapping layer dimensions can't cover the whole target area with its main bitmap. If so, fill in the gap with appropriate solid color sampled from the hanging edge.
 	if (!m_WrapX && bitmapWidth <= targetBoxWidth) {
 		if (m_FillColorLeft != ColorKeys::g_MaskColor && m_Offset.GetFloorIntX() != 0) {
@@ -239,4 +241,5 @@ void SLBackground::Draw(const Box& targetDimensions, Box& targetBox, bool offset
 			DrawRectangle(targetBoxCornerX, targetBoxCornerY + bitmapHeight - m_Offset.m_Y, targetBoxWidth, targetBoxHeight - bitmapHeight + m_Offset.m_Y, {static_cast<unsigned char>(m_FillColorDown), 0, 0, 255});
 		}
 	}
+	rlZDepth(c_DefaultDrawDepth);
 }

Source/Entities/SLTerrain.cpp

@@ -46,9 +46,11 @@ int SLTerrain::Create() {
 
 	if (!m_FGColorLayer.get()) {
 		m_FGColorLayer = std::make_unique<SceneLayer>();
+		m_FGColorLayer->SetZOrder(c_DefaultDrawDepth);
 	}
 	if (!m_BGColorLayer.get()) {
 		m_BGColorLayer = std::make_unique<SceneLayer>();
+		m_BGColorLayer->SetZOrder(c_TerrainBGDepth);
 	}
 
 	return 0;
@@ -90,10 +92,12 @@ int SLTerrain::ReadProperty(const std::string_view& propName, Reader& reader) {
 	MatchProperty("BackgroundTexture", { reader >> m_DefaultBGTextureFile; });
 	MatchProperty("FGColorLayer", {
 		m_FGColorLayer = std::make_unique<SceneLayer>();
+		m_FGColorLayer->SetZOrder(c_DefaultDrawDepth);
 		reader >> m_FGColorLayer.get();
 	});
 	MatchProperty("BGColorLayer", {
 		m_BGColorLayer = std::make_unique<SceneLayer>();
+		m_BGColorLayer->SetZOrder(c_TerrainBGDepth);
 		reader >> m_BGColorLayer.get();
 	});
 	MatchProperty("AddTerrainFrosting", {

Source/Entities/SceneLayer.cpp

@@ -45,6 +45,7 @@ void SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::Clear() {
 	m_WrapY = true;
 	m_OriginOffset.Reset();
 	m_Offset.Reset();
+	m_ZOrder = 0.0F;
 	m_ScrollInfo.SetXY(1.0F, 1.0F);
 	m_ScrollRatio.SetXY(1.0F, 1.0F);
 	m_ScaleFactor.SetXY(1.0F, 1.0F);
@@ -510,6 +511,8 @@ void SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::DrawTiled(const Box& target
 		glUniform1i(maskedUniformLocation, 0);
 	}
 
+	rlZDepth(m_ZOrder);
+
 	for (int tiledOffsetX = 0; tiledOffsetX < areaToCoverX;) {
 		float destX = targetBox.GetCorner().GetFloorIntX() + tiledOffsetX - m_Offset.GetFloorIntX();
 
@@ -537,6 +540,8 @@ void SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::DrawTiled(const Box& target
 		tiledOffsetX += bitmapWidth;
 	}
 
+	rlZDepth(c_DefaultDrawDepth);
+
 	if (!m_DrawMasked) {
 		rlDrawRenderBatchActive();
 		int drawMaskedUniform = rlGetLocationUniform(rlGetShaderCurrent(), "drawMasked");

Source/Entities/SceneLayer.h

@@ -100,6 +100,10 @@ namespace RTE {
 		/// @param newOffset The new offset Vector.
 		void SetOffset(const Vector& newOffset) { m_Offset = newOffset; }
 
+		/// Set the depth this scenelayer will be drawn at.
+		/// @param z The depth to draw at, negative values are further to the front in the range c_NearDepth to c_FarDepth.
+		void SetZOrder(float z) { m_ZOrder = z; }
+
 		/// Gets the scroll ratio that modifies the offset.
 		/// @return A copy of the ratio.
 		Vector GetScrollRatio() const { return m_ScrollRatio; }
@@ -222,6 +226,7 @@ namespace RTE {
 
 		Vector m_OriginOffset; //!< Offset of this SceneLayer off the top left edge of the screen.
 		Vector m_Offset; //!< The current scrolled offset of this SceneLayer, before being adjusted with the origin offset.
+		float m_ZOrder{0.0F}; //!< The depth this SceneLayer should be drawn at.
 
 		Vector m_ScrollInfo; //!< The initial scrolling ratio of this SceneLayer as set in INI. Used to calculate the actual scrolling ratios.
 		Vector m_ScrollRatio; //!< The scrolling ratios of this SceneLayer, adjusted to the Scene, player screen dimensions and scaling factor as necessary.

Source/Managers/FrameMan.cpp

@@ -962,7 +962,8 @@ void FrameMan::Draw() {
 	if (IsInMultiplayerMode()) {
 		PrepareFrameForNetwork();
 	}
-	rlDisableDepthTest();
+	rlEnableDepthTest();
+	rlZDepth(c_GuiDepth-1.0f);
 	g_GLResourceMan.UpdateDynamicBitmap(m_BackBuffer8.get(), true);
 	backgroundShader.Begin();
 	backgroundShader.Enable();
@@ -972,6 +973,7 @@ void FrameMan::Draw() {
 	DrawTexture(g_GLResourceMan.GetStaticTextureFromBitmap(m_BackBuffer8.get()), 0.0f, 0.0f, {255, 255, 255, 255});
 	m_BackBuffer->End();
 	backgroundShader.End();
+	rlZDepth(0);
 	if (g_ActivityMan.IsInActivity()) {
 		g_PostProcessMan.PostProcess();
 	}