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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
WooHyungChoi
ProjectiveTextureMapping
Commits
f427dba8
Commit
f427dba8
authored
5 years ago
by
Woohyung Choi
Browse files
Options
Downloads
Patches
Plain Diff
Add transparent image.
Remove unused ambientMap.
parent
bd72add9
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Images/transparent.png
+0
-0
0 additions, 0 deletions
Images/transparent.png
LearnOpenGL/OpenGLWrapper.h
+0
-1
0 additions, 1 deletion
LearnOpenGL/OpenGLWrapper.h
LearnOpenGL/Source.cpp
+8
-3
8 additions, 3 deletions
LearnOpenGL/Source.cpp
with
8 additions
and
4 deletions
Images/transparent.png
0 → 100644
+
0
−
0
View file @
f427dba8
120 B
This diff is collapsed.
Click to expand it.
LearnOpenGL/OpenGLWrapper.h
+
0
−
1
View file @
f427dba8
...
@@ -34,7 +34,6 @@ private:
...
@@ -34,7 +34,6 @@ private:
GLuint
diffuseMap
;
GLuint
diffuseMap
;
GLuint
specularMap
;
GLuint
specularMap
;
GLuint
ambientMap
;
public:
public:
Material
(
GLuint
_prog
,
GLuint
_diffuseMap
,
GLuint
_specularMap
);
Material
(
GLuint
_prog
,
GLuint
_diffuseMap
,
GLuint
_specularMap
);
...
...
This diff is collapsed.
Click to expand it.
LearnOpenGL/Source.cpp
+
8
−
3
View file @
f427dba8
...
@@ -64,8 +64,13 @@ int main()
...
@@ -64,8 +64,13 @@ int main()
auto
magenta
=
load_image
(
"magenta.png"
);
auto
magenta
=
load_image
(
"magenta.png"
);
auto
orange
=
load_image
(
"orange.png"
);
auto
orange
=
load_image
(
"orange.png"
);
auto
white
=
load_image
(
"white.png"
);
auto
white
=
load_image
(
"white.png"
);
auto
transparent
=
load_image
(
"transparent.png"
);
auto
defaultMaterial
=
new
Material
(
lightmap
,
orange
,
white
);
auto
container_diffuse
=
load_image
(
"container2.png"
);
auto
container_specular
=
load_image
(
"container2_specular.png"
);
auto
defaultMaterial
=
new
Material
(
lightmap
,
orange
,
transparent
);
auto
planeMaterial
=
new
Material
(
texture_shader
,
container_diffuse
,
transparent
);
auto
teapot
=
make_render_object
(
make_mesh
(
"teapot.obj"
));
auto
teapot
=
make_render_object
(
make_mesh
(
"teapot.obj"
));
{
{
...
@@ -101,7 +106,7 @@ int main()
...
@@ -101,7 +106,7 @@ int main()
plane
->
set_scale
(
glm
::
vec3
(
10
,
10
,
1
));
plane
->
set_scale
(
glm
::
vec3
(
10
,
10
,
1
));
}
}
{
{
plane
->
set_material
(
default
Material
);
plane
->
set_material
(
plane
Material
);
}
}
auto
cube3
=
make_render_object
(
cube
);
auto
cube3
=
make_render_object
(
cube
);
...
@@ -130,7 +135,7 @@ int main()
...
@@ -130,7 +135,7 @@ int main()
cube1
->
render
(
camera
);
cube1
->
render
(
camera
);
cube2
->
render
(
camera
);
cube2
->
render
(
camera
);
cube3
->
render
(
camera
);
cube3
->
render
(
camera
);
plane
->
render
(
camera
);
//
plane->render(camera);
}
}
glfwSwapBuffers
(
window
);
glfwSwapBuffers
(
window
);
...
...
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