Merge remote-tracking branch 'dhewm3/master'

Author: FriskTheFallenHuman

neo/framework/Common.cpp

@@ -247,7 +247,13 @@ void Com_UpdateTicNumber() {
 			int numTics = 1 + timeDiff * 0.06;
 			com_ticNumber += numTics;
 
-			nextTicTime += numTics * com_preciseFrameLengthMS;
+			// the number of msec per tic can be varied with the timescale cvar
+			float timescale = com_timescale.GetFloat();
+			if ( timescale == 1.0f ) {
+				nextTicTime += numTics * com_preciseFrameLengthMS;
+			} else {
+				nextTicTime += numTics * com_preciseFrameLengthMS / timescale;
+			}
 		}
 	}
 }
@@ -2601,7 +2607,8 @@ void idCommonLocal::Frame( void ) {
 		// set idLib frame number for frame based memory dumps
 		idLib::frameNumber = com_frameNumber;
 
-		if ( GLimp_GetSwapInterval() != 0 && fabsf(60.0f - GLimp_GetDisplayRefresh()) < 1.0f ) {
+		if ( com_timescale.GetFloat() == 1.0f && GLimp_GetSwapInterval() != 0
+		     && fabsf(60.0f - GLimp_GetDisplayRefresh()) < 1.0f ) {
 			// if we're using vsync and the display is running at about 60Hz, start next tic
 			// immediately so our internal tic time and vsync don't drift apart
 			double now = Sys_MillisecondsPrecise();

neo/renderer/Model_local.h

@@ -232,10 +232,6 @@ class idRenderModelMD3 : public idRenderModelStatic {
 	int							dataSize;		// just for listing purposes
 	struct md3Header_s *		md3;			// only if type == MOD_MESH
 	int							numLods;
-
-	int							lastFrame;
-	int							lastOldFrame;
-	float						lastBackLerp;
 	idList<const idMaterial*>	shaders;		// DG: md3Shader_t::shaderIndex indexes into this array
 
 	// DG: added the following so we can generate/store sil edges for shadows

neo/renderer/Model_md3.cpp

@@ -39,8 +39,7 @@ If you have questions concerning this license or the applicable additional terms
 ***********************************************************************/
 
 // DG: added constructor to make sure all members are initialized
-idRenderModelMD3::idRenderModelMD3() : index(-1), dataSize(0), md3(NULL), numLods(0),
-	lastFrame(-1), lastOldFrame(0), lastBackLerp(0.0f)
+idRenderModelMD3::idRenderModelMD3() : index(-1), dataSize(0), md3(NULL), numLods(0)
 {}
 
 // DG: added destructor to clean up the newly added silInfos (and md3 which used to leak)
@@ -329,21 +328,10 @@ idRenderModel *idRenderModelMD3::InstantiateDynamicModel( const struct renderEnt
 	backlerp = ent->shaderParms[SHADERPARM_MD3_BACKLERP];
 
 	if ( cachedModel ) {
-		if ( !r_useCachedDynamicModels.GetBool() || frame != lastFrame
-		     || oldframe != lastOldFrame || backlerp != lastBackLerp ) {
-			delete cachedModel;
-			cachedModel = NULL;
-		} else {
-			// if we're still in the same animation frame etc, just use the existing model
-			return cachedModel;
-		}
+		delete cachedModel;
+		cachedModel = NULL;
 	}
 
-	// DG: remember (old)frame and backlerp for the check above if the cached model can be reused
-	lastFrame = frame;
-	lastOldFrame = oldframe;
-	lastBackLerp = backlerp;
-
 	staticModel = new idRenderModelStatic;
 	staticModel->InitEmpty("_MD3_Snapshot_");
 	staticModel->bounds.Clear();