- implemented line portal transition. Not yet tested for arbitrary portals but for static ones it is working - including camera interpolation.

src/r_utility.cpp

@@ -81,6 +81,7 @@ static TArray<InterpolationViewer> PastViewers;
 static FRandom pr_torchflicker ("TorchFlicker");
 static FRandom pr_hom;
 static bool NoInterpolateView;
+static TArray<fixedvec3> InterpolationPath;
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
@@ -574,6 +575,7 @@ void R_InterpolateView (player_t *player, fixed_t frac, InterpolationViewer *ivi
 //	frac = tf;
 	if (NoInterpolateView)
 	{
+		InterpolationPath.Clear();
 		NoInterpolateView = false;
 		iview->oviewx = iview->nviewx;
 		iview->oviewy = iview->nviewy;
@@ -583,10 +585,67 @@ void R_InterpolateView (player_t *player, fixed_t frac, InterpolationViewer *ivi
 	}
 	int oldgroup = R_PointInSubsector(iview->oviewx, iview->oviewy)->sector->PortalGroup;
 	int newgroup = R_PointInSubsector(iview->nviewx, iview->nviewy)->sector->PortalGroup;
-	fixedvec2 disp = Displacements.getOffset(oldgroup, newgroup);
-	viewx = iview->oviewx + FixedMul (frac, iview->nviewx - iview->oviewx - disp.x);
-	viewy = iview->oviewy + FixedMul (frac, iview->nviewy - iview->oviewy - disp.y);
-	viewz = iview->oviewz + FixedMul (frac, iview->nviewz - iview->oviewz);
+
+	if ((iview->oviewx != iview->nviewx || iview->oviewy != iview->nviewy) && InterpolationPath.Size() > 0)
+	{
+		viewx = iview->nviewx;
+		viewy = iview->nviewy;
+		viewz = iview->nviewz;
+
+		// Interpolating through line portals is a messy affair.
+		// What needs be done is to store the portal transitions of the camera actor as waypoints
+		// and then find out on which part of the path the current view lies.
+		// Needless to say, this doesn't work for chasecam mode.
+		if (!r_showviewer)
+		{
+			fixed_t pathlen = 0;
+			fixed_t zdiff = 0;
+			fixed_t totalzdiff = 0;
+			fixed_t oviewz = iview->oviewz;
+			fixed_t nviewz = iview->nviewz;
+			fixedvec3 oldpos = { iview->oviewx, iview->oviewy, 0 };
+			fixedvec3 newpos = { iview->nviewx, iview->nviewy, 0 };
+			InterpolationPath.Push(newpos);	// add this to  the array to simplify the loops below
+
+			for (unsigned i = 0; i < InterpolationPath.Size(); i += 2)
+			{
+				fixedvec3 &start = i == 0 ? oldpos : InterpolationPath[i - 1];
+				fixedvec3 &end = InterpolationPath[i];
+				pathlen += xs_CRoundToInt(TVector2<double>(end.x - start.x, end.y - start.y).Length());
+				totalzdiff += start.z;
+			}
+			fixed_t interpolatedlen = FixedMul(frac, pathlen);
+
+			for (unsigned i = 0; i < InterpolationPath.Size(); i += 2)
+			{
+				fixedvec3 &start = i == 0 ? oldpos : InterpolationPath[i - 1];
+				fixedvec3 &end = InterpolationPath[i];
+				fixed_t fraglen = xs_CRoundToInt(TVector2<double>(end.x - start.x, end.y - start.y).Length());
+				zdiff += start.z;
+				if (fraglen <= interpolatedlen)
+				{
+					interpolatedlen -= fraglen;
+				}
+				else
+				{
+					fixed_t fragfrac = FixedDiv(interpolatedlen, fraglen);
+					oviewz += zdiff;
+					nviewz -= totalzdiff - zdiff;
+					viewx = start.x + FixedMul(fragfrac, end.x - start.x);
+					viewy = start.y + FixedMul(fragfrac, end.y - start.y);
+					viewz = oviewz + FixedMul(frac, nviewz - oviewz);
+				}
+			}
+			InterpolationPath.Pop();
+		}
+	}
+	else
+	{
+		fixedvec2 disp = Displacements.getOffset(oldgroup, newgroup);
+		viewx = iview->oviewx + FixedMul(frac, iview->nviewx - iview->oviewx - disp.x);
+		viewy = iview->oviewy + FixedMul(frac, iview->nviewy - iview->oviewy - disp.y);
+		viewz = iview->oviewz + FixedMul(frac, iview->nviewz - iview->oviewz);
+	}
 	if (player != NULL &&
 		!(player->cheats & CF_INTERPVIEW) &&
 		player - players == consoleplayer &&
@@ -678,6 +737,7 @@ void R_InterpolateView (player_t *player, fixed_t frac, InterpolationViewer *ivi
 
 void R_ResetViewInterpolation ()
 {
+	InterpolationPath.Clear();
 	NoInterpolateView = true;
 }
 
@@ -718,6 +778,7 @@ static InterpolationViewer *FindPastViewer (AActor *actor)
 	InterpolationViewer iview = { NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	iview.ViewActor = actor;
 	iview.otic = -1;
+	InterpolationPath.Clear();
 	return &PastViewers[PastViewers.Push (iview)];
 }
 
@@ -729,6 +790,7 @@ static InterpolationViewer *FindPastViewer (AActor *actor)
 
 void R_FreePastViewers ()
 {
+	InterpolationPath.Clear();
 	PastViewers.Clear ();
 }
 
@@ -742,6 +804,7 @@ void R_FreePastViewers ()
 
 void R_ClearPastViewer (AActor *actor)
 {
+	InterpolationPath.Clear();
 	for (unsigned int i = 0; i < PastViewers.Size(); ++i)
 	{
 		if (PastViewers[i].ViewActor == actor)
@@ -781,6 +844,7 @@ void R_RebuildViewInterpolation(player_t *player)
 	iview->oviewz = iview->nviewz;
 	iview->oviewpitch = iview->nviewpitch;
 	iview->oviewangle = iview->nviewangle;
+	InterpolationPath.Clear();
 }
 
 //==========================================================================
@@ -794,6 +858,29 @@ bool R_GetViewInterpolationStatus()
 	return NoInterpolateView;
 }
 
+
+//==========================================================================
+//
+// R_ClearInterpolationPath
+//
+//==========================================================================
+
+void R_ClearInterpolationPath()
+{
+	InterpolationPath.Clear();
+}
+
+//==========================================================================
+//
+// R_AddInterpolationPoint
+//
+//==========================================================================
+
+void R_AddInterpolationPoint(const fixedvec3 &vec)
+{
+	InterpolationPath.Push(vec);
+}
+
 //==========================================================================
 //
 // QuakePower