Commit 98e6a4d3 authored by Janis Born's avatar Janis Born

rename loadVertexArrayObjectVAO to loadVertexArrayObjectFromVAO

parent eb6656fd
...@@ -36,7 +36,7 @@ SharedVertexArrayObject loadVertexArrayObject(const std::string& _filename, bool ...@@ -36,7 +36,7 @@ SharedVertexArrayObject loadVertexArrayObject(const std::string& _filename, bool
//! http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/Vao_File_Format //! http://www.graphics.rwth-aachen.de/redmine/projects/acgl/wiki/Vao_File_Format
//! A VAO file can contain several named EABs. Only the EAB whose name matches _eabName will be loaded //! A VAO file can contain several named EABs. Only the EAB whose name matches _eabName will be loaded
//! and attached to the VAO. If _eabName is left blank, the first defined EAB will be used. //! and attached to the VAO. If _eabName is left blank, the first defined EAB will be used.
SharedVertexArrayObject loadVertexArrayObjectVAO(const std::string& _filename, const std::string& _eabName = ""); SharedVertexArrayObject loadVertexArrayObjectFromVAO(const std::string& _filename, const std::string& _eabName = "");
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
// library specific save // library specific save
......
...@@ -47,7 +47,7 @@ SharedVertexArrayObject loadVertexArrayObject(const std::string& _filename, bool ...@@ -47,7 +47,7 @@ SharedVertexArrayObject loadVertexArrayObject(const std::string& _filename, bool
SharedVertexArrayObject vao; SharedVertexArrayObject vao;
if(fileEnding == "vao") if(fileEnding == "vao")
{ {
vao = loadVertexArrayObjectVAO(loadFileName); vao = loadVertexArrayObjectFromVAO(loadFileName);
} }
else else
{ {
......
...@@ -50,7 +50,7 @@ namespace OpenGL{ ...@@ -50,7 +50,7 @@ namespace OpenGL{
// library specific load // library specific load
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
SharedVertexArrayObject loadVertexArrayObjectVAO(const std::string& _filename, const std::string& _eabName) SharedVertexArrayObject loadVertexArrayObjectFromVAO(const std::string& _filename, const std::string& _eabName)
{ {
SharedVertexArrayObject vao(new VertexArrayObject()); SharedVertexArrayObject vao(new VertexArrayObject());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment