From 3b49c9226d1f6b90b27ae1110ab84cc2fd9b43eb Mon Sep 17 00:00:00 2001
From: Chris Foster <chris42f@gmail.com>
Date: Thu, 11 Apr 2013 23:38:30 +1000
Subject: [PATCH] Fix mesh shader resource embedding + move default shader

---
 mainwindow.cpp                             | 2 +-
 resources.qrc                              | 4 +++-
 points.glsl => shaders/points_default.glsl | 0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename points.glsl => shaders/points_default.glsl (100%)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index e5613d17..83e3f408 100644
--- 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
index 3c053e1f..1ddea843 100644
--- 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 b/shaders/points_default.glsl
similarity index 100%
rename from points.glsl
rename to shaders/points_default.glsl