diff options
Diffstat (limited to 'examples/quick/scenegraph/graph/linenode.cpp')
-rw-r--r-- | examples/quick/scenegraph/graph/linenode.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/examples/quick/scenegraph/graph/linenode.cpp b/examples/quick/scenegraph/graph/linenode.cpp index 015aa4f0ee..0c63129ea8 100644 --- a/examples/quick/scenegraph/graph/linenode.cpp +++ b/examples/quick/scenegraph/graph/linenode.cpp @@ -40,8 +40,6 @@ #include "linenode.h" -#include <QtCore/QResource> - #include <QtGui/QColor> #include <QtQuick/QSGSimpleMaterial> @@ -58,14 +56,10 @@ class LineShader : public QSGSimpleMaterialShader<LineMaterial> QSG_DECLARE_SIMPLE_SHADER(LineShader, LineMaterial) public: - LineShader() - : vsh(readResource(":/scenegraph/graph/shaders/line.vsh")), - fsh(readResource(":/scenegraph/graph/shaders/line.fsh")) - {} - - const char *vertexShader() const { return vsh.constData(); } - - const char *fragmentShader() const { return fsh.constData(); } + LineShader() { + setShaderSourceFile(QOpenGLShader::Vertex, ":/scenegraph/graph/shaders/line.vsh"); + setShaderSourceFile(QOpenGLShader::Fragment, ":/scenegraph/graph/shaders/line.fsh"); + } QList<QByteArray> attributes() const { return QList<QByteArray>() << "pos" << "t"; } @@ -81,15 +75,7 @@ public: id_color = program()->uniformLocation("color"); } - static QByteArray readResource(const char *path) { - QResource r(path); - Q_ASSERT(r.isValid()); - return QByteArray((const char *)r.data(), r.size()); - } - private: - QByteArray vsh; - QByteArray fsh; int id_color; int id_spread; int id_size; |