ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/supertuxkart/stk-code

Browse Source
This commit is contained in:
Marianne Gagnon 2014-01-26 19:21:50 -05:00
commit 9c29ae0b26
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/graphics/irr_driver.cpp
View File

@ -1171,6 +1171,11 @@ scene::ISceneNode *IrrDriver::addSkyBox(const std::vector<video::ITexture*>
texture[4], texture[5]); texture[4], texture[5]);
} // addSkyBox } // addSkyBox
void IrrDriver::suppressSkyBox()
{
SkyboxTextures.clear();
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
/** Adds a camera to the scene. /** Adds a camera to the scene.
*/ */

1
src/graphics/irr_driver.hpp
View File

@ -272,6 +272,7 @@ public:
int vert_res, float texture_percent, int vert_res, float texture_percent,
float sphere_percent); float sphere_percent);
scene::ISceneNode *addSkyBox(const std::vector<video::ITexture*> &texture_names); scene::ISceneNode *addSkyBox(const std::vector<video::ITexture*> &texture_names);
void suppressSkyBox();
void removeNode(scene::ISceneNode *node); void removeNode(scene::ISceneNode *node);
void removeMeshFromCache(scene::IMesh *mesh); void removeMeshFromCache(scene::IMesh *mesh);
void removeTexture(video::ITexture *t); void removeTexture(video::ITexture *t);

1
src/tracks/track.cpp
View File

@ -1585,6 +1585,7 @@ void Track::loadTrackModel(bool reverse_track, unsigned int mode_id)
// Sky dome and boxes support // Sky dome and boxes support
// -------------------------- // --------------------------
irr_driver->suppressSkyBox();
if(m_sky_type==SKY_DOME && m_sky_textures.size() > 0) if(m_sky_type==SKY_DOME && m_sky_textures.size() > 0)
{ {
scene::ISceneNode *node = irr_driver->addSkyDome(m_sky_textures[0], scene::ISceneNode *node = irr_driver->addSkyDome(m_sky_textures[0],