revise examples

Author: cgcostume

source/examples/computeshader/main.cpp

@@ -172,8 +172,8 @@ int main()
     globjects::info() << "Press F5 to reload compute shader." << std::endl << std::endl;
 
 
-    initialize();
     glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);
+    initialize();
 
     // Main loop
     while (!glfwWindowShouldClose(window))

source/examples/programpipelines/main.cpp

@@ -170,8 +170,8 @@ int main(int /*argc*/, char * /*argv*/[])
         << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
         << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
 
-    initialize();
     glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);
+    initialize();
 
     // Main loop
     while (!glfwWindowShouldClose(window))

source/examples/shaderincludes/main.cpp

@@ -119,8 +119,8 @@ int main(int /*argc*/, char * /*argv*/[])
     globjects::info() << "Press F5 to reload shaders." << std::endl << std::endl;
 
 
-    initialize();
     glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);
+    initialize();
 
     // Main loop
     while (!glfwWindowShouldClose(window))

source/examples/sparsetexture/main.cpp

@@ -207,8 +207,8 @@ int main(int /*argc*/, char * /*argv*/[])
         << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
         << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
 
-    initialize();
     glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);
+    initialize();
 
     // Main loop
     while (!glfwWindowShouldClose(window))

source/examples/ssbo/main.cpp

@@ -141,8 +141,8 @@ int main(int /*argc*/, char * /*argv*/[])
     globjects::info() << "Press F5 to reload shaders." << std::endl << std::endl;
 
 
-    initialize();
     glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);
+    initialize();
 
     // Main loop
     while (!glfwWindowShouldClose(window))

source/examples/states/main.cpp

@@ -28,7 +28,6 @@
 
 
 using namespace gl;
-using namespace glm;
 
 
 namespace 
@@ -86,20 +85,17 @@ void initialize()
         globjects::Shader::fromFile(GL_VERTEX_SHADER, dataPath + "states/standard.vert")
       , globjects::Shader::fromFile(GL_FRAGMENT_SHADER, dataPath + "states/standard.frag"));
 
-    g_buffer->setData(std::vector<vec2>({
-        vec2(-0.8f, 0.8f), vec2(-0.4f, 0.8f), vec2( 0.0f, 0.8f), vec2( 0.4f, 0.8f), vec2( 0.8f, 0.8f)
-      , vec2(-0.8f, 0.6f), vec2(-0.4f, 0.6f), vec2( 0.0f, 0.6f), vec2( 0.4f, 0.6f), vec2( 0.8f, 0.6f)
-      , vec2(-0.8f, 0.4f), vec2(-0.4f, 0.4f), vec2( 0.0f, 0.4f), vec2( 0.4f, 0.4f), vec2( 0.8f, 0.4f)
-      , vec2(-0.8f, 0.2f), vec2(-0.4f, 0.2f), vec2( 0.0f, 0.2f), vec2( 0.4f, 0.2f), vec2( 0.8f, 0.2f)
-      , vec2(-0.8f, 0.0f), vec2(-0.4f, 0.0f), vec2( 0.0f, 0.0f), vec2( 0.4f, 0.0f), vec2( 0.8f, 0.0f)
-      , vec2(-0.8f,-0.2f), vec2(-0.4f,-0.2f), vec2( 0.0f,-0.2f), vec2( 0.4f,-0.2f), vec2( 0.8f,-0.2f)
-      , vec2(-0.8f,-0.4f), vec2(-0.4f,-0.4f), vec2( 0.0f,-0.4f), vec2( 0.4f,-0.4f), vec2( 0.8f,-0.4f)
-      , vec2(-0.8f,-0.6f), vec2(-0.4f,-0.6f), vec2( 0.0f,-0.6f), vec2( 0.4f,-0.6f), vec2( 0.8f,-0.6f)
-      , vec2(-0.8f,-0.8f), vec2(-0.4f,-0.8f), vec2( 0.0f,-0.8f), vec2( 0.4f,-0.8f), vec2( 0.8f,-0.8f) })
-      , GL_STATIC_DRAW );
+    static auto data = std::vector<glm::vec2>(); 
+    if (data.empty())
+    {
+        for (auto y = 0.8f; y > -1.f; y -= 0.2f)
+            for (auto x = -0.8f; x < 1.f; x += 0.4f)
+                data.push_back(glm::vec2(x, y));
+    }
+    g_buffer->setData(data, GL_STATIC_DRAW );
 
     g_vao->binding(0)->setAttribute(0);
-    g_vao->binding(0)->setBuffer(g_buffer, 0, sizeof(vec2));
+    g_vao->binding(0)->setBuffer(g_buffer, 0, sizeof(glm::vec2));
     g_vao->binding(0)->setFormat(2, GL_FLOAT);
     g_vao->enable(0);
 }
@@ -203,7 +199,7 @@ int main(int /*argc*/, char * /*argv*/[])
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, true);
 
     // Create a context and, if valid, make it current
-    GLFWwindow * window = glfwCreateWindow(320, 240, "globjects States", NULL, NULL);
+    GLFWwindow * window = glfwCreateWindow(640, 480, "globjects States", NULL, NULL);
     if (window == nullptr)
     {
         globjects::critical() << "Context creation failed. Terminate execution.";
@@ -227,8 +223,8 @@ int main(int /*argc*/, char * /*argv*/[])
     globjects::info() << "Press F5 to reload shaders." << std::endl << std::endl;
 
 
-    initialize();
     glfwGetFramebufferSize(window, &g_size[0], &g_size[1]);
+    initialize();
 
     // Main loop
     while (!glfwWindowShouldClose(window))

source/examples/tessellation/CMakeLists.txt

@@ -29,8 +29,10 @@ message(STATUS "Example ${target}")
 
 set(sources
     main.cpp
+
     Icosahedron.h
     Icosahedron.cpp
+    datapath.inl
 )
 
 

source/examples/tessellation/datapath.inl

@@ -0,0 +1,38 @@
+
+#include <string>
+
+#include <cpplocate/cpplocate.h>
+#include <cpplocate/ModuleInfo.h>
+
+
+namespace common
+{
+
+    std::string normalizePath(const std::string & filepath)
+    {
+        auto copy = filepath;
+        std::replace(copy.begin(), copy.end(), '\\', '/');
+
+        auto i = copy.find_last_of('/');
+        if (i == copy.size() - 1)
+            copy = copy.substr(0, copy.size() - 1);
+
+        return copy;
+    }
+
+    std::string retrieveDataPath(const std::string & module, const std::string & key)
+    {
+        const auto moduleInfo = cpplocate::findModule(module);
+
+        auto dataPath = moduleInfo.value(key);
+        dataPath = normalizePath(dataPath);
+
+        if (dataPath.empty())
+            dataPath = "data/";
+        else
+            dataPath += "/";
+
+        return dataPath;
+    }
+
+}