Changeset 6417 for code/trunk/src/libraries/tools/Shader.cc
- Timestamp:
- Dec 25, 2009, 10:23:58 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/tools/Shader.cc
r5781 r6417 57 57 this->bLoadCompositor_ = GameMode::showsGraphics(); 58 58 this->bViewportInitialized_ = false; 59 this->compositor_ = "";60 this->oldcompositor_ = "";61 59 62 60 if (this->bLoadCompositor_ && Ogre::Root::getSingletonPtr()) … … 79 77 Shader::~Shader() 80 78 { 81 82 if (this->bLoadCompositor_ && this->compositorInstance_) 79 if (this->compositorInstance_ && this->bLoadCompositor_) 83 80 { 84 81 Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport(); … … 112 109 Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport(); 113 110 assert(viewport); 114 if ( this->oldcompositor_ != "")111 if (!this->oldcompositor_.empty()) 115 112 { 116 113 Ogre::CompositorManager::getSingleton().removeCompositor(viewport, this->oldcompositor_); 117 114 this->compositorInstance_ = 0; 118 115 } 119 if ( this->compositor_ != "")116 if (!this->compositor_.empty()) 120 117 { 121 118 this->compositorInstance_ = Ogre::CompositorManager::getSingleton().addCompositor(viewport, this->compositor_); … … 299 296 continue; 300 297 301 if ( pass_pointer->getFragmentProgramName() != "")298 if (!pass_pointer->getFragmentProgramName().empty()) 302 299 { 303 300 Ogre::GpuProgramParameters* parameter_pointer = pass_pointer->getFragmentProgramParameters().get();
Note: See TracChangeset
for help on using the changeset viewer.