3d transform
This commit is contained in:
15
src/main.cpp
15
src/main.cpp
@@ -1,5 +1,8 @@
|
||||
#include <glad/glad.h>
|
||||
#include <GLFW/glfw3.h>
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
#include <shader.hpp>
|
||||
@@ -54,7 +57,7 @@ int main(void) {
|
||||
GL_STATIC_DRAW);
|
||||
|
||||
Shader *shaderProgram =
|
||||
new Shader("./shaders/TexVert.glsl", "./shaders/TexFrag.glsl");
|
||||
new Shader("./shaders/MVPTexVert.glsl", "./shaders/TexFrag.glsl");
|
||||
|
||||
unsigned int texture;
|
||||
glGenTextures(1, &texture);
|
||||
@@ -80,6 +83,12 @@ int main(void) {
|
||||
stbi_image_free(data);
|
||||
|
||||
while (!glfwWindowShouldClose(window)) {
|
||||
glm::mat4 model = glm::mat4(1.0f); /*move model*/
|
||||
glm::mat4 view = glm::mat4(1.0f); /*move camera*/
|
||||
view = glm::translate(view, glm::vec3(0.0f, 0.0f, -3.0f));
|
||||
model = glm::rotate(model, glm::radians(-55.0f), glm::vec3(1.0f, 0.0f, 0.0f));
|
||||
glm::mat4 projection = glm::perspective(glm::radians(45.0f), 800.0f / 600.0f, 0.1f, 100.0f); /*camera settings*/
|
||||
|
||||
processInput(window);
|
||||
|
||||
glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
|
||||
@@ -87,6 +96,10 @@ int main(void) {
|
||||
|
||||
shaderProgram->use();
|
||||
shaderProgram->setInt("Tex0",0);
|
||||
shaderProgram->setMat4("model",model);
|
||||
shaderProgram->setMat4("view",view);
|
||||
shaderProgram->setMat4("projection",projection);
|
||||
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
glBindTexture(GL_TEXTURE_2D, texture);
|
||||
glBindVertexArray(VAO);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <fstream>
|
||||
#include <glad/glad.h>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
#include <iostream>
|
||||
#include <shader.hpp>
|
||||
#include <sstream>
|
||||
@@ -44,6 +45,11 @@ void Shader::setFloat(const std::string &name, float value) {
|
||||
glUniform1f(glGetUniformLocation(ID, name.c_str()), value);
|
||||
}
|
||||
|
||||
void Shader::setMat4(const std::string &name, glm::mat4 value) {
|
||||
glUniformMatrix4fv(glGetUniformLocation(ID, name.c_str()), 1, GL_FALSE, glm::value_ptr(value));
|
||||
|
||||
}
|
||||
|
||||
/*priv*/
|
||||
unsigned int Shader::shaderCMPL(GLenum type, const char *src) {
|
||||
unsigned int shader;
|
||||
|
||||
Reference in New Issue
Block a user