lauchmelder/OpenGL-utility
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added model loading

Browse source
This commit is contained in:
Robert 2021-01-30 04:02:15 +01:00
parent 707687b682
commit 8c62929e3c
24 changed files with 199852 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/texture.hpp
View file

@ -45,7 +45,7 @@ namespace oglu
*
* @return A shared pointer to the texture.
*/
friend Texture OGLU_API MakeTexture(const char* filename);
friend Texture OGLU_API MakeTexture(const char* filename, const std::string& name);
/**
* @brief Copy constructor.
@ -88,7 +88,11 @@ namespace oglu
*
* @param[in] vertexShaderFile Filepath to the image file
*/
AbstractTexture(const char* filename);
AbstractTexture(const char* filename, const std::string& name);
public:
std::string name;
std::string filepath;
private:
int width; ///< Width of the loaded image
@ -97,7 +101,7 @@ namespace oglu
GLuint texture; ///< OpenGL handle to the texture
};
Texture OGLU_API MakeTexture(const char* filename);
Texture OGLU_API MakeTexture(const char* filename, const std::string& name);
}
#endif