Pass ticFrac to the model renderer as a parameter

This also removes the rather pointless gl_RenderModel functions because with their two lines of content they can just be placed inline.

src/gl/models/gl_models.cpp

@@ -338,27 +338,3 @@ void FModelVertexBuffer::SetupFrame(FModelRenderer *renderer, unsigned int frame
 		}
 	}
 }
-
-//===========================================================================
-//
-// gl_RenderModel
-//
-//===========================================================================
-
-void gl_RenderModel(GLSprite * spr, int mli)
-{
-	FGLModelRenderer renderer(mli);
-	renderer.RenderModel(spr->x, spr->y, spr->z, spr->modelframe, spr->actor);
-}
-
-//===========================================================================
-//
-// gl_RenderHUDModel
-//
-//===========================================================================
-
-void gl_RenderHUDModel(DPSprite *psp, float ofsX, float ofsY, int mli)
-{
-	FGLModelRenderer renderer(mli);
-	renderer.RenderHUDModel(psp, ofsX, ofsY);
-}

src/gl/models/gl_models.h

@@ -51,5 +51,3 @@ public:
 	void DrawElements(int numIndices, size_t offset) override;
 };
 
-void gl_RenderModel(GLSprite * spr, int mli);
-void gl_RenderHUDModel(DPSprite *psp, float ofsx, float ofsy, int mli);

src/gl/scene/gl_sprite.cpp

@@ -276,7 +276,8 @@ void FDrawInfo::DrawSprite(GLSprite *sprite, int pass)
 		}
 		else
 		{
-			gl_RenderModel(sprite, sprite->dynlightindex);
+            FGLModelRenderer renderer(sprite->dynlightindex);
+            renderer.RenderModel(sprite->x, sprite->y, sprite->z, sprite->modelframe, sprite->actor, r_viewpoint.TicFrac);
 		}
 	}
 

src/gl/scene/gl_weapon.cpp

@@ -66,7 +66,8 @@ void FDrawInfo::DrawPSprite (HUDSprite *huds)
 	if (huds->mframe)
 	{
 		gl_RenderState.AlphaFunc(GL_GEQUAL, 0);
-		gl_RenderHUDModel(huds->weapon, huds->mx, huds->my, huds->lightindex);
+        FGLModelRenderer renderer(huds->lightindex);
+        renderer.RenderHUDModel(huds->weapon, huds->mx, huds->my);
 	}
 	else
 	{

src/polyrenderer/scene/poly_model.cpp

@@ -37,7 +37,7 @@ void PolyRenderModel(PolyRenderThread *thread, const Mat4f &worldToClip, uint32_
 {
 	PolyModelRenderer renderer(thread, worldToClip, stencilValue);
 	renderer.AddLights(actor);
-	renderer.RenderModel(x, y, z, smf, actor);
+	renderer.RenderModel(x, y, z, smf, actor, r_viewpoint.TicFrac);
 	PolyTriangleDrawer::SetModelVertexShader(thread->DrawQueue, -1, -1, 0.0f);
 }
 

src/r_data/models/models.cpp

@@ -54,7 +54,7 @@ extern TDeletingArray<FVoxelDef *> VoxelDefs;
 
 DeletingModelArray Models;
 
-void FModelRenderer::RenderModel(float x, float y, float z, FSpriteModelFrame *smf, AActor *actor)
+void FModelRenderer::RenderModel(float x, float y, float z, FSpriteModelFrame *smf, AActor *actor, double ticFrac)
 {
 	// Setup transformation.
 
@@ -128,7 +128,7 @@ void FModelRenderer::RenderModel(float x, float y, float z, FSpriteModelFrame *s
 	if (actor->renderflags & RF_INTERPOLATEANGLES)
 	{
 		// [Nash] use interpolated angles
-		DRotator Angles = actor->InterpolatedAngles(r_viewpoint.TicFrac);
+		DRotator Angles = actor->InterpolatedAngles(ticFrac);
 		angle = Angles.Yaw.Degrees;
 	}
 

src/r_data/models/models.h

@@ -60,7 +60,7 @@ class FModelRenderer
 public:
 	virtual ~FModelRenderer() { }
 
-	void RenderModel(float x, float y, float z, FSpriteModelFrame *modelframe, AActor *actor);
+	void RenderModel(float x, float y, float z, FSpriteModelFrame *modelframe, AActor *actor, double ticFrac);
 	void RenderHUDModel(DPSprite *psp, float ofsx, float ofsy);
 
 	virtual ModelRendererType GetType() const = 0;

src/swrenderer/things/r_model.cpp

@@ -76,7 +76,7 @@ namespace swrenderer
 	{
 		SWModelRenderer renderer(thread, clip3DFloor, &WorldToClip, MirrorWorldToClip);
 		renderer.AddLights(actor);
-		renderer.RenderModel(x, y, z, smf, actor);
+		renderer.RenderModel(x, y, z, smf, actor, r_viewpoint.TicFrac);
 		PolyTriangleDrawer::SetModelVertexShader(thread->DrawQueue, -1, -1, 0.0f);
 	}