Interpolated Render + Cleanup

CHANGELOG.md

@@ -348,6 +348,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Removed `RealToSimCap` and `OneSimUpdatePerFrame`. Instead we try to always target 60fps, even if it slows the simulation down a little.
 
+- Removed `Settings.ini` property `SimplifiedCollisionDetection = 0/1`. With the physics detection overhaul in pre-5, this became unnecessary.
+
 </details>
 
 ***

Source/Activities/GameActivity.cpp

@@ -1229,8 +1229,6 @@ void GameActivity::Update() {
 		else if (m_ViewState[player] == ViewState::ActorSelect) {
 			// Continuously display message
 			g_FrameMan.SetScreenText("Select a body to switch control to...", ScreenOfPlayer(player));
-			// Get cursor input
-			m_PlayerController[player].RelativeCursorMovement(m_ActorCursor[player]);
 
 			// Find the actor closest to the cursor, if any within the radius
 			Vector markedDistance;
@@ -1284,10 +1282,6 @@ void GameActivity::Update() {
 				}
 			}
 
-			// Set the view to the cursor pos
-			g_SceneMan.ForceBounds(m_ActorCursor[player]);
-			g_CameraMan.SetScrollTarget(m_ActorCursor[player], 0.1, ScreenOfPlayer(player));
-
 			if (m_pLastMarkedActor[player]) {
 				if (!g_MovableMan.ValidMO(m_pLastMarkedActor[player])) {
 					m_pLastMarkedActor[player] = nullptr;
@@ -1701,9 +1695,6 @@ void GameActivity::Update() {
 			m_pBuyGUI[player]->Update();
 		}
 
-		// Trap the mouse if we're in gameplay and not in menus
-		g_UInputMan.TrapMousePos(!m_pBuyGUI[player]->IsEnabled() && !m_InventoryMenuGUI[player]->IsEnabledAndNotCarousel() && !m_LuaLockActor[player], player);
-
 		// Start LZ picking mode if a purchase was made
 		if (m_pBuyGUI[player]->PurchaseMade()) {
 			m_LZCursorWidth[player] = std::min(m_pBuyGUI[player]->GetDeliveryWidth(), g_FrameMan.GetPlayerScreenWidth() - 24);
@@ -1889,8 +1880,23 @@ void GameActivity::DrawGUI(BITMAP* pTargetBitmap, const Vector& targetPos, int w
 
 	// Iterate through all players, drawing each currently used LZ cursor.
 	for (int player = Players::PlayerOne; player < Players::MaxPlayerCount; ++player) {
-		if (!(m_IsActive[player] && m_IsHuman[player]))
+		if (!(m_IsActive[player] && m_IsHuman[player])) {
 			continue;
+		}
+
+		// TODO_MULTITHREAD properly formalize this. Maybe an UpdateRender/UpdateRealTime function on things?
+		m_PlayerController[player].Update();
+		// Trap the mouse if we're in gameplay and not in menus
+		g_UInputMan.TrapMousePos(!m_pBuyGUI[player]->IsEnabled() && !m_InventoryMenuGUI[player]->IsEnabledAndNotCarousel() && !m_LuaLockActor[player], player);
+		if (m_ViewState[player] == ViewState::ActorSelect) {
+			// Get cursor input
+			m_PlayerController[player].RelativeCursorMovement(m_ActorCursor[player]);
+
+			// Set the view to the cursor pos
+			g_SceneMan.ForceBounds(m_ActorCursor[player]);
+			g_CameraMan.SetScrollTarget(m_ActorCursor[player], 0.1, ScreenOfPlayer(player));
+		}
+		// TODO_MULTITHREAD
 
 		if (m_ViewState[player] == ViewState::LandingZoneSelect) {
 			int halfWidth = std::max(m_LZCursorWidth[player] / 2, 36);
@@ -1989,6 +1995,8 @@ void GameActivity::DrawGUI(BITMAP* pTargetBitmap, const Vector& targetPos, int w
 	float rightStackY = leftStackY;
 
 	// Draw the objective points this player should care about
+	// TODO_MULTITHREAD
+#ifndef MULTITHREAD_SIM_AND_RENDER
 	for (std::list<ObjectivePoint>::iterator itr = m_Objectives.begin(); itr != m_Objectives.end(); ++itr) {
 		// Only draw objectives of the same team as the current player
 		if (itr->m_Team == team) {
@@ -2051,6 +2059,7 @@ void GameActivity::DrawGUI(BITMAP* pTargetBitmap, const Vector& targetPos, int w
 			}
 		}
 	}
+#endif
 
 	// Team Icon up in the top left corner
 	const Icon* pIcon = GetTeamIcon(m_Team[PoS]);

Source/Entities/ACrab.cpp

@@ -1423,29 +1423,6 @@ void ACrab::DrawHUD(BITMAP* pTargetBitmap, const Vector& targetPos, int whichScr
 	if (!m_HUDVisible) {
 		return;
 	}
-	/*
-	// TODO: REMOVE< THIS IS TEMP
-	    // Draw the AI paths
-	    list<Vector>::iterator last = m_MovePath.begin();
-	    Vector waypoint, lastPoint, lineVec;
-	    for (list<Vector>::iterator lItr = m_MovePath.begin(); lItr != m_MovePath.end(); ++lItr)
-	    {
-	        lastPoint = (*last) - targetPos;
-	        waypoint = lastPoint + g_SceneMan.ShortestDistance(lastPoint, (*lItr) - targetPos);
-	        line(pTargetBitmap, lastPoint.m_X, lastPoint.m_Y, waypoint.m_X, waypoint.m_Y, g_RedColor);
-	        last = lItr;
-	    }
-	    waypoint = m_MoveTarget - targetPos;
-	    circlefill(pTargetBitmap, waypoint.m_X, waypoint.m_Y, 3, g_RedColor);
-	    lastPoint = m_PrevPathTarget - targetPos;
-	    circlefill(pTargetBitmap, lastPoint.m_X, lastPoint.m_Y, 2, g_YellowGlowColor);
-	    lastPoint = m_DigTunnelEndPos - targetPos;
-	    circlefill(pTargetBitmap, lastPoint.m_X, lastPoint.m_Y, 2, g_YellowGlowColor);
-	    // Raidus
-	//    waypoint = m_Pos - targetPos;
-	//    circle(pTargetBitmap, waypoint.m_X, waypoint.m_Y, m_MoveProximityLimit, g_RedColor);
-	// TODO: REMOVE THIS IS TEMP
-	*/
 
 	// Player AI drawing
 
@@ -1554,63 +1531,6 @@ void ACrab::DrawHUD(BITMAP* pTargetBitmap, const Vector& targetPos, int whichScr
 			}
 			m_HUDStack -= 9;
 		}
-
-		// Print aim angle and rot angle stoff
-		/*{
-		    std::snprintf(str, sizeof(str), "Aim %.2f Rot %.2f Lim %.2f", m_AimAngle, GetRotAngle(), m_AimRange + GetRotAngle());
-		    pSmallFont->DrawAligned(&allegroBitmap, drawPos.m_X - 0, drawPos.m_Y + m_HUDStack + 3, str, GUIFont::Centre);
-
-		    m_HUDStack += -10;
-		}*/
-
-		/*
-		        // AI Mode select GUI HUD
-		        if (m_Controller.IsState(AI_MODE_SET))
-		        {
-		            int iconOff = m_apAIIcons[0]->w + 2;
-		            int iconColor = m_Team == Activity::TeamOne ? AIICON_RED : AIICON_GREEN;
-		            Vector iconPos = GetCPUPos() - targetPos;
-
-		            if (m_AIMode == AIMODE_SENTRY)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Sentry");
-		                pSmallFont->DrawAligned(&allegroBitmap, iconPos.m_X, iconPos.m_Y - 18, str, GUIFont::Centre);
-		            }
-		            else if (m_AIMode == AIMODE_PATROL)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Patrol");
-		                pSmallFont->DrawAligned(&allegroBitmap, iconPos.m_X - 9, iconPos.m_Y - 5, str, GUIFont::Right);
-		            }
-		            else if (m_AIMode == AIMODE_BRAINHUNT)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Brainhunt");
-		                pSmallFont->DrawAligned(&allegroBitmap, iconPos.m_X + 9, iconPos.m_Y - 5, str, GUIFont::Left);
-		            }
-		            else if (m_AIMode == AIMODE_GOLDDIG)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Gold Dig");
-		                pSmallFont->DrawAligned(&allegroBitmap, iconPos.m_X, iconPos.m_Y + 8, str, GUIFont::Centre);
-		            }
-
-		            // Draw the mode alternatives if they are not the current one
-		            if (m_AIMode != AIMODE_SENTRY)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_SENTRY], iconPos.m_X - 6, iconPos.m_Y - 6 - iconOff);
-		            }
-		            if (m_AIMode != AIMODE_PATROL)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_PATROL], iconPos.m_X - 6 - iconOff, iconPos.m_Y - 6);
-		            }
-		            if (m_AIMode != AIMODE_BRAINHUNT)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_BRAINHUNT], iconPos.m_X - 6 + iconOff, iconPos.m_Y - 6);
-		            }
-		            if (m_AIMode != AIMODE_GOLDDIG)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_GOLDDIG], iconPos.m_X - 6, iconPos.m_Y - 6 + iconOff);
-		            }
-		        }
-		*/
 	}
 }
 

Source/Entities/ACraft.cpp

@@ -752,8 +752,9 @@ void ACraft::DrawHUD(BITMAP* pTargetBitmap, const Vector& targetPos, int whichSc
 	m_HUDStack = -m_CharHeight / 2;
 
 	// Only do HUD if on a team
-	if (m_Team < 0)
+	if (m_Team < 0) {
 		return;
+	}
 
 	// Only draw if the team viewing this is on the same team OR has seen the space where this is located.
 	int viewingTeam = g_ActivityMan.GetActivity()->GetTeamOfPlayer(g_ActivityMan.GetActivity()->PlayerOfScreen(whichScreen));
@@ -771,93 +772,39 @@ void ACraft::DrawHUD(BITMAP* pTargetBitmap, const Vector& targetPos, int whichSc
 	GUIFont* pSmallFont = g_FrameMan.GetSmallFont();
 
 	// Draw hud guides for the Exits, depending on whether the doors are open
-	if (m_HatchState == OPEN) // || m_HatchState == OPENING)
-	{
+	if (m_HatchState == OPEN) {
 		// Doors open and inventory not empty yet, so show arrows pointing out of the exits since things are still coming out
 		if (!IsInventoryEmpty()) {
 			//  --------
 			//  |  \  \
-            // -+-  |  |
+        // -+-  |  |
 			//  |  /  /
 			//  --------
 			// Make the dotted lines crawl out of the exit, indicating that things are still coming out
-			if (--m_ExitLinePhase < 0)
+			if (--m_ExitLinePhase < 0) {
 				m_ExitLinePhase = EXITLINESPACING - 1;
+			}
 		}
 		// Inventory empty and doors open, so show arrows pointing into the exits IF the delay to allow for things to eject away all the way has passed
 		else if (m_ExitTimer.IsPastSimMS(EXITSUCKDELAYMS)) {
 			// Make the dotted lines crawl back into the exit, inviting people to jump in
-			if (++m_ExitLinePhase >= EXITLINESPACING)
+			if (++m_ExitLinePhase >= EXITLINESPACING) {
 				m_ExitLinePhase = 0;
+			}
 		}
 
-		Vector exitRadius;
-		Vector exitCorner;
-		Vector arrowVec;
 		// Draw the actual dotted lines
 		for (std::list<Exit>::iterator exit = m_Exits.begin(); exit != m_Exits.end(); ++exit) {
-			if (exit->CheckIfClear(m_Pos, m_Rotation, 18)) {
-				exitRadius = RotateOffset(exit->GetVelocity().GetPerpendicular().SetMagnitude(exit->GetRadius()));
-				exitCorner = m_Pos - targetPos + RotateOffset(exit->GetOffset()) + exitRadius;
-				arrowVec = RotateOffset(exit->GetVelocity().SetMagnitude(exit->GetRange()));
-				g_FrameMan.DrawLine(pTargetBitmap, exitCorner, exitCorner + arrowVec, 120, 120, EXITLINESPACING, m_ExitLinePhase);
-				exitCorner -= exitRadius * 2;
-				g_FrameMan.DrawLine(pTargetBitmap, exitCorner, exitCorner + arrowVec, 120, 120, EXITLINESPACING, m_ExitLinePhase);
+			if (!exit->CheckIfClear(m_Pos, m_Rotation, 18)) {
+				continue;
 			}
-		}
-	}
 
-	// Only show extra HUD if this guy is controlled by a player
-	if (m_Controller.IsPlayerControlled() && pSmallFont && pSymbolFont) {
-		AllegroBitmap pBitmapInt(pTargetBitmap);
-		/*
-		        // AI Mode select GUI HUD
-		        if (m_Controller && m_Controller.IsState(PIE_MENU_ACTIVE))
-		        {
-		            char str[64];
-		            int iconOff = m_apAIIcons[0]->w + 2;
-		            int iconColor = m_Team == Activity::TeamOne ? AIICON_RED : AIICON_GREEN;
-		            Vector iconPos = GetCPUPos() - targetPos;
-
-		            if (m_AIMode == AIMODE_RETURN)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Return");
-		                pSmallFont->DrawAligned(&pBitmapInt, iconPos.m_X, iconPos.m_Y - 18, str, GUIFont::Centre);
-		            }
-		            else if (m_AIMode == AIMODE_DELIVER)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Deliver");
-		                pSmallFont->DrawAligned(&pBitmapInt, iconPos.m_X - 9, iconPos.m_Y - 5, str, GUIFont::Right);
-		            }
-		            else if (m_AIMode == AIMODE_SCUTTLE)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Scuttle");
-		                pSmallFont->DrawAligned(&pBitmapInt, iconPos.m_X + 9, iconPos.m_Y - 5, str, GUIFont::Left);
-		            }
-		            else if (m_AIMode == AIMODE_STAY)
-		            {
-		                std::snprintf(str, sizeof(str), "%s", "Stay");
-		                pSmallFont->DrawAligned(&pBitmapInt, iconPos.m_X, iconPos.m_Y + 8, str, GUIFont::Centre);
-		            }
-
-		            // Draw the mode alternatives if they are not the current one
-		            if (m_AIMode != AIMODE_RETURN)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_RETURN], iconPos.m_X - 6, iconPos.m_Y - 6 - iconOff);
-		            }
-		            if (m_AIMode != AIMODE_DELIVER)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_DELIVER], iconPos.m_X - 6 - iconOff, iconPos.m_Y - 6);
-		            }
-		            if (m_AIMode != AIMODE_SCUTTLE)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_SCUTTLE], iconPos.m_X - 6 + iconOff, iconPos.m_Y - 6);
-		            }
-		            if (m_AIMode != AIMODE_STAY)
-		            {
-		                draw_sprite(pTargetBitmap, m_apAIIcons[AIMODE_STAY], iconPos.m_X - 6, iconPos.m_Y - 6 + iconOff);
-		            }
-		        }
-		*/
+			Vector exitRadius = RotateOffset(exit->GetVelocity().GetPerpendicular().SetMagnitude(exit->GetRadius()));
+			Vector exitCorner = m_Pos - targetPos + RotateOffset(exit->GetOffset()) + exitRadius;
+			Vector arrowVec = RotateOffset(exit->GetVelocity().SetMagnitude(exit->GetRange()));
+			g_FrameMan.DrawLine(pTargetBitmap, exitCorner, exitCorner + arrowVec, 120, 120, EXITLINESPACING, m_ExitLinePhase);
+			exitCorner -= exitRadius * 2;
+			g_FrameMan.DrawLine(pTargetBitmap, exitCorner, exitCorner + arrowVec, 120, 120, EXITLINESPACING, m_ExitLinePhase);
+		}
 	}
 }

Source/Entities/ADoor.cpp

@@ -452,13 +452,13 @@ void ADoor::Update() {
 	// Lose health when door is lost, spinning out of control until grinds to halt
 	if (!m_Door && m_Status != DYING && m_Status != DEAD) {
 		m_SpriteAnimMode = ALWAYSLOOP;
-		m_SpriteAnimDuration = static_cast<int>(LERP(0, m_MaxHealth, 10.0F, static_cast<float>(m_InitialSpriteAnimDuration), m_Health));
+		m_SpriteAnimDuration = static_cast<int>(Lerp(0, m_MaxHealth, 10.0F, static_cast<float>(m_InitialSpriteAnimDuration), m_Health));
 
 		if (m_DoorMoveSound) {
 			if (!m_DoorMoveSound->IsBeingPlayed()) {
 				m_DoorMoveSound->Play(m_Pos);
 			}
-			m_DoorMoveSound->SetPitch(LERP(10.0F, static_cast<float>(m_InitialSpriteAnimDuration), 2.0F, 1.0F, static_cast<float>(m_SpriteAnimDuration)));
+			m_DoorMoveSound->SetPitch(Lerp(10.0F, static_cast<float>(m_InitialSpriteAnimDuration), 2.0F, 1.0F, static_cast<float>(m_SpriteAnimDuration)));
 		}
 
 		m_Health -= 0.4F;
@@ -551,11 +551,8 @@ void ADoor::UpdateDoorAttachableActions() {
 				m_DoorState = CLOSED;
 			}
 		} else {
-			Vector updatedOffset(LERP(0, m_DoorMoveTime, startOffset.m_X, endOffset.m_X, m_DoorMoveTimer.GetElapsedSimTimeMS()), LERP(0, m_DoorMoveTime, startOffset.m_Y, endOffset.m_Y, m_DoorMoveTimer.GetElapsedSimTimeMS()));
-
-			// TODO: Make this work across rotation 0. Probably the best solution would be to setup an angle LERP that properly handles the 2PI border and +- angles.
-			// TODO_MULTITHREAD: multithread branch has lerped rotation, so once that's done!
-			float updatedAngle = LERP(0, m_DoorMoveTime, startAngle, endAngle, m_DoorMoveTimer.GetElapsedSimTimeMS());
+			Vector updatedOffset(Lerp(0, m_DoorMoveTime, startOffset.m_X, endOffset.m_X, m_DoorMoveTimer.GetElapsedSimTimeMS()), Lerp(0, m_DoorMoveTime, startOffset.m_Y, endOffset.m_Y, m_DoorMoveTimer.GetElapsedSimTimeMS()));
+			float updatedAngle = Lerp(0, m_DoorMoveTime, Matrix(startAngle), Matrix(endAngle), m_DoorMoveTimer.GetElapsedSimTimeMS()).GetRadAngle();
 
 			m_Door->SetParentOffset(updatedOffset);
 			m_Door->SetRotAngle(m_Rotation.GetRadAngle() + (updatedAngle * GetFlipFactor()));
@@ -574,6 +571,7 @@ void ADoor::DrawHUD(BITMAP* targetBitmap, const Vector& targetPos, int whichScre
 	if (!m_HUDVisible) {
 		return;
 	}
+
 	// Only draw if the team viewing this is on the same team OR has seen the space where this is located.
 	int viewingTeam = g_ActivityMan.GetActivity()->GetTeamOfPlayer(g_ActivityMan.GetActivity()->PlayerOfScreen(whichScreen));
 	if (viewingTeam != m_Team && viewingTeam != Activity::NoTeam && (!g_SettingsMan.ShowEnemyHUD() || g_SceneMan.IsUnseen(m_Pos.GetFloorIntX(), m_Pos.GetFloorIntY(), viewingTeam))) {

Source/Entities/AEmitter.cpp

@@ -314,8 +314,8 @@ int AEmitter::GetTotalBurstSize() const {
 }
 
 float AEmitter::GetScaledThrottle(float throttle, float multiplier) const {
-	float throttleFactor = LERP(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, throttle);
-	return LERP(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor * multiplier);
+	float throttleFactor = Lerp(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, throttle);
+	return Lerp(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor * multiplier);
 }
 
 void AEmitter::SetFlash(Attachable* newFlash) {

Source/Entities/AEmitter.h

@@ -140,11 +140,11 @@ namespace RTE {
 
 		/// Gets the adjusted throttle multiplier that is factored into the emission rate of this AEmitter.
 		/// @return The throttle strength as a multiplier.
-		float GetThrottleFactor() const { return LERP(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, m_Throttle); }
+		float GetThrottleFactor() const { return Lerp(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, m_Throttle); }
 
 		/// Gets the throttle value that will achieve a given throttle factor that is factored into the emission rate of this AEmitter.
 		/// @return The throttle value that will achieve the given throttle factor.
-		float GetThrottleForThrottleFactor(float throttleFactor) const { return LERP(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor); }
+		float GetThrottleForThrottleFactor(float throttleFactor) const { return Lerp(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor); }
 
 		/// Returns a scaled throttle value that represents a linear increase of force.
 		/// Because of (bad) reasons, throttle is in the range -1.0F to 1.0F, where -1.0F is "minimum force" and 1.0F is "maximum force".