refine transform feedback example

cgcostume · cgcostume · commit caf336e58b1f · 2016-11-17T18:41:57.000+01:00
diff --git a/source/examples/CMakeLists.txt b/source/examples/CMakeLists.txt
@@ -61,6 +61,5 @@ add_subdirectory("states")
 add_subdirectory("texture")
 add_subdirectory("tessellation")
 add_subdirectory("transformfeedback")
-add_subdirectory("wikiexample")
 
 add_subdirectory("qtexample")
diff --git a/source/examples/commandlineoutput/main.cpp b/source/examples/commandlineoutput/main.cpp
@@ -27,11 +27,17 @@ using namespace gl;
 using namespace globjects;
 
 
+void error(int errnum, const char * errmsg)
+{
+    globjects::critical() << errnum << ": " << errmsg << std::endl;
+}
+
+
 int main(int /*argc*/, char * /*argv*/[])
 {
     // Initialize GLFW with error callback and window hints
     glfwInit();
-    glfwSetErrorCallback( [] (int /*error*/, const char * description) { puts(description); } );
+    glfwSetErrorCallback(error);
     glfwWindowHint(GLFW_VISIBLE, false);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
diff --git a/source/examples/computeshader/main.cpp b/source/examples/computeshader/main.cpp
@@ -129,7 +129,6 @@ int main()
 
     glfwSetErrorCallback(error);
     glfwDefaultWindowHints();
-
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, true);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
diff --git a/source/examples/programpipelines/main.cpp b/source/examples/programpipelines/main.cpp
@@ -142,8 +142,6 @@ int main(int /*argc*/, char * /*argv*/[])
 
     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);
diff --git a/source/examples/shaderincludes/main.cpp b/source/examples/shaderincludes/main.cpp
@@ -88,8 +88,6 @@ int main(int /*argc*/, char * /*argv*/[])
 
     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);
diff --git a/source/examples/sparsetexture/main.cpp b/source/examples/sparsetexture/main.cpp
@@ -179,8 +179,6 @@ int main(int /*argc*/, char * /*argv*/[])
 
     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);
diff --git a/source/examples/ssbo/main.cpp b/source/examples/ssbo/main.cpp
@@ -110,8 +110,6 @@ int main(int /*argc*/, char * /*argv*/[])
 
     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);
diff --git a/source/examples/states/main.cpp b/source/examples/states/main.cpp
@@ -192,8 +192,6 @@ int main(int /*argc*/, char * /*argv*/[])
 
     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);
diff --git a/source/examples/tessellation/main.cpp b/source/examples/tessellation/main.cpp
@@ -133,8 +133,6 @@ int main(int /*argc*/, char * /*argv*/[])
 
     glfwSetErrorCallback(error);
     glfwDefaultWindowHints();
-
-    glfwSetErrorCallback([](int /*error*/, const char * description) { puts(description); });
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 4);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, true);
diff --git a/source/examples/texture/main.cpp b/source/examples/texture/main.cpp
@@ -99,8 +99,6 @@ int main(int /*argc*/, char * /*argv*/[])
 
     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);
diff --git a/source/examples/transformfeedback/CMakeLists.txt b/source/examples/transformfeedback/CMakeLists.txt
@@ -29,6 +29,7 @@ message(STATUS "Example ${target}")
 
 set(sources
     main.cpp
+    datapath.inl
 )
 
 
diff --git a/source/examples/transformfeedback/datapath.inl b/source/examples/transformfeedback/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;
+    }
+
+}
diff --git a/source/examples/transformfeedback/main.cpp b/source/examples/transformfeedback/main.cpp
diff --git a/source/examples/wikiexample/CMakeLists.txt b/source/examples/wikiexample/CMakeLists.txt
diff --git a/source/examples/wikiexample/main.cpp b/source/examples/wikiexample/main.cpp
