Make delayed texture delete...actually delay texture deletion rather than keep them in memory indefinitely.

Author: xwidghet

src/Font.cpp

@@ -220,13 +220,16 @@ void FontPage::SetExtraPixels( int iDrawExtraPixelsLeft, int iDrawExtraPixelsRig
 
 FontPage::~FontPage()
 {
+	// Font texture ref time is reset when unloaded so that on screen changes farther than 30 seconds apart they can be reused -xwidghet
 	if( m_FontPageTextures.m_pTextureMain != NULL )
 	{
+		m_FontPageTextures.m_pTextureMain->m_lastRefTime.Touch();
 		TEXTUREMAN->UnloadTexture( m_FontPageTextures.m_pTextureMain );
 		m_FontPageTextures.m_pTextureMain = NULL;
 	}
 	if( m_FontPageTextures.m_pTextureStroke != NULL )
 	{
+		m_FontPageTextures.m_pTextureStroke->m_lastRefTime.Touch();
 		TEXTUREMAN->UnloadTexture( m_FontPageTextures.m_pTextureStroke );
 		m_FontPageTextures.m_pTextureStroke = NULL;
 	}

src/RageTexture.h

@@ -5,6 +5,7 @@
 
 #include "RageTypes.h"
 #include "RageTextureID.h"
+#include "RageTimer.h"
 
 struct lua_State;
 class RageTexture
@@ -57,6 +58,7 @@ class RageTexture
 	RageTextureID::TexPolicy &GetPolicy() { return m_ID.Policy; }
 	int		m_iRefCount;
 	bool	m_bWasUsed;
+	RageTimer m_lastRefTime;
 
 	// The ID that we were asked to load:
 	const RageTextureID &GetID() const { return m_ID; }

src/RageTextureManager.cpp

@@ -58,6 +58,14 @@ RageTextureManager::~RageTextureManager()
 
 void RageTextureManager::Update( float fDeltaTime )
 {
+	static RageTimer garbageCollector;
+	if (garbageCollector.PeekDeltaTime() >= 30.0f)
+	{
+		DoDelayedDelete();
+		garbageCollector.Touch();
+	}
+		
+
 	FOREACHM(RageTextureID, RageTexture*, m_textures_to_update, i)
 	{
 		RageTexture* pTexture = i->second;
@@ -183,8 +191,12 @@ RageTexture* RageTextureManager::LoadTextureInternal( RageTextureID ID )
 RageTexture* RageTextureManager::LoadTexture( const RageTextureID &ID )
 {
 	RageTexture* pTexture = LoadTextureInternal( ID );
-	if( pTexture )
+	if ( pTexture )
+	{
+		pTexture->m_lastRefTime.Touch();
 		pTexture->m_bWasUsed = true;
+	}
+		
 	return pTexture;
 }
 
@@ -219,7 +231,7 @@ void RageTextureManager::UnloadTexture( RageTexture *t )
 		bDeleteThis = true;
 
 	/* Delete normal textures immediately unless m_bDelayedDelete is is on. */
-	if( t->GetPolicy() == RageTextureID::TEX_DEFAULT && !m_Prefs.m_bDelayedDelete )
+	if( t->GetPolicy() == RageTextureID::TEX_DEFAULT && (!m_Prefs.m_bDelayedDelete || t->m_lastRefTime.PeekDeltaTime() >= 30.0f) )
 		bDeleteThis = true;
 
 	/* Delete volatile textures after they've been used at least once. */