Use copies of contextinfo and datapth in favor of a common library

scheibel · scheibel · commit 24a3c7e90b8c · 2016-11-17T16:02:00.000+01:00
diff --git a/source/examples/commandlineoutput/CMakeLists.txt b/source/examples/commandlineoutput/CMakeLists.txt
@@ -29,6 +29,7 @@ message(STATUS "Example ${target}")
 
 set(sources
     main.cpp
+    contextinfo.inl
 )
 
 
diff --git a/source/examples/commandlineoutput/contextinfo.inl b/source/examples/commandlineoutput/contextinfo.inl
diff --git a/source/examples/commandlineoutput/main.cpp b/source/examples/commandlineoutput/main.cpp
@@ -23,7 +23,7 @@
 #include <globjects/VertexArray.h>
 
 // example commons
-#include "common/contextInfo.inl"
+#include "contextinfo.inl"
 
 
 using namespace gl;
diff --git a/source/examples/computeshader/CMakeLists.txt b/source/examples/computeshader/CMakeLists.txt
@@ -31,6 +31,8 @@ set(sources
     main.cpp
     ScreenAlignedQuad.h
     ScreenAlignedQuad.cpp
+    contextinfo.inl
+    datapath.inl
 )
 
 
diff --git a/source/examples/computeshader/contextinfo.inl b/source/examples/computeshader/contextinfo.inl
@@ -0,0 +1,16 @@
+
+#include <iostream>
+
+
+namespace common
+{
+
+    void printContextInfo()
+    {
+        std::cout << std::endl
+            << "OpenGL Version:  " << glbinding::ContextInfo::version() << std::endl
+            << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
+            << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
+    }
+
+}
diff --git a/source/examples/computeshader/datapath.inl b/source/examples/computeshader/datapath.inl
diff --git a/source/examples/computeshader/main.cpp b/source/examples/computeshader/main.cpp
@@ -31,8 +31,8 @@
 #include "ScreenAlignedQuad.h"
 
 // example commons
-#include "common/contextinfo.inl"
-#include "common/dataPath.inl"
+#include "contextinfo.inl"
+#include "datapath.inl"
 
 
 using namespace gl;
diff --git a/source/examples/programpipelines/CMakeLists.txt b/source/examples/programpipelines/CMakeLists.txt
@@ -29,6 +29,7 @@ message(STATUS "Example ${target}")
 
 set(sources
     main.cpp
+    contextinfo.inl
 )
 
 
diff --git a/source/examples/programpipelines/contextinfo.inl b/source/examples/programpipelines/contextinfo.inl
@@ -0,0 +1,16 @@
+
+#include <iostream>
+
+
+namespace common
+{
+
+    void printContextInfo()
+    {
+        std::cout << std::endl
+            << "OpenGL Version:  " << glbinding::ContextInfo::version() << std::endl
+            << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
+            << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
+    }
+
+}
diff --git a/source/examples/programpipelines/main.cpp b/source/examples/programpipelines/main.cpp
@@ -20,7 +20,7 @@
 #include <globjects/base/StaticStringSource.h>
 
 // example commons
-#include "common/contextInfo.inl"
+#include "contextinfo.inl"
 
 
 using namespace gl;
diff --git a/source/examples/qtexample/CMakeLists.txt b/source/examples/qtexample/CMakeLists.txt
@@ -43,6 +43,8 @@ set(sources
     
     WindowQt.cpp
     WindowQt.h
+    contextinfo.inl
+    datapath.inl
 )
 
 
diff --git a/source/examples/qtexample/contextinfo.inl b/source/examples/qtexample/contextinfo.inl
@@ -0,0 +1,16 @@
+
+#include <iostream>
+
+
+namespace common
+{
+
+    void printContextInfo()
+    {
+        std::cout << std::endl
+            << "OpenGL Version:  " << glbinding::ContextInfo::version() << std::endl
+            << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
+            << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
+    }
+
+}
diff --git a/source/examples/qtexample/datapath.inl b/source/examples/qtexample/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/qtexample/main.cpp b/source/examples/qtexample/main.cpp
@@ -43,8 +43,8 @@
 #include "WindowQt.h"
 
 // example commons
-#include "common/contextinfo.inl"
-#include "common/dataPath.inl"
+#include "contextinfo.inl"
+#include "datapath.inl"
 
 
 using namespace gl;

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ message(STATUS "Example ${target}")`
`29`	`29`
`30`	`30`	`set(sources`
`31`	`31`	`main.cpp`
	`32`	`+ contextinfo.inl`
`32`	`33`	`)`
`33`	`34`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ set(sources`
`31`	`31`	`main.cpp`
`32`	`32`	`ScreenAlignedQuad.h`
`33`	`33`	`ScreenAlignedQuad.cpp`
	`34`	`+ contextinfo.inl`
	`35`	`+ datapath.inl`
`34`	`36`	`)`
`35`	`37`
`36`	`38`