From 49c9de350fe4e375c2234f559a98a23237f5f51b Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Mon, 7 May 2018 00:40:12 +0200
Subject: [PATCH] - GetTimeFloat is not renderer specific

---
 src/gl/models/gl_models.cpp           | 5 -----
 src/gl/models/gl_models.h             | 1 -
 src/polyrenderer/scene/poly_model.cpp | 5 -----
 src/polyrenderer/scene/poly_model.h   | 1 -
 src/r_data/models/models.cpp          | 6 ++++++
 src/r_data/models/models.h            | 3 +--
 src/swrenderer/things/r_model.cpp     | 5 -----
 src/swrenderer/things/r_model.h       | 1 -
 8 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/gl/models/gl_models.cpp b/src/gl/models/gl_models.cpp
index 9bd76dd167..454b31d4c5 100644
--- a/src/gl/models/gl_models.cpp
+++ b/src/gl/models/gl_models.cpp
@@ -146,11 +146,6 @@ void FGLModelRenderer::DrawElements(int numIndices, size_t offset)
 	glDrawElements(GL_TRIANGLES, numIndices, GL_UNSIGNED_INT, (void*)(intptr_t)offset);
 }
 
-double FGLModelRenderer::GetTimeFloat()
-{
-	return (double)I_msTime() * (double)TICRATE / 1000.;
-}
-
 //===========================================================================
 //
 // Uses a hardware buffer if either single frame (i.e. no interpolation needed)
diff --git a/src/gl/models/gl_models.h b/src/gl/models/gl_models.h
index de3fdfe7e4..f9458890a8 100644
--- a/src/gl/models/gl_models.h
+++ b/src/gl/models/gl_models.h
@@ -48,7 +48,6 @@ public:
 	void SetMaterial(FTexture *skin, bool clampNoFilter, int translation) override;
 	void DrawArrays(int start, int count) override;
 	void DrawElements(int numIndices, size_t offset) override;
-	double GetTimeFloat() override;
 };
 
 void gl_RenderModel(GLSprite * spr, int mli);
diff --git a/src/polyrenderer/scene/poly_model.cpp b/src/polyrenderer/scene/poly_model.cpp
index 2e057709b4..bb0c3fb52b 100644
--- a/src/polyrenderer/scene/poly_model.cpp
+++ b/src/polyrenderer/scene/poly_model.cpp
@@ -181,11 +181,6 @@ void PolyModelRenderer::DrawElements(int numIndices, size_t offset)
 	args.DrawElements(Thread->DrawQueue, VertexBuffer, IndexBuffer + offset / sizeof(unsigned int), numIndices);
 }
 
-double PolyModelRenderer::GetTimeFloat()
-{
-	return (double)I_msTime() * (double)TICRATE / 1000.;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 
 PolyModelVertexBuffer::PolyModelVertexBuffer(bool needindex, bool singleframe)
diff --git a/src/polyrenderer/scene/poly_model.h b/src/polyrenderer/scene/poly_model.h
index f5a9bd7794..cc12f9e6e6 100644
--- a/src/polyrenderer/scene/poly_model.h
+++ b/src/polyrenderer/scene/poly_model.h
@@ -46,7 +46,6 @@ public:
 	void SetMaterial(FTexture *skin, bool clampNoFilter, int translation) override;
 	void DrawArrays(int start, int count) override;
 	void DrawElements(int numIndices, size_t offset) override;
-	double GetTimeFloat() override;
 
 	void SetTransform();
 
diff --git a/src/r_data/models/models.cpp b/src/r_data/models/models.cpp
index 65b588f242..b49be91c35 100644
--- a/src/r_data/models/models.cpp
+++ b/src/r_data/models/models.cpp
@@ -39,6 +39,7 @@
 #include "g_levellocals.h"
 #include "r_utility.h"
 #include "r_data/models/models.h"
+#include "i_time.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable:4244) // warning C4244: conversion from 'double' to 'float', possible loss of data
@@ -277,6 +278,11 @@ void FModelRenderer::RenderFrameModels(const FSpriteModelFrame *smf,
 	}
 }
 
+double FModelRenderer::GetTimeFloat()
+{
+	return (double)I_msTime() * (double)TICRATE / 1000.;
+}
+
 /////////////////////////////////////////////////////////////////////////////
 
 void gl_LoadModels()
diff --git a/src/r_data/models/models.h b/src/r_data/models/models.h
index e6786a7210..91d3d14d61 100644
--- a/src/r_data/models/models.h
+++ b/src/r_data/models/models.h
@@ -72,10 +72,9 @@ public:
 	virtual void DrawArrays(int start, int count) = 0;
 	virtual void DrawElements(int numIndices, size_t offset) = 0;
 
-	virtual double GetTimeFloat() = 0;
-
 private:
 	void RenderFrameModels(const FSpriteModelFrame *smf, const FState *curState, const int curTics, const PClass *ti, Matrix3x4 *normaltransform, int translation);
+	static double GetTimeFloat();
 };
 
 struct FModelVertex
diff --git a/src/swrenderer/things/r_model.cpp b/src/swrenderer/things/r_model.cpp
index a07cd06828..84f4de39d5 100644
--- a/src/swrenderer/things/r_model.cpp
+++ b/src/swrenderer/things/r_model.cpp
@@ -239,11 +239,6 @@ namespace swrenderer
 		args.DrawElements(Thread->DrawQueue, VertexBuffer, IndexBuffer + offset / sizeof(unsigned int), numIndices);
 	}
 
-	double SWModelRenderer::GetTimeFloat()
-	{
-		return (double)I_msTime() * (double)TICRATE / 1000.;
-	}
-
 	/////////////////////////////////////////////////////////////////////////////
 
 	SWModelVertexBuffer::SWModelVertexBuffer(bool needindex, bool singleframe)
diff --git a/src/swrenderer/things/r_model.h b/src/swrenderer/things/r_model.h
index 7006ca8dd7..5d8f7b6886 100644
--- a/src/swrenderer/things/r_model.h
+++ b/src/swrenderer/things/r_model.h
@@ -66,7 +66,6 @@ namespace swrenderer
 		void SetMaterial(FTexture *skin, bool clampNoFilter, int translation) override;
 		void DrawArrays(int start, int count) override;
 		void DrawElements(int numIndices, size_t offset) override;
-		double GetTimeFloat() override;
 
 		void SetTransform();