Fixed macos build problems
This commit is contained in:
parent
265a7253cc
commit
3fdeb074c1
13 changed files with 73 additions and 27 deletions
|
@ -118,8 +118,8 @@ int main(int argc, char** argv)
|
|||
camera.LookAt(0.0f, 0.0f, 0.0f);
|
||||
|
||||
shader->Use();
|
||||
shader->SetUniform("texture1", crate, 0);
|
||||
shader->SetUniform("texture2", opengl, 1);
|
||||
shader->SetUniformTexture("texture1", crate, 0);
|
||||
shader->SetUniformTexture("texture2", opengl, 1);
|
||||
shader->SetUniform("model", square);
|
||||
shader->SetUniformMatrix4fv("view", 1, GL_FALSE, glm::value_ptr(camera.GetMatrix()));
|
||||
shader->SetUniformMatrix4fv("projection", 1, GL_FALSE, glm::value_ptr(camera.GetProjection()));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue