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

Removed global instance of the material manager. Each application will

Browse Source 
need to create it's own instance itself.
This commit is contained in:
curt
2003-05-14 18:27:25 +00:00
parent c01740d516
commit a2c8cfb84d
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/matlib.cxx
+4 -6
View File
@@ -55,15 +55,12 @@ SG_USING_NAMESPACE(std);
SG_USING_STD(string); SG_USING_STD(string);
// global material management class
SGMaterialLib material_lib;
// Constructor // Constructor
SGMaterialLib::SGMaterialLib ( void ) { SGMaterialLib::SGMaterialLib ( void ) {
} }
#if 0 // debugging infrastructure
static int gen_test_light_map() { static int gen_test_light_map() {
static const int env_tex_res = 32; static const int env_tex_res = 32;
int half_res = env_tex_res / 2; int half_res = env_tex_res / 2;
@@ -99,6 +96,7 @@ static int gen_test_light_map() {
return tex_name; return tex_name;
} }
#endif
// generate standard colored directional light environment texture map // generate standard colored directional light environment texture map
@@ -553,7 +551,7 @@ bool SGMaterialLib::add_item ( const string &mat_name, const string &full_path )
SG_LOG( SG_TERRAIN, SG_INFO, " Loading material " SG_LOG( SG_TERRAIN, SG_INFO, " Loading material "
<< mat_name << " (" << full_path << ")"); << mat_name << " (" << full_path << ")");
material_lib.matlib[mat_name] = new SGMaterial( full_path ); matlib[mat_name] = new SGMaterial( full_path );
return true; return true;
} }
@@ -567,7 +565,7 @@ bool SGMaterialLib::add_item ( const string &mat_name, ssgSimpleState *state )
SG_LOG( SG_TERRAIN, SG_INFO, " Loading material given a premade " SG_LOG( SG_TERRAIN, SG_INFO, " Loading material given a premade "
<< "ssgSimpleState = " << mat_name ); << "ssgSimpleState = " << mat_name );
material_lib.matlib[mat_name] = m; matlib[mat_name] = m;
return true; return true;
} }
simgear/scene/material/matlib.hxx
-4
View File
@@ -90,8 +90,4 @@ public:
}; };
// global material management class
extern SGMaterialLib material_lib;
#endif // _MATLIB_HXX #endif // _MATLIB_HXX