summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@nokia.com>2010-11-17 15:03:56 +0100
committerYoann Lopes <yoann.lopes@nokia.com>2010-11-17 15:03:56 +0100
commit7f87337ab11f8c91ad4bbf61f7b2a0f1cddb5eb5 (patch)
tree64a003e2323b6d66cd3fb1cc81b8b643792af123
parent6daab01b4ed3bd0e5ba7088fb92129486d355995 (diff)
Code cleanup.
-rw-r--r--src/scenegraph/coreapi/qmlrenderer.cpp7
-rw-r--r--src/scenegraph/coreapi/qmlrenderer.h3
-rw-r--r--src/scenegraph/coreapi/renderer.h2
3 files changed, 0 insertions, 12 deletions
diff --git a/src/scenegraph/coreapi/qmlrenderer.cpp b/src/scenegraph/coreapi/qmlrenderer.cpp
index 9a7619c..eada040 100644
--- a/src/scenegraph/coreapi/qmlrenderer.cpp
+++ b/src/scenegraph/coreapi/qmlrenderer.cpp
@@ -175,7 +175,6 @@ void QMLRenderer::render()
m_opaqueNodes.clear();
m_transparentNodes.clear();
- m_clipNodes.clear();
int currentRenderOrder = 1;
buildLists(rootNode(), &currentRenderOrder);
@@ -236,12 +235,6 @@ void QMLRenderer::buildLists(Node *node, int *currentRenderOrder)
*currentRenderOrder += 2;
}
}
- } else if (node->type() == Node::ClipNodeType) {
- ClipNode *clipNode = static_cast<ClipNode *>(node);
- g = clipNode->geometry();
-
- if (g->vertexCount()) //Sanity check
- m_clipNodes.append(clipNode);
}
int count = node->childCount();
diff --git a/src/scenegraph/coreapi/qmlrenderer.h b/src/scenegraph/coreapi/qmlrenderer.h
index f8ef8ca..d2dd6f3 100644
--- a/src/scenegraph/coreapi/qmlrenderer.h
+++ b/src/scenegraph/coreapi/qmlrenderer.h
@@ -52,8 +52,6 @@ public:
void render();
- bool allowRenderOrderUpdates() const { return false; }
-
private:
void buildLists(Node *node, int *currentRenderOrder);
void renderNodes(const QVector <GeometryNode *> &list, int renderOrders);
@@ -65,7 +63,6 @@ private:
QMatrix4x4 m_renderOrderMatrix;
QVector<GeometryNode *> m_opaqueNodes;
QVector<GeometryNode *> m_transparentNodes;
- QVector<ClipNode *> m_clipNodes;
QVector<GeometryNode *> m_tempNodes;
#ifdef QML_RUNTIME_TESTING
diff --git a/src/scenegraph/coreapi/renderer.h b/src/scenegraph/coreapi/renderer.h
index 8e5b7bc..1d9856f 100644
--- a/src/scenegraph/coreapi/renderer.h
+++ b/src/scenegraph/coreapi/renderer.h
@@ -129,8 +129,6 @@ public:
virtual void nodeChanged(Node *node, Node::DirtyFlags flags);
virtual void materialChanged(GeometryNode *node, AbstractEffect *from, AbstractEffect *to);
- virtual bool allowRenderOrderUpdates() const = 0;
-
public slots:
signals: