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

WIP: Graphics Overhaul #2

Draft
naifb wants to merge 18 commits from buffer_update into main
pull from: buffer_update
merge into: naifb:main
Conversation 0 Commits 18 Files Changed 45 +12 -2
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 75bda91302 - Show all commits

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

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

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

@ -5,7 +5,7 @@
int main() {
nb::logger.log("Howdy!");
nb::Window window(200, 200, "Hello!");
nb::Window window(400, 400, "Hello!");
window.setWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
window.setWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
window.init();
@ -56,6 +56,10 @@ int main() {
GLFWwindow* window_ptr = window.getWindow();
while(!glfwWindowShouldClose(window_ptr)) {
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;