Changeset 11054 for code/branches/cpp11_v3/src/libraries/tools/Shader.h
- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/tools/Shader.h
r10727 r11054 48 48 { 49 49 public: 50 Shader(Ogre::SceneManager* scenemanager = 0);50 Shader(Ogre::SceneManager* scenemanager = nullptr); 51 51 virtual ~Shader(); 52 52 … … 87 87 { return this->scenemanager_; } 88 88 89 virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera) ;89 virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera) override; 90 90 91 91 void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value); 92 92 void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value); 93 93 94 virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr) ;94 virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr) override; 95 95 96 96 private:
Note: See TracChangeset
for help on using the changeset viewer.