summaryrefslogtreecommitdiffstats
path: root/examples/wireframe
Commit message (Collapse)AuthorAgeFilesLines
* Copyright header change.Mika Salmela2015-02-096-114/+84
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* The input aspect don't need QWindow anymoreKevin Ottens2015-01-231-1/+1
| | | | | | | | | This aspect doesn't need to depend on a QWindow, any QObject can do as long as we can have an event filter on it and we see input events on it. Rename the whole concept to "view" in the process. Change-Id: Idce2fcc37c5679fe0f7915d27793685167dd59a6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove the now useless QuickWindowKevin Ottens2015-01-231-2/+3
| | | | | Change-Id: I714cf941230fdd83f0de37125bf44b4888662b25 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Move CameraController in the input aspectKevin Ottens2015-01-232-1/+3
| | | | | | | | | | | | | | | With this move it also becomes a private class. As a result I had to touch all the examples as you won't get camera navigation anymore if the input aspect is not registered. Quick3DConfiguration doesn't depend on the QuickWindow singleton hack anymore, it tries to get back to the aspects and set the camera on the ones having a corresponding property. It also mostly empties Window and QuickWindow. Change-Id: Ife1644bd338e51929bad1e99089bd5e4c68ebc68 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* use the default ForwardRenderer in the examplesPaul Lemire2015-01-184-71/+1
| | | | | Change-Id: Iade146d9d63ba9d8b33953467e67d5864d0469b9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Clean up the wireframe example a littleSean Harmer2014-12-196-51/+28
| | | | | Change-Id: I1ceb32b820541f3a615d76439635bb794f6b0672 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Qt3D::Window simplifiedPaul Lemire2014-11-141-7/+10
| | | | | | | | | | | | | | The Qt3D::Window doesn't contain the QAspectEngine anymore. This will allow to to pass any kind of surface to the QAspectEngine. We could still have a wrapper like QQuickView around the QQmlAspectEngine if needed but if it weren't for the camera controller that we need to keep a little longer, a simple QWindow could be used in every example. All examples were updated. Change-Id: I4921df0df6f1066cd409ea886faf41d7e8834ef6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Qt3DQuick value type and color providersPaul Lemire2014-10-315-30/+0
| | | | | | | | | | | | | | | | | Provides the following value types under the Qt3D QML import: QColor QVector2D QVector3D QVector4D QQuaternion QMatrxi4x4 This allow users not to import QtQuick everwhere when they just need one of those types. Change-Id: I7bd7e29c70c22886c40edb7abfb6ff1b7329b235 Task-number: QTBUG-41550 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QCamera refactoredPaul Lemire2014-10-301-21/+8
| | | | | | | | All examples updated to work with the modifications. Change-Id: I51a3036fa750ca297a2180c488747d0878b940a4 Task-number: QTBUG-41543 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename RendererAspect -> QRenderAspectSean Harmer2014-10-261-2/+2
| | | | | Change-Id: Ib16fe125e160764571775f3667cff082db921f7d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QParameterMapper: renamed to QParameterMappingPaul Lemire2014-10-221-3/+3
| | | | | | Change-Id: I2137a22bdf35979ef300820a613db7d7bdc647e0 Task-number: QTBUG-41535 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTechniqueFilter: renamed criteria property to requiresPaul Lemire2014-10-201-1/+1
| | | | | Change-Id: Id7b06add196edc64c553cdeff31bc3333fa7acaf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QShaderProgram: remove source file properties, replace by helper methodPaul Lemire2014-10-181-3/+3
| | | | | | | | | | Only the source code QByteArray properties remain. The user is still able to load a shader from a source file by using the shaderFromSource helper method and assigning what it returns to one of the QByteArray source code properties. Change-Id: I5246498fa680ec74d095d7a45f0b1bce239efc13 Task-number: QTBUG-41536 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass: renamed criteria property to annotationsPaul Lemire2014-10-171-1/+1
| | | | | Change-Id: Id824323880a3cf310adb1c581c440eeff9451d4f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed QCriterion to QAnnotationPaul Lemire2014-10-172-2/+2
| | | | | | Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127 Task-number: QTBUG-41534 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstract removed from corePaul Lemire2014-10-031-1/+0
| | | | | | Task-number: QTBUG-41530 Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a wireframe example to exercise geometry shader supportSean Harmer2014-09-2112-0/+879
Needed to extend the set of standard uniforms to include the viewport matrix. We also don't seem to get the type information for uniforms from glsl but rather infer it from QML. In this example it resulted in a bug where the line.width was being set with glUniformi() instead of glUniformf() when we used whole values such as 1.0 in the Parameter of WireframeEffect.qml. Worked aroudn by using a typed property in WireframeMaterial.qml for now but this needs fixing. Change-Id: Ie07a81b1b0b6c176e188d9e489643b22e339192a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>