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

Fixed macos build problems

Browse source
This commit is contained in:
Lauchmelder23 2021-01-25 02:33:21 +01:00
parent 265a7253cc
commit 3fdeb074c1
13 changed files with 73 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/vertexArray.hpp
View file

@ -27,6 +27,10 @@ namespace oglu
/*@}*/
};
class AbstractVertexArray;
typedef std::shared_ptr<AbstractVertexArray> VertexArray;
/**
* @brief An object representing an OpenGL VAO.
*
@ -52,7 +56,7 @@ namespace oglu
*
* @return A shared pointer to the texture.
*/
friend std::shared_ptr<AbstractVertexArray> OGLU_API MakeVertexArray(const GLfloat* vertices, size_t verticesSize, const GLuint* indices, size_t indicesSize, const VertexAttribute* topology, size_t topologySize);
friend VertexArray OGLU_API MakeVertexArray(const GLfloat* vertices, size_t verticesSize, const GLuint* indices, size_t indicesSize, const VertexAttribute* topology, size_t topologySize);
/**
* @brief Constructs a new VAO.
@ -61,7 +65,7 @@ namespace oglu
*
* @param[in] filepath Path to the .obj file
*/
friend std::shared_ptr<AbstractVertexArray> OGLU_API MakeVertexArray(const char* filepath);
friend VertexArray OGLU_API MakeVertexArray(const char* filepath);
/**
* @brief Copy constructor.
@ -127,7 +131,8 @@ namespace oglu
GLsizei count; ///< Amount of indices
};
typedef std::shared_ptr<AbstractVertexArray> VertexArray;
VertexArray OGLU_API MakeVertexArray(const GLfloat* vertices, size_t verticesSize, const GLuint* indices, size_t indicesSize, const VertexAttribute* topology, size_t topologySize);
VertexArray OGLU_API MakeVertexArray(const char* filepath);
}
#endif