micqdf/opengl-cpp
1
0
Fork 0
mirror of https://github.com/MichaelFisher1997/opengl-cpp.git synced 2025-04-27 14:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Segment faults fixed!!

Browse Source
This commit is contained in:
MichaelFisher1997 2025-01-12 23:49:49 +00:00
parent 8920379ce3
commit ed0e9d8947
5 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IndexBuffer.cpp
View File

@ -6,7 +6,7 @@ IndexBuffer::IndexBuffer(const unsigned int* data, unsigned int count)
{
ASSERT(sizeof(unsigned int) == sizeof(GLuint));
//
std::cout << "m_RendererID: " << &m_RendererID << " " << m_RendererID << std::endl;
//std::cout << "m_RendererID: " << &m_RendererID << " " << m_RendererID << std::endl;
GLCall(glGenBuffers(1, &m_RendererID));
GLCall(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_RendererID)); //select buffer called 'buffer'
GLCall(glBufferData(GL_ELEMENT_ARRAY_BUFFER, count * sizeof(unsigned int), data, GL_STATIC_DRAW)); // assigne buffer size, static as we use many times, but does not change

8
src/VertexArray.cpp
View File

@ -4,10 +4,10 @@
VertexArray::VertexArray()
{
std::cout << "VertexArray::VertexArray()" << std::endl;
std::cout << "m_RendererID: " << &m_RendererID << " " << m_RendererID << std::endl;
//GLCall(glGenVertexArrays(1, &m_RendererID));
glGenVertexArrays(1, &m_RendererID);
std::cout << "m_RendererID: " << &m_RendererID << " " << m_RendererID << std::endl;
std::cout << "m_RendererID: " << &m_RendererID << std::endl;
GLCall(glGenVertexArrays(1, &m_RendererID));
//glGenVertexArrays(1, &m_RendererID);
std::cout << "m_RendererID: " << &m_RendererID << std::endl;
if (!m_RendererID) {
std::cerr << "Failed to generate VAO" << std::endl;
}

6
src/VertexBufferLayout.h
View File

@ -40,18 +40,18 @@ private:
template<>
inline void VertexBufferLayout::Push<float>(int count) {
m_Elements.push_back({ GL_FLOAT, static_cast<unsigned int>(count), GL_FALSE });
m_Stride += VertexBufferElement::GetSizeOfType(GL_FLOAT);
m_Stride += count * VertexBufferElement::GetSizeOfType(GL_FLOAT);
}
template<>
inline void VertexBufferLayout::Push<unsigned int>(int count) {
m_Elements.push_back({ GL_UNSIGNED_INT,static_cast<unsigned int>(count), GL_FALSE });
m_Stride += VertexBufferElement::GetSizeOfType(GL_UNSIGNED_INT);
m_Stride += count * VertexBufferElement::GetSizeOfType(GL_UNSIGNED_INT);
}
template<>
inline void VertexBufferLayout::Push<unsigned char>(int count) {
m_Elements.push_back({ GL_UNSIGNED_BYTE, static_cast<unsigned int>(count), GL_TRUE });
m_Stride += VertexBufferElement::GetSizeOfType(GL_UNSIGNED_BYTE);
m_Stride += count * VertexBufferElement::GetSizeOfType(GL_UNSIGNED_BYTE);
}
#endif // VERTEXBUFFERLAYOUT_H

57
src/sdl.cpp
View File

@ -62,10 +62,11 @@ SdlWindow::SdlWindow(const char* title, int width, int height)
r(0.5f),
m_glContext(nullptr),
increment(0.05f),
vao(0),
layout(nullptr),
va(nullptr),
m_ib(nullptr)
m_shader(0),
m_Location(-1),
m_IB(nullptr),
m_VB(nullptr),
m_VA(nullptr)
{
std::cout << "Step 0: hellow world" << std::endl;
@ -136,17 +137,14 @@ SdlWindow::SdlWindow(const char* title, int width, int height)
0, 1, 2,
2, 3, 0
};
VertexArray va;
VertexBuffer vb(positions, 4 * 2 * sizeof(float));
m_ib = new IndexBuffer(indices, 6);
m_VA = new VertexArray();
m_VB = new VertexBuffer(positions, 4 * 2 * sizeof(float));
m_IB = new IndexBuffer(indices, 6);
VertexBufferLayout layout;
layout.Push<float>(2);
va.AddBuffer(vb, layout);
m_VA->AddBuffer(*m_VB, layout);
ShaderProgramSource source = parseShader("res/shaders/Basic.shader");
@ -154,13 +152,15 @@ SdlWindow::SdlWindow(const char* title, int width, int height)
std::cout << "FRAGMENT" << std::endl << source.FragmentSource << std::endl;
unsigned int shader = createShader(source.VertexSource, source.FragmentSource);
std::cout << "shader: " << shader << std::endl;
GLCall(glUseProgram(shader));
m_shader = shader;
std::cout << "shader: " << m_shader << std::endl;
std::cout << "shader: " << m_shader << std::endl;
GLCall(glUseProgram(m_shader));
GLCall(unsigned int location = glGetUniformLocation(shader, "u_Color"));
ASSERT(location != -1); // -1 is an error
GLCall(m_Location = glGetUniformLocation(m_shader, "u_Color"));
ASSERT(m_Location != -1); // -1 is an error
GLCall(glUniform4f(location, 0.8f, 0.3f, 0.8f, 1.0f));
GLCall(glUniform4f(m_Location, 0.8f, 0.3f, 0.8f, 1.0f));
GLCall(glBindVertexArray(0));
GLCall(glUseProgram(0));
@ -186,13 +186,9 @@ SdlWindow::~SdlWindow() {
SDL_DestroyWindow(m_window);
m_window = nullptr;
}
if (shader) {
glDeleteProgram(shader);
shader = 0;
}
if (m_ib) {
delete m_ib;
m_ib = nullptr;
if (m_shader) {
glDeleteProgram(m_shader);
m_shader = 0;
}
SDL_Quit();
@ -205,7 +201,7 @@ void SdlWindow::run() {
update();
render();
}
GLCall(glDeleteProgram(shader));
GLCall(glDeleteProgram(m_shader));
}
//
void SdlWindow::processEvents() {
@ -270,13 +266,14 @@ void SdlWindow::render() {
//
GLCall(glClear(GL_COLOR_BUFFER_BIT));
GLCall(glUseProgram(shader));
std::cout << "shader: " << shader << std::endl;
std::cout << "location: " << location << std::endl;
GLCall(glUniform4f(location, r, 0.3f, 0.8f, 1.0f));
GLCall(glUseProgram(m_shader));
std::cout << "m_shader: " << m_shader << std::endl;
std::cout << "location: " << m_Location << std::endl;
std::cout << "R: " << r << std::endl;
GLCall(glUniform4f(m_Location, r, 0.3f, 0.8f, 1.0f));
va->Bind();
m_ib->Bind();
m_VA->Bind();
m_IB->Bind();
// TODO: Draw with OpenGL here (shaders, triangles, etc.)
//glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
GLCall(glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr)); //macro assert for debugging

15
src/sdl.hpp
View File

@ -57,16 +57,11 @@ private:
SDL_GLContext m_glContext;
float increment;
// // temp shader stuff
std::string vetexShader;
std::string fragmentShader;
unsigned int buffer;
unsigned int ibo;
unsigned int vao;
unsigned int shader;
unsigned int location;
VertexBufferLayout* layout;
VertexArray* va;
IndexBuffer* m_ib;
unsigned int m_shader;
GLint m_Location;
VertexArray* m_VA;
IndexBuffer* m_IB;
VertexBuffer* m_VB;
// Private methods
void processEvents();