projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Circular cursor + dragging
[opengl.git]
/
skybox.cpp
diff --git
a/skybox.cpp
b/skybox.cpp
index 83f130855fa668919ea9ca938230a117bb839e5f..1c99e9588e1c1abd182525ae1bf537607ab2325d 100644
(file)
--- a/
skybox.cpp
+++ b/
skybox.cpp
@@
-35,7
+35,7
@@
void Skybox::generatePrefilterMap() const {
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_CUBE_MAP, cubemapTexId);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_CUBE_MAP, cubemapTexId);
- setupVertices(prefilterProg.progId, cube());
+ setupVertices(prefilterProg.progId, cube
Array
());
glBindFramebuffer(GL_FRAMEBUFFER, captureFBO);
constexpr GLuint MAX_MIP_LEVELS = 5;
glBindFramebuffer(GL_FRAMEBUFFER, captureFBO);
constexpr GLuint MAX_MIP_LEVELS = 5;
@@
-124,7
+124,7
@@
Skybox::Skybox(const Image img): program("skyboxvert.glsl", "skyboxfrag.glsl") {
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
// generate vertices
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
// generate vertices
- setupVertices(equiProg.progId, cube());
+ setupVertices(equiProg.progId, cube
Array
());
// render the cube
// render the cube
@@
-165,7
+165,7
@@
Skybox::Skybox(const Image img): program("skyboxvert.glsl", "skyboxfrag.glsl") {
glBindTexture(GL_TEXTURE_CUBE_MAP, cubemapTexId);
// generate vertices
glBindTexture(GL_TEXTURE_CUBE_MAP, cubemapTexId);
// generate vertices
- setupVertices(irradianceProg.progId, cube());
+ setupVertices(irradianceProg.progId, cube
Array
());
// render irradiance map
glViewport(0, 0, 32, 32);
// render irradiance map
glViewport(0, 0, 32, 32);
@@
-186,7
+186,7
@@
Skybox::Skybox(const Image img): program("skyboxvert.glsl", "skyboxfrag.glsl") {
glDepthFunc(GL_LEQUAL);
// reverse so facing inside out
glDepthFunc(GL_LEQUAL);
// reverse so facing inside out
- vao = setupVertices(program.progId, cube(), true);
+ vao = setupVertices(program.progId, cube
Array
(), true);
// restore default framebuffer
glBindFramebuffer(GL_FRAMEBUFFER, 0);
// restore default framebuffer
glBindFramebuffer(GL_FRAMEBUFFER, 0);