Skip to content
Snippets Groups Projects
Commit 2ab55b40 authored by Woohyung Choi's avatar Woohyung Choi
Browse files

rename load_image() -> make_image()

parent 7f39587e
No related branches found
No related tags found
No related merge requests found
...@@ -194,7 +194,7 @@ bool openObj(const std::string fileName, std::vector<glm::vec3> &vertices, std:: ...@@ -194,7 +194,7 @@ bool openObj(const std::string fileName, std::vector<glm::vec3> &vertices, std::
return true; return true;
} }
Image *load_Image(std::string fileName, int *width, int *height, int *nrChannels) Image *make_Image(std::string fileName, int *width, int *height, int *nrChannels)
{ {
fileName = "../Images/" + fileName; fileName = "../Images/" + fileName;
stbi_set_flip_vertically_on_load(true); stbi_set_flip_vertically_on_load(true);
......
...@@ -38,5 +38,5 @@ glm::vec3 string_to_vec3(std::vector<std::string> &input); ...@@ -38,5 +38,5 @@ glm::vec3 string_to_vec3(std::vector<std::string> &input);
int parse_lines(std::ifstream &ifs, std::vector<glm::vec3> &vertices, std::vector<glm::vec2> &vertexTexCoord, std::vector<glm::vec3> &vertexNormals); int parse_lines(std::ifstream &ifs, std::vector<glm::vec3> &vertices, std::vector<glm::vec2> &vertexTexCoord, std::vector<glm::vec3> &vertexNormals);
std::vector<std::string> parse_line(std::string &line); std::vector<std::string> parse_line(std::string &line);
bool openObj(const std::string fileName, std::vector<glm::vec3> &vertices, std::vector<glm::vec2> &vertexTexCoord, std::vector<glm::vec3> &vertexNormals); bool openObj(const std::string fileName, std::vector<glm::vec3> &vertices, std::vector<glm::vec2> &vertexTexCoord, std::vector<glm::vec3> &vertexNormals);
Image *load_Image(std::string fileName, int *width, int *height, int *nrChannels); Image *make_Image(std::string fileName, int *width, int *height, int *nrChannels);
void free_image(Image *img); void free_image(Image *img);
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment