Small refactorizations

Author: mls-m5

include/matgui/draw.h

@@ -100,6 +100,9 @@ void setDimensions(int width, int height);
 void pushViewport(int x, int y, int width, int height);
 void popViewport();
 
+// Fill the current render buffer (often the screen) with a single color
+void clear(float r, float g, float b, float a, bool depth = true);
+
 // clang-format on
 
 } // namespace matgui

include/matgui/texture.h

@@ -8,7 +8,6 @@
 #pragma once
 
 #include <memory>
-#include <stdexcept>
 #include <string>
 #include <vector>
 

src/draw.cpp

@@ -379,4 +379,9 @@ void QuitDrawModule() {
     lineProgram.program.reset();
 }
 
+void clear(float r, float g, float b, float a, bool depth) {
+    glClearColor(r, g, b, a);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT * depth);
+}
+
 } // namespace matgui

src/shaderobject.cpp

@@ -1,7 +1,7 @@
 #include "shaderobject.h"
 #include "translateshader.h"
 #include <iostream>
-#include <sstream>
+// #include <sstream>
 #include <stdexcept>
 #include <vector>
 
@@ -13,8 +13,8 @@ namespace matgui {
     using namespace std;
 
 #ifdef __EMSCRIPTEN__
-    cout << info << endl;
-    cout << code << endl;
+    cerr << info << endl;
+    cerr << code << endl;
 
 #endif
 
@@ -28,11 +28,11 @@ namespace matgui {
 
     if (firstColon == string::npos && firstParen == string::npos &&
         secondParen == string::npos) {
-        cout << info << endl;
-        cout << code << endl;
+        cerr << info << endl;
+        cerr << code << endl;
     }
 
-    cout << info;
+    cerr << info;
     //    auto b = info.begin();
     //    cout << "line: " << string(b + firstColon + 1, b + firstParen) <<
     //    endl; cout << "col: " << string(b + firstParen + 1, b + secondParen)

src/shaderprogram.cpp

@@ -156,7 +156,7 @@ void ShaderProgram::loadObject(GLint type, std::filesystem::path path) {
     if (!file || !*file) {
         cout << "could not open " << typeMap.at(type) << " shader file " << path
              << endl;
-        throw std::runtime_error{"could not open shader file"};
+        throw std::runtime_error{"could not open shader file " + path.string()};
         return;
     }
     std::string code((std::istreambuf_iterator<char>(*file)),

src/window.cpp

@@ -7,7 +7,7 @@
 
 #include "matgui/window.h"
 #include "matgui/application.h"
-#include "matgui/common-gl.h"
+// #include "matgui/common-gl.h"
 #include "matgui/draw.h"
 #include "windowdata.h"
 #include <iostream>
@@ -128,8 +128,7 @@ Window::~Window() {
 void Window::clear() {
     _windowData->context.makeCurrent(sdl::WindowView{_windowData->window});
     auto &color = currentStyle.fill;
-    glClearColor(color.r, color.g, color.b, color.a);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    matgui::clear(color.r, color.g, color.b, color.a);
 }
 
 void Window::draw() {