Fix mesh shader resource embedding + move default shader

c42f · Apr 11, 2013 · 3b49c92 · 3b49c92
1 parent 06ed1ed
commit 3b49c92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -229,7 +229,7 @@ PointViewerMainWindow::PointViewerMainWindow()
 
     // Set shaders
     QString shaderBasePath = DISPLAZ_SHADER_BASE_PATH;
-    QFile shaderFile(shaderBasePath + "/points.glsl");
+    QFile shaderFile(shaderBasePath + "/shaders/points_default.glsl");
     if (shaderFile.open(QIODevice::ReadOnly))
         m_pointView->shaderProgram().setShader(shaderFile.readAll());
     shaderEditor->setPlainText(m_pointView->shaderProgram().shaderSource());

diff --git a/resources.qrc b/resources.qrc
@@ -1,5 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file>points.glsl</file>
+    <file>shaders/points_default.glsl</file>
+    <file>shaders/meshface.glsl</file>
+    <file>shaders/meshedge.glsl</file>
 </qresource>
 </RCC>
diff --git a/points.glsl → shaders/points_default.glsl b/points.glsl → shaders/points_default.glsl