lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +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

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);
// settings
const unsigned int SCR_WIDTH = 1280;
const unsigned int SCR_HEIGHT = 720;
const unsigned int SCR_WIDTH = 800;
const unsigned int SCR_HEIGHT = 600;
// camera
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
@@ -248,7 +248,7 @@ int main()
// vegetation
glBindVertexArray(transparentVAO);
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::translate(model, vegetation[i]);