Commit 5a663375 authored by hybrid's avatar hybrid

Remove calls to getVideoDriver by direct member access. Found by REDDemon.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3936 dfc29bdd-3216-0410-991c-e03cc46cb475
parent f0bc0158
...@@ -992,7 +992,7 @@ IAnimatedMesh* CSceneManager::addTerrainMesh(const io::path& name, ...@@ -992,7 +992,7 @@ IAnimatedMesh* CSceneManager::addTerrainMesh(const io::path& name,
const bool debugBorders=false; const bool debugBorders=false;
IMesh* mesh = GeometryCreator->createTerrainMesh(texture, heightmap, IMesh* mesh = GeometryCreator->createTerrainMesh(texture, heightmap,
stretchSize, maxHeight, getVideoDriver(), stretchSize, maxHeight, Driver,
defaultVertexBlockSize, debugBorders); defaultVertexBlockSize, debugBorders);
if (!mesh) if (!mesh)
return 0; return 0;
...@@ -1358,18 +1358,13 @@ void CSceneManager::drawAll() ...@@ -1358,18 +1358,13 @@ void CSceneManager::drawAll()
u32 i; // new ISO for scoping problem in some compilers u32 i; // new ISO for scoping problem in some compilers
// reset all transforms // reset all transforms
video::IVideoDriver* driver = getVideoDriver(); Driver->setMaterial(video::SMaterial());
if (driver) Driver->setTransform ( video::ETS_PROJECTION, core::IdentityMatrix );
{ Driver->setTransform ( video::ETS_VIEW, core::IdentityMatrix );
driver->setMaterial(video::SMaterial()); Driver->setTransform ( video::ETS_WORLD, core::IdentityMatrix );
driver->setTransform ( video::ETS_PROJECTION, core::IdentityMatrix );
driver->setTransform ( video::ETS_VIEW, core::IdentityMatrix );
driver->setTransform ( video::ETS_WORLD, core::IdentityMatrix );
for (i=video::ETS_COUNT-1; i>=video::ETS_TEXTURE_0; --i) for (i=video::ETS_COUNT-1; i>=video::ETS_TEXTURE_0; --i)
driver->setTransform ( (video::E_TRANSFORMATION_STATE)i, core::IdentityMatrix ); Driver->setTransform ( (video::E_TRANSFORMATION_STATE)i, core::IdentityMatrix );
} Driver->setAllowZWriteOnTransparent(Parameters.getAttributeAsBool( ALLOW_ZWRITE_ON_TRANSPARENT) );
driver->setAllowZWriteOnTransparent(Parameters.getAttributeAsBool( ALLOW_ZWRITE_ON_TRANSPARENT) );
// do animations and other stuff. // do animations and other stuff.
OnAnimate(os::Timer::getTime()); OnAnimate(os::Timer::getTime());
...@@ -2245,7 +2240,7 @@ void CSceneManager::writeSceneNode(io::IXMLWriter* writer, ISceneNode* node, ISc ...@@ -2245,7 +2240,7 @@ void CSceneManager::writeSceneNode(io::IXMLWriter* writer, ISceneNode* node, ISc
// write materials // write materials
if (node->getMaterialCount() && getVideoDriver()) if (node->getMaterialCount() && Driver)
{ {
const wchar_t* materialElement = L"materials"; const wchar_t* materialElement = L"materials";
...@@ -2255,7 +2250,7 @@ void CSceneManager::writeSceneNode(io::IXMLWriter* writer, ISceneNode* node, ISc ...@@ -2255,7 +2250,7 @@ void CSceneManager::writeSceneNode(io::IXMLWriter* writer, ISceneNode* node, ISc
for (u32 i=0; i < node->getMaterialCount(); ++i) for (u32 i=0; i < node->getMaterialCount(); ++i)
{ {
io::IAttributes* tmp_attr = io::IAttributes* tmp_attr =
getVideoDriver()->createAttributesFromMaterial(node->getMaterial(i), &options); Driver->createAttributesFromMaterial(node->getMaterial(i), &options);
tmp_attr->write(writer); tmp_attr->write(writer);
tmp_attr->drop(); tmp_attr->drop();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment