FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a texture cache mechanism. Fortunately this oly seems affective for empty.rgb ...

Browse Source
This commit is contained in:
ehofman
2006-04-22 09:38:14 +00:00
parent a2a91520aa
commit 1f5ec6b8d5
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
simgear/scene/material/mat.cxx
View File

@@ -43,6 +43,9 @@ SG_USING_STD(map);
#include "mat.hxx"
static map<string, ssgTexture *> _tex_cache;
static map<string, ssgTexture *>::iterator _tex_cache_iter;
////////////////////////////////////////////////////////////////////////
// Constructors and destructor.
@@ -208,9 +211,8 @@ SGMaterial::load_texture ( int n )
if ( !_status[i].texture_loaded ) {
SG_LOG( SG_GENERAL, SG_INFO, "Loading deferred texture "
<< _status[i].texture_path );
_status[i].state->setTexture(
(char *)_status[i].texture_path.c_str(),
wrapu, wrapv, mipmap );
assignTexture(_status[i].state, _status[i].texture_path,
wrapu, wrapv, mipmap );
_status[i].texture_loaded = true;
}
}
@@ -254,8 +256,7 @@ SGMaterial::build_ssg_state( bool defer_tex_load )
if ( !defer_tex_load ) {
SG_LOG(SG_INPUT, SG_INFO, " " << _status[i].texture_path );
state->setTexture( (char *)_status[i].texture_path.c_str(),
wrapu, wrapv );
assignTexture( state, _status[i].texture_path, wrapu, wrapv );
_status[i].texture_loaded = true;
} else {
_status[i].texture_loaded = false;
@@ -286,6 +287,22 @@ void SGMaterial::set_ssg_state( ssgSimpleState *s )
_status.push_back( _internal_state( s, "", true ) );
}
void SGMaterial::assignTexture( ssgSimpleState *state, string &fname,
int _wrapu, int _wrapv, int _mipmap )
{
_tex_cache_iter = _tex_cache.find(fname);
if (_tex_cache_iter == _tex_cache.end())
{
state->setTexture((char *)fname.c_str(), _wrapu, _wrapv, _mipmap);
_tex_cache[fname] = state->getTexture();
}
else
{
state->setTexture(_tex_cache_iter->second);
// cout << "Cache hit: " << fname << endl;
}
}
////////////////////////////////////////////////////////////////////////

1
simgear/scene/material/mat.hxx
View File

@@ -243,6 +243,7 @@ private:
void build_ssg_state( bool defer_tex_load );
void set_ssg_state( ssgSimpleState *s );
void assignTexture( ssgSimpleState *state, string &fname, int _wrapu = TRUE, int _wrapv = TRUE, int _mipmap = TRUE );
};