naifb/NBEngine
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Compare commits

base: naifb:75bda91302ba312ca3c903545b6be61e1d0c41c0
Branches Tags
naifb:main
naifb:buffer_update
naifb:error_struct
..
compare: naifb:521483f4e054750af764575c7b228223b978da2d
Branches Tags
naifb:main
naifb:buffer_update
naifb:error_struct

No commits in common. "75bda91302ba312ca3c903545b6be61e1d0c41c0" and "521483f4e054750af764575c7b228223b978da2d" have entirely different histories.
75bda91302 ... 521483f4e0

3 changed files with 4 additions and 14 deletions
Show Stats Expand all files Collapse all files

4
engine/NBGraphics/Buffers.hpp
View File

@ -72,10 +72,10 @@ class Buffer : public OpenGLObject {
if (_id) { if (_id) {
glBindBuffer(Target, _id); glBindBuffer(Target, _id);
} else { } else {
WARN(BufferError( THROW(BufferError(
Codes::INVALID_BUFFER, Codes::INVALID_BUFFER,
"w/ BufferType " + BufferTypes.at(Target) "w/ BufferType " + BufferTypes.at(Target)
), 0xFE); ));
} }
} }
virtual void unbind() const override { glBindBuffer(Target, 0); } virtual void unbind() const override { glBindBuffer(Target, 0); }

8
engine/NBGraphics/src/ProgramPipeline.cpp
View File

@ -17,13 +17,7 @@ const ErrorCodeMap ProgramError::ErrorMessages = {
Shader::Shader(GLenum target_, const std::string& source_) : target(target_) { Shader::Shader(GLenum target_, const std::string& source_) : target(target_) {
declare(); declare();
const char* src_ptr= source_.data();
glShaderSource(_id, 1, &src_ptr, NULL);
glCompileShader(_id);
_success = status(GL_COMPILE_STATUS); _success = status(GL_COMPILE_STATUS);
if (!_success) {
WARN(log(), 0x0FE);
}
} }
Shader::Shader(Shader&& cpy) : target(cpy.target) { Shader::Shader(Shader&& cpy) : target(cpy.target) {
@ -55,7 +49,7 @@ Program::Program(SharedVector<Shader> shaders_) {
glLinkProgram(_id); glLinkProgram(_id);
_success = status(GL_LINK_STATUS); _success = status(GL_LINK_STATUS);
if (!_success) { if (!_success) {
WARN(log(), 0x0FE); WARN(log(), 0x01);
} }
} }

6
engine/NBGraphics/tests/TestWindow.cpp
View File

@ -5,7 +5,7 @@
int main() { int main() {
nb::logger.log("Howdy!"); nb::logger.log("Howdy!");
nb::Window window(400, 400, "Hello!"); nb::Window window(200, 200, "Hello!");
window.setWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); window.setWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
window.setWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); window.setWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
window.init(); window.init();
@ -56,10 +56,6 @@ int main() {
GLFWwindow* window_ptr = window.getWindow(); GLFWwindow* window_ptr = window.getWindow();
while(!glfwWindowShouldClose(window_ptr)) { while(!glfwWindowShouldClose(window_ptr)) {
glDrawArrays(GL_TRIANGLES, 0, 3); glDrawArrays(GL_TRIANGLES, 0, 3);
glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
glfwPollEvents();
glfwSwapBuffers(window_ptr);
} }
return 0; return 0;