Merge branch 'master' of github.com:cginternals/globjects

Author: scheibel

source/examples/programpipelines/main.cpp

@@ -1,5 +1,5 @@
 
-#include <glm/glm.hpp>
+#include <glm/vec2.hpp>
 
 #include <glbinding/gl/gl.h>
 #include <glbinding/ContextInfo.h>
@@ -169,7 +169,7 @@ int main(int /*argc*/, char * /*argv*/[])
     globjects::init();
     common::printContextInfo();
 
-    globjects::info() << "Press F5 to reload compute shader." << std::endl << std::endl;
+    globjects::info() << "Press F5 to reload shaders." << std::endl << std::endl;
 
 
     initialize();

source/examples/qtexample/main.cpp

@@ -149,7 +149,7 @@ int main(int argc, char * argv[])
     Window * glwindow = new Window(format);
 
     QMainWindow window;
-    window.setMinimumSize(320, 240);
+    window.setMinimumSize(640, 480);
     window.setWindowTitle("globjects and Qt");
     window.setCentralWidget(QWidget::createWindowContainer(glwindow));
 

source/examples/shaderincludes/main.cpp

@@ -8,6 +8,8 @@
 #include <glbinding/ContextInfo.h>
 #include <glbinding/Version.h>
 
+#include <glm/vec2.hpp>
+
 #include <GLFW/glfw3.h>
 
 #include <globjects/globjects.h>
@@ -24,139 +26,106 @@
 
 
 using namespace gl;
-using namespace globjects;
 
 
 namespace
 {
 
-bool g_toggleFS = false;
-bool g_isFS = false;
+    ScreenAlignedQuad * g_quad = nullptr;
+
+    auto g_size = glm::ivec2{};
+}
 
-ScreenAlignedQuad * g_quad = nullptr;
 
+void initialize()
+{
+    const auto dataPath = common::retrieveDataPath("globjects", "dataPath");
+    globjects::NamedString::create("/color.glsl", new globjects::File(dataPath + "shaderincludes/color.glsl"));
+
+    g_quad = new ScreenAlignedQuad(globjects::Shader::fromFile(GL_FRAGMENT_SHADER, dataPath + "shaderincludes/test.frag"));
+    g_quad->ref();
 }
 
+void deinitialize()
+{
+    g_quad->unref();
+
+    globjects::detachAllObjects();
+}
+
+void draw()
+{
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    g_quad->draw();
+}
+
+
+void error(int errnum, const char * errmsg)
+{
+    globjects::critical() << errnum << ": " << errmsg << std::endl;
+}
+
+void framebuffer_size_callback(GLFWwindow * /*window*/, int width, int height)
+{
+    g_size = glm::ivec2{ width, height };
+}
 
 void key_callback(GLFWwindow * window, int key, int /*scancode*/, int action, int /*modes*/)
 {
     if (key == GLFW_KEY_ESCAPE && action == GLFW_RELEASE)
         glfwSetWindowShouldClose(window, true);
-
-    if (key == GLFW_KEY_F5 && action == GLFW_RELEASE)
-        File::reloadAll();
-
-    if (key == GLFW_KEY_F11 && action == GLFW_RELEASE)
-        g_toggleFS = true;
 }
 
-GLFWwindow * createWindow(bool fs = false)
+
+int main(int /*argc*/, char * /*argv*/[])
 {
-    // Set GLFW window hints
-    glfwSetErrorCallback( [] (int /*error*/, const char * description) { puts(description); } );
+    // Initialize GLFW
+    if (!glfwInit())
+        return 1;
+
+    glfwSetErrorCallback(error);
+    glfwDefaultWindowHints();
+
+    glfwSetErrorCallback([](int /*error*/, const char * description) { puts(description); });
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, true);
 
     // Create a context and, if valid, make it current
-    GLFWwindow * window = glfwCreateWindow(640, 480, "globjects Shader Includes Shader", fs ? glfwGetPrimaryMonitor() : NULL, NULL);
+    GLFWwindow * window = glfwCreateWindow(320, 240, "globjects Shader Includes", NULL, NULL);
     if (window == nullptr)
     {
         globjects::critical() << "Context creation failed. Terminate execution.";
 
         glfwTerminate();
-        exit(1);
+        return -1;
     }
-    glfwMakeContextCurrent(window);
-
-    // Create callback that when user presses ESC, the context should be destroyed and window closed
     glfwSetKeyCallback(window, key_callback);
+    glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
+
+    glfwMakeContextCurrent(window);
 
     // Initialize globjects (internally initializes glbinding, and registers the current context)
     globjects::init();
+    common::printContextInfo();
 
-    // Do only on startup
-    if (!g_toggleFS)
-    {
-       // Dump information about context and graphics card
-       info() << std::endl
-           << "OpenGL Version:  " << glbinding::ContextInfo::version() << std::endl
-           << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
-           << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl;
-    }
-
-    glClearColor(0.2f, 0.3f, 0.4f, 1.f);
-
-    g_isFS = fs;
-    return window;
-}
+    globjects::info() << "Press F5 to reload shaders." << std::endl << std::endl;
 
-void destroyWindow(GLFWwindow * window)
-{
-    globjects::detachAllObjects();
-    glfwDestroyWindow(window);
-}
 
-void initialize()
-{
-    cpplocate::ModuleInfo moduleInfo = cpplocate::findModule("globjects");
-
-    // Get data path
-    std::string dataPath = moduleInfo.value("dataPath");
-    dataPath = common::normalizePath(dataPath);
-    if (dataPath.size() > 0) dataPath = dataPath + "/";
-    else                     dataPath = "data/";
-
-    // Initialize OpenGL objects
-    NamedString::create("/color.glsl", new File(dataPath + "shaderincludes/color.glsl"));
-
-    g_quad = new ScreenAlignedQuad(Shader::fromFile(GL_FRAGMENT_SHADER, dataPath + "shaderincludes/test.frag"));
-    g_quad->ref();
-}
-
-void deinitialize()
-{
-    g_quad->unref();
-}
-
-void draw()
-{
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    g_quad->draw();
-}
-
-
-int main(int /*argc*/, char * /*argv*/[])
-{
-    // Initialize GLFW
-    glfwInit();
-
-    GLFWwindow * window = createWindow();
     initialize();
+    glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);
 
     // Main loop
     while (!glfwWindowShouldClose(window))
     {
         glfwPollEvents();
-
-        if (g_toggleFS)
-        {
-            deinitialize();
-            destroyWindow(window);
-            window = createWindow(!g_isFS);
-            initialize();
-
-            g_toggleFS = false;
-        }
-
         draw();
         glfwSwapBuffers(window);
     }
-
     deinitialize();
 
     // Properly shutdown GLFW
     glfwTerminate();
 
     return 0;
-}
+}