Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
ProjectiveTextureMapping
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
WooHyungChoi
ProjectiveTextureMapping
Commits
2ab55b40
Commit
2ab55b40
authored
5 years ago
by
Woohyung Choi
Browse files
Options
Downloads
Patches
Plain Diff
rename load_image() -> make_image()
parent
7f39587e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
LearnOpenGL/ResourceLoader.cpp
+1
-1
1 addition, 1 deletion
LearnOpenGL/ResourceLoader.cpp
LearnOpenGL/ResourceLoader.h
+1
-1
1 addition, 1 deletion
LearnOpenGL/ResourceLoader.h
with
2 additions
and
2 deletions
LearnOpenGL/ResourceLoader.cpp
+
1
−
1
View file @
2ab55b40
...
...
@@ -194,7 +194,7 @@ bool openObj(const std::string fileName, std::vector<glm::vec3> &vertices, std::
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
;
stbi_set_flip_vertically_on_load
(
true
);
...
...
This diff is collapsed.
Click to expand it.
LearnOpenGL/ResourceLoader.h
+
1
−
1
View file @
2ab55b40
...
...
@@ -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
);
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
);
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
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment