archie
/
Exponent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: archie:06e7e308ccd7a327528b9c1897c99419d2b4e81f
Branches Tags
archie:main
..
compare: archie:25087ea6b45b7b430926ceb7eb7fede563b149b8
Branches Tags
archie:main

No commits in common. "06e7e308ccd7a327528b9c1897c99419d2b4e81f" and "25087ea6b45b7b430926ceb7eb7fede563b149b8" have entirely different histories.
06e7e308cc ... 25087ea6b4

2 changed files with 3 additions and 5 deletions
Show Stats Expand all files Collapse all files

5
src/Quad.cc
View File

@ -37,8 +37,9 @@ void Quad::draw(GLFWwindow *w) {
glm::mat4 translate = glm::mat4 translate =
glm::translate(glm::mat4(1.0f), glm::vec3(m_pos_x, m_pos_y, 0.0f)); glm::translate(glm::mat4(1.0f), glm::vec3(m_pos_x, m_pos_y, 0.0f));
glm::mat4 rotate = glm::rotate(glm::mat4(1.0f), glm::radians(m_rotation), glm::mat4 rotate =
glm::vec3(0.0f, 0.0f, 1.0f)); glm::rotate(glm::mat4(1.0f), (float)glfwGetTime() * glm::radians(50.0f),
glm::vec3(0.0f, 0.0f, 1.0f));
glm::mat4 scale = glm::scale(glm::mat4(1.0f), glm::vec3(1.0f)); glm::mat4 scale = glm::scale(glm::mat4(1.0f), glm::vec3(1.0f));
glm::mat4 model = translate * rotate * scale; glm::mat4 model = translate * rotate * scale;
glm::mat4 view = glm::mat4(1.0f); glm::mat4 view = glm::mat4(1.0f);

3
src/main.cc
View File

@ -117,13 +117,10 @@ static void init_opengl() {
init_shaders(); init_shaders();
quads.push_back(new Quad(std::span<float>(verts), uniform_locations));
quads.push_back(new Quad(std::span<float>(verts), uniform_locations)); quads.push_back(new Quad(std::span<float>(verts), uniform_locations));
quads[0]->m_pos_y = 40; quads[0]->m_pos_y = 40;
quads[0]->m_pos_x = 40; quads[0]->m_pos_x = 40;
quads[1]->m_pos_y = 40;
quads[1]->m_pos_x = 400;
} }
int main() { int main() {