From 3e1843b129c2dda256aced89b83c54f446daf86e Mon Sep 17 00:00:00 2001 From: curaga Date: Sat, 1 Jun 2013 10:11:43 +0000 Subject: [PATCH] Using namespace irr, so use it git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12833 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/graphics/irr_driver.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp index d66d4df99..7f5ed8520 100644 --- a/src/graphics/irr_driver.cpp +++ b/src/graphics/irr_driver.cpp @@ -1079,7 +1079,7 @@ video::ITexture *IrrDriver::getTexture(const std::string &filename, // FIXME check param, not name if(is_premul && StringUtils::hasSuffix(filename.c_str(), ".png") && - (img->getColorFormat() == irr::video::ECF_A8R8G8B8) && + (img->getColorFormat() == video::ECF_A8R8G8B8) && img->lock()) { core::dimension2d dim = img->getDimension(); @@ -1101,7 +1101,7 @@ video::ITexture *IrrDriver::getTexture(const std::string &filename, // Other formats can be premul, but the tasks can be non premul // So divide to get the separate RGBA (only possible if alpha!=0) else if(is_prediv && - (img->getColorFormat() == irr::video::ECF_A8R8G8B8) && + (img->getColorFormat() == video::ECF_A8R8G8B8) && img->lock()) { core::dimension2d dim = img->getDimension(); @@ -1344,7 +1344,7 @@ void IrrDriver::drawDebugMeshes() scene::ISkinnedMesh* smesh = static_cast(mesh); - const core::array< irr::scene::ISkinnedMesh::SJoint * >& joints = + const core::array< scene::ISkinnedMesh::SJoint * >& joints = smesh->getAllJoints(); for (unsigned int j=0; j& joints + scene::ISkinnedMesh::SJoint* parent = NULL; + const core::array< scene::ISkinnedMesh::SJoint * >& joints = mesh->getAllJoints(); for (unsigned int j=0; j& mesh, ->addLightSceneNode(NULL, sun_pos, video::SColorf(1.0f,1.0f,1.0f), 10000.0f /* radius */); m_light->getLightData().DiffuseColor - = irr::video::SColorf(0.5f, 0.5f, 0.5f, 0.5f); + = video::SColorf(0.5f, 0.5f, 0.5f, 0.5f); m_light->getLightData().SpecularColor - = irr::video::SColorf(1.0f, 1.0f, 1.0f, 1.0f); + = video::SColorf(1.0f, 1.0f, 1.0f, 1.0f); m_rtt_main_node->setMaterialFlag(video::EMF_GOURAUD_SHADING , true); m_rtt_main_node->setMaterialFlag(video::EMF_LIGHTING, true);