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

MSVC fixes

Browse Source
This commit is contained in:
ehofman
2004-03-02 14:49:01 +00:00
parent d8acc3a8f2
commit 58a0b1d2c3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/mat.cxx
+9 -5
View File
@@ -59,7 +59,8 @@ SGMaterial::SGMaterial( const string &texpath )
{ {
init(); init();
_internal_state st = { NULL, texpath, false }; _internal_state st = { NULL, "", false };
st.texture_path = texpath;
_status.push_back( st ); _status.push_back( st );
build_ssg_state( true ); build_ssg_state( true );
@@ -104,7 +105,8 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
tpath.append("Textures"); tpath.append("Textures");
tpath.append(tname); tpath.append(tname);
} }
_internal_state st = { NULL, tpath.str(), false }; _internal_state st = { NULL, "", false };
st.texture_path = tpath.str();
_status.push_back( st ); _status.push_back( st );
} }
@@ -113,7 +115,8 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
SGPath tpath( fg_root ); SGPath tpath( fg_root );
tpath.append("Textures"); tpath.append("Textures");
tpath.append(tname); tpath.append(tname);
_internal_state st = { NULL, tpath.str(), true }; _internal_state st = { NULL, "", true };
st.texture_path = tpath.str();
_status.push_back( st ); _status.push_back( st );
} }
@@ -265,8 +268,9 @@ SGMaterial::build_ssg_state( bool defer_tex_load )
void SGMaterial::set_ssg_state( ssgSimpleState *s ) void SGMaterial::set_ssg_state( ssgSimpleState *s )
{ {
s->ref(); _internal_state st = { NULL, "", true };
_internal_state st = { s, "", true }; st.state = s;
st.state->ref();
_status.push_back( st ); _status.push_back( st );
} }