From: Oliver O. <fr...@us...> - 2007-06-17 10:55:41
|
Update of /cvsroot/simspark/simspark/spark/kerosin/materialserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30561 Modified Files: Tag: projectx material2dtexture.h Log Message: - added methods to access names of the different textures used Index: material2dtexture.h =================================================================== RCS file: /cvsroot/simspark/simspark/spark/kerosin/materialserver/material2dtexture.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** material2dtexture.h 5 Dec 2005 21:38:22 -0000 1.1 --- material2dtexture.h 17 Jun 2007 10:55:31 -0000 1.1.4.1 *************** *** 40,49 **** --- 40,61 ---- /** loads the diffuse texture */ bool SetDiffuseTexture(const std::string& texName); + //! @return the name of the set diffuse texture + const std::string& GetDiffuseTextureName() const; + //! @return true if there is a diffuse texture name and a texture + bool HasDiffuseTexture() const; /** loads the normal texture */ bool SetNormalTexture(const std::string& texName); + //! @return the name of the set normal texture + const std::string& GetNormalTextureName() const; + //! @return true if there is a normal texture name and a texture + bool HasNormalTexture() const; /** loads the specular texture */ bool SetSpecularTexture(const std::string& texName); + //! @return the name of the set specular texture + const std::string& GetSpecularTextureName() const; + //! @return true if there is a specular texture name and a texture + bool HasSpecularTexture() const; /** binds the managed material, i.e. sets all necessary OpenGL *************** *** 60,69 **** --- 72,87 ---- // protected: + //! the diffuse texture name + std::string mTexDiffuseName; /** the diffuse texture */ boost::shared_ptr<Texture> mTexDiffuse; + //! the normal texture name + std::string mTexNormalName; /** the normal texture */ boost::shared_ptr<Texture> mTexNormal; + //! the specular texture name + std::string mTexSpecularName; /** the specular texture */ boost::shared_ptr<Texture> mTexSpecular; |