Merge branch 'development' into lerp-improvements

Author: Causeless

CHANGELOG.md

@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 <details><summary><b>Added</b></summary>
 
+- New `MovableObject` INI and Lua property `PostEffectEnabled` (R/W), which determines whether or not the screen effect of an MO is enabled. Defaults to `true` for `MOPixels` and `MOSParticles`, `false` for everything else (to avoid backwards compatibility issues).
+
 - `Lerp` can now be used on Vectors and Matrices/Rotations, not just numbers.
 
 </details>
@@ -20,6 +22,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Improvements to AI navigation in automovers, so they get stuck less often.
 
+- Screen effects (glows) can now show on *any* `MovableObject` they're attached to; you may need to set `EffectAlwaysShows = 1` to see them on `MOSRotatings`. Try `InheritEffectRotAngle = 1` on one of them!
+
 - `LERP` Lua binding has been deprecated, and renamed to `Lerp`.
 
 </details>
@@ -50,6 +54,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 </details>
 
+<details><summary><b>Removed</b></summary>
+
+- Removed `Settings.ini` property `SimplifiedCollisionDetection = 0/1`. With the physics detection overhaul in pre-5, this became unnecessary.
+
+</details>
+
 ## [Release v6.1.0] - 2024/02/15
 
 <details><summary><b>Added</b></summary>

Source/Entities/ACrab.cpp

@@ -567,56 +567,6 @@ BITMAP* ACrab::GetGraphicalIcon() const {
 	return m_GraphicalIcon ? m_GraphicalIcon : (m_pTurret ? m_pTurret->GetSpriteFrame(0) : GetSpriteFrame(0));
 }
 
-bool ACrab::CollideAtPoint(HitData& hd) {
-	return Actor::CollideAtPoint(hd);
-
-	/*
-	    hd.ResImpulse[HITOR].Reset();
-	    hd.ResImpulse[HITEE].Reset();
-	    hd.HitRadius[HITEE] = (hd.HitPoint - m_Pos) * c_MPP;
-	    hd.mass[HITEE] = m_Mass;
-	    hd.MomInertia[HITEE] = m_pAtomGroup->GetMomentOfInertia();
-	    hd.HitVel[HITEE] = m_Vel + hd.HitRadius[HITEE].GetPerpendicular() * m_AngularVel;
-	    hd.VelDiff = hd.HitVel[HITOR] - hd.HitVel[HITEE];
-	    Vector hitAcc = -hd.VelDiff * (1 + hd.Body[HITOR]->GetMaterial().restitution * GetMaterial().restitution);
-
-	    float hittorLever = hd.HitRadius[HITOR].GetPerpendicular().Dot(hd.BitmapNormal);
-	    float hitteeLever = hd.HitRadius[HITEE].GetPerpendicular().Dot(hd.BitmapNormal);
-	    hittorLever *= hittorLever;
-	    hitteeLever *= hitteeLever;
-	    float impulse = hitAcc.Dot(hd.BitmapNormal) / (((1 / hd.mass[HITOR]) + (1 / hd.mass[HITEE])) +
-	                    (hittorLever / hd.MomInertia[HITOR]) + (hitteeLever / hd.MomInertia[HITEE]));
-
-	    hd.ResImpulse[HITOR] = hd.BitmapNormal * impulse * hd.ImpulseFactor[HITOR];
-	    hd.ResImpulse[HITEE] = hd.BitmapNormal * -impulse * hd.ImpulseFactor[HITEE];
-
-	    ////////////////////////////////////////////////////////////////////////////////
-	    // If a particle, which does not penetrate, but bounces, do any additional
-	    // effects of that bounce.
-	    if (!ParticlePenetration())
-	// TODO: Add blunt trauma effects here!")
-	        ;
-	    }
-
-	    m_Vel += hd.ResImpulse[HITEE] / hd.mass[HITEE];
-	    m_AngularVel += hd.HitRadius[HITEE].GetPerpendicular().Dot(hd.ResImpulse[HITEE]) /
-	                    hd.MomInertia[HITEE];
-	*/
-}
-
-/*
-bool ACrab::OnBounce(const Vector &pos)
-{
-    return false;
-}
-
-
-bool ACrab::OnSink(const Vector &pos)
-{
-    return false;
-}
-*/
-
 bool ACrab::HandlePieCommand(PieSliceType pieSliceIndex) {
 	if (pieSliceIndex != PieSliceType::NoType) {
 		if (pieSliceIndex == PieSliceType::Reload) {
@@ -1423,29 +1373,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 +1481,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/ACrab.h

@@ -125,15 +125,6 @@ namespace RTE {
 		/// @param newLeg The new Leg to use.
 		void SetRightBGLeg(Leg* newLeg);
 
-		/// Calculates the collision response when another MO's Atom collides with
-		/// this MO's physical representation. The effects will be applied
-		/// directly to this MO, and also represented in the passed in HitData.
-		/// @param hitData Reference to the HitData struct which describes the collision. This
-		/// will be modified to represent the results of the collision.
-		/// @return Whether the collision has been deemed valid. If false, then disregard
-		/// any impulses in the Hitdata.
-		bool CollideAtPoint(HitData& hitData) override;
-
 		/// Tries to handle the activated PieSlice in this object's PieMenu, if there is one, based on its SliceType.
 		/// @param pieSliceType The SliceType of the PieSlice being handled.
 		/// @return Whether or not the activated PieSlice SliceType was able to be handled.

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 /* || m_HatchState == OPENING*/) {
 		// 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);
+		}
 	}
 }