guezoloic/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/guezoloic/LearnOpenGL.git synced 2026-03-31 11:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rework cube.cpp file

Browse Source
This commit is contained in:
Loïc GUEZO
2026-01-02 20:06:30 +01:00
parent 379203eadf
commit 721a3ceaa0
6 changed files with 129 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/cube.cpp
View File

@@ -1,10 +1,15 @@
#include "cube.hpp"
#include "ebo.hpp"
#include "render/primitives/cube.hpp"
#include "glm/ext/matrix_clip_space.hpp"
#include "glm/ext/matrix_transform.hpp"
#include "glm/gtc/type_ptr.hpp"
#include "primitives/p_cube.hpp"
#include "vao.hpp"
#include "vbo.hpp"
static GLsizei stride = 8 * sizeof(float);
Cube::Cube(Camera &camera, glm::vec3 pos, std::string texture)
: Shape(camera, pos, Shader{}, Texture{texture})
{
@@ -12,59 +17,48 @@ Cube::Cube(Camera &camera, glm::vec3 pos, std::string texture)
this->vbo.bind();
this->ebo.bind();
this->vbo.setData(VERTICE, sizeof(VERTICE));
this->ebo.setData(INDICE, sizeof(INDICE));
this->vbo.setData(P_CUBE_VERTICE, sizeof(P_CUBE_VERTICE));
this->shader.compile((const char *)__res_render_primitives_cube_vert,
(const char *)__res_render_primitives_cube_frag);
// positions
this->vao.setAttributePointer(0, 3, GL_FLOAT, stride, (void *)(0));
// normales
this->vao.setAttributePointer(1, 3, GL_FLOAT, stride,
(void *)(3 * sizeof(float)));
// texture
this->vao.setAttributePointer(2, 2, GL_FLOAT, stride,
(void *)(6 * sizeof(float)));
this->ebo.setData(P_CUBE_INDICE, sizeof(P_CUBE_INDICE));
this->shader.compile((char *)P_CUBE_VERT, (char *)P_CUBE_FRAG);
}
void Cube::render(int width, int height) {}
// Cube::Cube(Camera& camera)
// : vbo(cubeVertices, sizeof(cubeVertices)),
// ebo(cubeIndices, sizeof(cubeIndices)),
// texture("stone.png"),
// camera(camera),
// shader(cubeVertexShader, cubeFragShader)
// {
// vao.bind();
// vbo.bind();
void Cube::render(int width, int height)
{
shader.use();
glActiveTexture(GL_TEXTURE0);
// GLsizei stride = 8 * sizeof(float);
glm::vec3 coordinate = glm::vec3(0.0f, 0.0f, -1.0f);
glm::mat4 projection = glm::perspective(
glm::radians(this->camera.getFov()),
static_cast<float>(width) / static_cast<float>(height), 0.1f, 100.0f);
// vao.setAttributePointer(0, 3, GL_FLOAT, stride, (void*)0);
// vao.setAttributePointer(1, 3, GL_FLOAT, stride, (void*)(3 *
// sizeof(float))); vao.setAttributePointer(2, 2, GL_FLOAT, stride, (void*)(6
// * sizeof(float)));
GLint texLoc =
glGetUniformLocation(shader.getShaderProgramID(), "material.diffuse");
glUniform1i(texLoc, 0);
// ebo.bind();
// }
GLint projectionLoc =
glGetUniformLocation(shader.getShaderProgramID(), "projection");
glUniformMatrix4fv(projectionLoc, 1, GL_FALSE, glm::value_ptr(projection));
// void Cube::loop(int width, int height)
// {
// shader.use();
// glActiveTexture(GL_TEXTURE0);
GLint viewLoc = glGetUniformLocation(shader.getShaderProgramID(), "view");
glUniformMatrix4fv(viewLoc, 1, GL_FALSE,
glm::value_ptr(camera.getViewMatrix()));
// glm::vec3 coordinate = glm::vec3(0.0f, 0.0f, -1.0f);
// glm::mat4 projection = glm::perspective(
// glm::radians(camera.fov),
// static_cast<float>(width) / static_cast<float>(height), 0.1f, 100.0f);
glm::mat4 model = glm::translate(glm::mat4(1.0f), coordinate);
GLint modelLoc = glGetUniformLocation(shader.getShaderProgramID(), "model");
glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
// GLint texLoc = glGetUniformLocation(shader.getProgram(),
// "material.diffuse"); glUniform1i(texLoc, 0);
// GLint projectionLoc = glGetUniformLocation(shader.getProgram(),
// "projection"); glUniformMatrix4fv(projectionLoc, 1, GL_FALSE,
// glm::value_ptr(projection));
// GLint viewLoc = glGetUniformLocation(shader.getProgram(), "view");
// glUniformMatrix4fv(viewLoc, 1, GL_FALSE,
// glm::value_ptr(camera.getViewMatrix()));
// glm::mat4 model = glm::translate(glm::mat4(1.0f), coordinate);
// GLint modelLoc = glGetUniformLocation(shader.getProgram(), "model");
// glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glm::value_ptr(model));
// vao.drawElement(GL_TRIANGLES, sizeof(cubeIndices) / sizeof(unsigned int),
// GL_UNSIGNED_INT, 0);
// }
vao.drawElement(GL_TRIANGLES, sizeof(P_CUBE_INDICE) / sizeof(unsigned int),
GL_UNSIGNED_INT, 0);
}