aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/scenegraph
Commit message (Collapse)AuthorAgeFilesLines
* Build against refactor.Samuel Rødal2011-07-293-3/+3
| | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Renamed ShaderEffectItem to ShaderEffect and some API changes.Kim Motoyoshi Kalland2011-07-281-1/+1
| | | | | | | | | | | | | | | | The ShaderEffectItem was renamed to ShaderEffect to be consistent with other QML element names. The GLSL uniform variable qt_ModelViewProjectionMatrix was renamed to qt_Matrix which is easier to type and remember. The GridMesh element was removed. The mesh resolution is now specified simply with a QSize. To make the transition easier, the old API will continue to work for some time, but will output warnings if used. Eventually, I will remove the old API completely. Change-Id: Iec4f2aa624a2c76a7db6750c58f73dbcb316ab6a Reviewed-on: http://codereview.qt.nokia.com/2270 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Renamed the Bindable class to QSGBindable.Kim Motoyoshi Kalland2011-07-203-15/+15
| | | | | | | Change-Id: Id00868bd0ea93010912f06fba67624fb325ecc41 Reviewed-on: http://codereview.qt.nokia.com/1818 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Improved the performance of distance-field generation.Kim Motoyoshi Kalland2011-07-204-334/+2327
| | | | | | | Change-Id: Ie17650196c7e4531cbc6f760905e41d95808efcd Reviewed-on: http://codereview.qt.nokia.com/1675 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed QSGDistanceFieldGlyphNode initialization order.Yoann Lopes2011-07-204-8/+36
| | | | | | | Change-Id: Id2e8ccf6441ce7e7a2bcdd6f0d50745e7d9ba653 Reviewed-on: http://codereview.qt.nokia.com/1750 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-0857-971/+971
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Fix compilationOlivier Goffart2011-07-011-4/+4
| | | | | | | | | qsgdefaultrectanglenode.cpp:221:22: error: narrowing conversion of '(((& c)->QColor::redF() * (&c)->QColor::alphaF()) * 2.55e+2)' from 'qreal {aka double}' to 'unsigned char' inside { } [-fpermissive] Change-Id: I4f051f07d5db28fd03739343c255cc72d968a99d Reviewed-on: http://codereview.qt.nokia.com/1004 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Support setting an FBO as the render target for a canvasGunnar Sletta2011-07-012-3/+10
| | | | | | | Change-Id: I8049580f1d2b27d6ebc4d595712939338c01b711 Reviewed-on: http://codereview.qt.nokia.com/986 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Document threading issues with QSGEngine signalsGunnar Sletta2011-06-301-0/+7
| | | | | | | Change-Id: I769c0793929c4c90464f6e9fea46bd1a19fbacf3 Reviewed-on: http://codereview.qt.nokia.com/939 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Updated tst_nodestest to use the DirtyForceUpdate flag.Kim Motoyoshi Kalland2011-06-232-4/+2
| | | | | | Changed test to use DirtyForceUpdate instead of DirtyAll, and removed DirtyRenderOrder and DirtyAll enums which should not be used.
* Merge multiple lines of text into a single geometry nodeGunnar Sletta2011-06-231-8/+50
| | | | | | | | | Long term, we might want to have this kind of logic in the QSGGeometry class through a grow() function or in the QSGRenderer, but we only have this one usecase where it actually makes sense right now, so I'm keeping it local. Change-Id: Ibbb0dd4a6e4b587154e26ffc2a34375fbb4a571d
* Start out with a distance field cache that fits more charactersGunnar Sletta2011-06-201-2/+3
|
* Compile fix for MSVC.Kim Motoyoshi Kalland2011-06-201-1/+1
|
* Removed unnecessary calls to QSGNode::destroy().Kim Motoyoshi Kalland2011-06-203-14/+23
|
* Merge branch 'master' into qtquick2Gunnar Sletta2011-06-201-1/+36
|\
| * Implement caching of the distance fields...Gunnar Sletta2011-06-201-1/+36
| | | | | | | | Change-Id: I823341b9b53e885dcd004e17e319cf033dc21c45
* | Merge branch 'master' into qtquick2Gunnar Sletta2011-06-1516-753/+335
|\| | | | | | | | | | | | | | | | | Conflicts: src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec
| * Speed up distance field generation by another 20% or so.Gunnar Sletta2011-06-151-5/+3
| |
| * Speed up distance field generation by 5-20%Gunnar Sletta2011-06-151-1/+4
| |
| * Use linked list instead of QList for node children.Kim Motoyoshi Kalland2011-06-105-48/+118
| |
| * Removed matrix stacks from QSGRenderer.Kim Motoyoshi Kalland2011-06-109-603/+34
| |
| * Make min-heap member of QMLRenderer instead of stack variable.Kim Motoyoshi Kalland2011-06-102-46/+60
| | | | | | | | The heap is used to sort non-overlapping children.
| * Replaced QStack with QDataBuffer in the node updater.Kim Motoyoshi Kalland2011-06-102-26/+25
| |
| * Cut off blocked sub-trees one node earlier.Kim Motoyoshi Kalland2011-06-102-9/+8
| | | | | | | | Do not even enter the blocked node.
| * Removed QSGNodeVisitor inheritance from QSGNodeUpdater.Kim Motoyoshi Kalland2011-06-102-14/+54
| | | | | | | | This reduces the number of virtual function calls.
| * Added QSGNode::removeAllChildNodes().Kim Motoyoshi Kalland2011-06-102-1/+16
| |
| * Keep track of the number of geometry nodes in a sub-graph.Kim Motoyoshi Kalland2011-06-102-4/+18
| | | | | | | | | | If there are no geometry nodes in a sub-graph, there's no need to update it.
| * Doc: Cleaned up the scene graph documentation a little.David Boddie2011-06-093-7/+6
| |
* | Renamed QMLRenderer -> QSGDefaultRendererGunnar Sletta2011-06-153-10/+10
| | | | | | | | Change-Id: Ib1f00d45cecd3b438148adce2f7cf247030b2dfb
* | Print out a warning when attributes are enabledGunnar Sletta2011-06-151-0/+15
|/
* Merge branch 'threaded3'Gunnar Sletta2011-06-092-5/+11
|\
| * Don't fetch a context that is never to be usedGunnar Sletta2011-06-061-3/+0
| |
| * Fixed up command line options a bitGunnar Sletta2011-06-061-2/+11
| |
* | Introduced simple materialGunnar Sletta2011-06-092-0/+223
|/
* Small optimizations in distance-field cache.Yoann Lopes2011-05-242-13/+17
|
* Optimize distance-field glyph recycling.Yoann Lopes2011-05-231-0/+9
| | | | | Unused glyphs in the cache should not be overwritten if they are immediatly reused after being unreferenced.
* Fix typo in API: QSGContext::schdelueTextureForCleanup.Bjørn Erik Nilsen2011-05-232-2/+2
| | | | Reviewed-by: kim
* Fixes wrong flipping of textures.Bjørn Erik Nilsen2011-05-201-1/+1
| | | | Reviewed-by: Gunnar
* Removed virtual type() from QSGNode, member variable instead.Kim Motoyoshi Kalland2011-05-202-26/+41
|
* Use QDataBuffer instead of QVector in QMLRenderer.Kim Motoyoshi Kalland2011-05-202-32/+41
| | | | | Using QDataBuffer instead of QVector reduces the number of memory reallocations.
* Avoid using indices in the RectangleNode implementation.Kim Motoyoshi Kalland2011-05-191-29/+21
| | | | Task-number: QTBUG-18731
* Improved RectangleNode implementation.Kim Motoyoshi Kalland2011-05-191-74/+68
| | | | Task-number: QTBUG-18731
* add toImage() function to QSGPainterNodeCharles Yin2011-05-162-0/+8
|
* Call QSGPaintedItem::paint() when the scene graph is synced.Yoann Lopes2011-05-132-7/+6
| | | | | At that moment the GUI thread is blocked and it is therefore safe to call paint() from the scenegraph thread.
* Don't crash when the shader source is null.Gunnar Sletta2011-05-121-1/+1
|
* Output warning if using unsupported texture wrap mode.Kim Motoyoshi Kalland2011-05-121-0/+15
| | | | | | The REPEAT wrap mode is not supported by default for non- power-of-two textures in OpenGL ES 2. Output warning in QSGTexture::updateBindOptions() in debug mode.
* Upgrade Flickr demo to QtQuick 2.Alan Alpert2011-05-121-0/+1
| | | | | | | And throw in particle effects. Includes a variety of fixes to modelparticle and picture affector which were arrived at during this demo.
* Fixed incorrect usage of `signals', `slots' in headersRohan McGovern2011-05-121-1/+1
| | | | | | | Qt headers must use Q_SIGNALS, Q_SLOTS. Reviewed-by: Jason McDonald Change-Id: I54b3322befd8f133d44aa48f3aa7cd96785d2e24
* Compile.Martin Jones2011-05-121-2/+5
|
* Fixed image tiling on scene graph.Kim Motoyoshi Kalland2011-05-112-8/+131
| | | | | | Repeat wrapping of non-power-of-two textures is not supported on OpenGL ES 2 by default. This commit implements a fallback for tiled QML Images.