lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-04 07:43:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Source/model tweaks for updated revision.

Browse Source
This commit is contained in:
Joey de Vries
2020-05-04 10:57:08 +02:00
parent 66d51ae668
commit f36653f736
41 changed files with 2067 additions and 20932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/objects/backpack/specular.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 MiB

After

Width:  |  Height:  |  Size: 5.2 MiB

BIN
resources/objects/planet/mars.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 MiB

14
resources/objects/planet/planet.mtl
View File

@@ -1,13 +1,13 @@
# Blender MTL # Blender MTL File: 'None'
# Material Count: 1 # Material Count: 1
newmtl Material.001 newmtl Mars
Ns 96.078431 Ns 96.078443
Ka 0.000000 0.000000 0.000000 Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000 Kd 0.640000 0.640000 0.640000
Ks 0.087302 0.087302 0.087302 Ks 0.500000 0.500000 0.500000
Ke 0.0 0.0 0.0
Ni 1.000000 Ni 1.000000
d 1.000000 d 1.000000
illum 2 illum 2
map_Kd planet_Quom1200.png map_Kd mars.png
map_Bump planet_Quom1200.png

22835
resources/objects/planet/planet.obj
View File

File diff suppressed because it is too large Load Diff

BIN
resources/objects/planet/planet_Quom1200.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 MiB

2
resources/objects/planet/source.txt Normal file
View File

@@ -0,0 +1,2 @@
From TurboSquid, by Gerhald3D: https://www.turbosquid.com/3d-models/realistic-mars-photorealistic-2k-3d-1277433
Slightly modified by Joey de Vries: keep only planet layer, assign diffuse texture to material slot, desaturated texture somewhat.

1
resources/objects/rock/rock.mtl
View File

@@ -9,5 +9,4 @@ Ks 0.007937 0.007937 0.007937
Ni 1.000000 Ni 1.000000
d 1.000000 d 1.000000
illum 2 illum 2
map_Kd rock.png
map_Bump rock.png map_Bump rock.png

BIN
resources/textures/container2_specular_colored.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 142 KiB

4
src/4.advanced_opengl/1.1.depth_testing/depth_testing.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/4.advanced_opengl/1.2.depth_testing_view/depth_testing_view.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/4.advanced_opengl/10.1.instancing_quads/instancing_quads.cpp
View File

@@ -9,8 +9,8 @@
void framebuffer_size_callback(GLFWwindow* window, int width, int height); void framebuffer_size_callback(GLFWwindow* window, int width, int height);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
int main() int main()
{ {

4
src/4.advanced_opengl/10.2.asteroids/asteroids.cpp
View File

@@ -19,8 +19,8 @@ void scroll_callback(GLFWwindow* window, double xoffset, double yoffset);
void processInput(GLFWwindow *window); void processInput(GLFWwindow *window);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 55.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 55.0f));

4
src/4.advanced_opengl/10.3.asteroids_instanced/asteroids_instanced.cpp
View File

@@ -19,8 +19,8 @@ void scroll_callback(GLFWwindow* window, double xoffset, double yoffset);
void processInput(GLFWwindow *window); void processInput(GLFWwindow *window);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 155.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 155.0f));

4
src/4.advanced_opengl/11.anti_aliasing_offscreen/anti_aliasing_offscreen.cpp
View File

@@ -19,8 +19,8 @@ void scroll_callback(GLFWwindow* window, double xoffset, double yoffset);
void processInput(GLFWwindow *window); void processInput(GLFWwindow *window);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/4.advanced_opengl/2.stencil_testing/stencil_testing.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

6
src/4.advanced_opengl/3.1.blending_discard/blending_discard.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
@@ -248,7 +248,7 @@ int main()
// vegetation // vegetation
glBindVertexArray(transparentVAO); glBindVertexArray(transparentVAO);
glBindTexture(GL_TEXTURE_2D, transparentTexture); glBindTexture(GL_TEXTURE_2D, transparentTexture);
for (GLuint i = 0; i < vegetation.size(); i++) for (unsigned int i = 0; i < vegetation.size(); i++)
{ {
model = glm::mat4(1.0f); model = glm::mat4(1.0f);
model = glm::translate(model, vegetation[i]); model = glm::translate(model, vegetation[i]);

4
src/4.advanced_opengl/3.2.blending_sort/blending_sorted.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

6
src/4.advanced_opengl/5.1.framebuffers/framebuffers.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
@@ -182,7 +182,7 @@ int main()
// load textures // load textures
// ------------- // -------------
unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/marble.jpg").c_str()); unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/container.jpg").c_str());
unsigned int floorTexture = loadTexture(FileSystem::getPath("resources/textures/metal.png").c_str()); unsigned int floorTexture = loadTexture(FileSystem::getPath("resources/textures/metal.png").c_str());
// shader configuration // shader configuration

6
src/4.advanced_opengl/5.2.framebuffers_exercise1/framebuffers_exercise1.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
@@ -182,7 +182,7 @@ int main()
// load textures // load textures
// ------------- // -------------
unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/marble.jpg").c_str()); unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/container.jpg").c_str());
unsigned int floorTexture = loadTexture(FileSystem::getPath("resources/textures/metal.png").c_str()); unsigned int floorTexture = loadTexture(FileSystem::getPath("resources/textures/metal.png").c_str());
// shader configuration // shader configuration

6
src/4.advanced_opengl/6.1.cubemaps_skybox/cubemaps_skybox.cpp
View File

@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
unsigned int loadCubemap(vector<std::string> faces); unsigned int loadCubemap(vector<std::string> faces);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
@@ -195,7 +195,7 @@ int main()
// load textures // load textures
// ------------- // -------------
unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/marble.jpg").c_str()); unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/container.jpg").c_str());
vector<std::string> faces vector<std::string> faces
{ {

4
src/4.advanced_opengl/6.2.cubemaps_environment_mapping/cubemaps_environment_mapping.cpp
View File

@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
unsigned int loadCubemap(vector<std::string> faces); unsigned int loadCubemap(vector<std::string> faces);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/4.advanced_opengl/8.advanced_glsl_ubo/advanced_glsl_ubo.cpp
View File

@@ -18,8 +18,8 @@ void mouse_callback(GLFWwindow* window, double xpos, double ypos);
void processInput(GLFWwindow *window); void processInput(GLFWwindow *window);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/4.advanced_opengl/9.1.geometry_shader_houses/geometry_shader_houses.cpp
View File

@@ -9,8 +9,8 @@
void framebuffer_size_callback(GLFWwindow* window, int width, int height); void framebuffer_size_callback(GLFWwindow* window, int width, int height);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
int main() int main()
{ {

4
src/4.advanced_opengl/9.2.geometry_shader_exploding/geometry_shader_exploding.cpp
View File

@@ -19,8 +19,8 @@ void scroll_callback(GLFWwindow* window, double xoffset, double yoffset);
void processInput(GLFWwindow *window); void processInput(GLFWwindow *window);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

11
src/4.advanced_opengl/9.3.geometry_shader_normals/normal_visualization.cpp
View File

@@ -19,8 +19,8 @@ void scroll_callback(GLFWwindow* window, double xoffset, double yoffset);
void processInput(GLFWwindow *window); void processInput(GLFWwindow *window);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
@@ -81,7 +81,8 @@ int main()
// load models // load models
// ----------- // -----------
Model nanosuit(FileSystem::getPath("resources/objects/nanosuit/nanosuit.obj")); stbi_set_flip_vertically_on_load(true);
Model backpack(FileSystem::getPath("resources/objects/backpack/backpack.obj"));
// render loop // render loop
// ----------- // -----------
@@ -112,7 +113,7 @@ int main()
shader.setMat4("model", model); shader.setMat4("model", model);
// draw model as usual // draw model as usual
nanosuit.Draw(shader); backpack.Draw(shader);
// then draw model with normal visualizing geometry shader // then draw model with normal visualizing geometry shader
normalShader.use(); normalShader.use();
@@ -120,7 +121,7 @@ int main()
normalShader.setMat4("view", view); normalShader.setMat4("view", view);
normalShader.setMat4("model", model); normalShader.setMat4("model", model);
nanosuit.Draw(normalShader); backpack.Draw(normalShader);
// glfw: swap buffers and poll IO events (keys pressed/released, mouse moved etc.) // glfw: swap buffers and poll IO events (keys pressed/released, mouse moved etc.)
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------

4
src/5.advanced_lighting/1.advanced_lighting/advanced_lighting.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path); unsigned int loadTexture(const char *path);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
bool blinn = false; bool blinn = false;
bool blinnKeyPressed = false; bool blinnKeyPressed = false;

4
src/5.advanced_lighting/2.gamma_correction/gamma_correction.cpp
View File

@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
unsigned int loadTexture(const char *path, bool gammaCorrection); unsigned int loadTexture(const char *path, bool gammaCorrection);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
bool gammaEnabled = false; bool gammaEnabled = false;
bool gammaKeyPressed = false; bool gammaKeyPressed = false;

4
src/5.advanced_lighting/3.1.1.shadow_mapping_depth/shadow_mapping_depth.cpp
View File

@@ -23,8 +23,8 @@ void renderCube();
void renderQuad(); void renderQuad();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/5.advanced_lighting/3.1.2.shadow_mapping_base/shadow_mapping_base.cpp
View File

@@ -23,8 +23,8 @@ void renderCube();
void renderQuad(); void renderQuad();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/5.advanced_lighting/3.1.3.shadow_mapping/shadow_mapping.cpp
View File

@@ -23,8 +23,8 @@ void renderCube();
void renderQuad(); void renderQuad();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/5.advanced_lighting/3.2.1.point_shadows/point_shadows.cpp
View File

@@ -22,8 +22,8 @@ void renderScene(const Shader &shader);
void renderCube(); void renderCube();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
bool shadows = true; bool shadows = true;
bool shadowsKeyPressed = false; bool shadowsKeyPressed = false;

4
src/5.advanced_lighting/3.2.2.point_shadows_soft/point_shadows_soft.cpp
View File

@@ -22,8 +22,8 @@ void renderScene(const Shader &shader);
void renderCube(); void renderCube();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
bool shadows = true; bool shadows = true;
bool shadowsKeyPressed = false; bool shadowsKeyPressed = false;

4
src/5.advanced_lighting/4.normal_mapping/normal_mapping.cpp
View File

@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
void renderQuad(); void renderQuad();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));

4
src/5.advanced_lighting/5.1.parallax_mapping/parallax_mapping.cpp
View File

@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
void renderQuad(); void renderQuad();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
float heightScale = 0.1; float heightScale = 0.1;
// camera // camera

4
src/5.advanced_lighting/5.2.steep_parallax_mapping/steep_parallax_mapping.cpp
View File

@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
void renderQuad(); void renderQuad();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
float heightScale = 0.1; float heightScale = 0.1;
// camera // camera

4
src/5.advanced_lighting/5.3.parallax_occlusion_mapping/parallax_occlusion_mapping.cpp
View File

@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
void renderQuad(); void renderQuad();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
float heightScale = 0.1; float heightScale = 0.1;
// camera // camera

4
src/5.advanced_lighting/6.hdr/hdr.cpp
View File

@@ -22,8 +22,8 @@ void renderQuad();
void renderCube(); void renderCube();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
bool hdr = true; bool hdr = true;
bool hdrKeyPressed = false; bool hdrKeyPressed = false;
float exposure = 1.0f; float exposure = 1.0f;

4
src/5.advanced_lighting/7.bloom/bloom.cpp
View File

@@ -22,8 +22,8 @@ void renderQuad();
void renderCube(); void renderCube();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
bool bloom = true; bool bloom = true;
bool bloomKeyPressed = false; bool bloomKeyPressed = false;
float exposure = 1.0f; float exposure = 1.0f;

4
src/5.advanced_lighting/8.1.deferred_shading/deferred_shading.cpp
View File

@@ -21,8 +21,8 @@ void renderQuad();
void renderCube(); void renderCube();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 880;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 5.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 5.0f));

4
src/5.advanced_lighting/8.2.deferred_shading_volumes/deferred_shading_volumes.cpp
View File

@@ -21,8 +21,8 @@ void renderQuad();
void renderCube(); void renderCube();
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
// camera // camera
Camera camera(glm::vec3(0.0f, 0.0f, 5.0f)); Camera camera(glm::vec3(0.0f, 0.0f, 5.0f));

4
src/7.in_practice/1.debugging/debugging.cpp
View File

@@ -15,8 +15,8 @@ void framebuffer_size_callback(GLFWwindow* window, int width, int height);
void processInput(GLFWwindow *window); void processInput(GLFWwindow *window);
// settings // settings
const unsigned int SCR_WIDTH = 1280; const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 720; const unsigned int SCR_HEIGHT = 600;
GLenum glCheckError_(const char *file, int line) GLenum glCheckError_(const char *file, int line)