summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* QTexture refactoringPaul Lemire2014-10-305-25/+35
| | | | | | | | | | | | | | Target is now set in the ctor from C++. On the QML side, there's a QTexture subclass for each target. WrapMode on s, t, r for texture, accessible as a grouped property in QML. Note: I left out the static fromImage as I didn't really understand their purpose. Please let me know what I'm missing. Change-Id: I16f75283ae459cbd8ab2d1ec53584b3022bc965b Task-number: QTBUG-41537 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename RendererAspect -> QRenderAspectSean Harmer2014-10-2618-36/+36
| | | | | Change-Id: Ib16fe125e160764571775f3667cff082db921f7d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* QLayer: QString name property converted to QStringList namesPaul Lemire2014-10-227-19/+19
| | | | | | Change-Id: I1f1c80231118240d5ae590166d00d0b53661ab33 Task-number: QTBUG-41540 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QParameterMapper: renamed to QParameterMappingPaul Lemire2014-10-225-21/+21
| | | | | | Change-Id: I2137a22bdf35979ef300820a613db7d7bdc647e0 Task-number: QTBUG-41535 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QMeshData: enum for primitivesPaul Lemire2014-10-221-1/+1
| | | | | | | | | | Each value in the enums maps directly to the correct GLint for a given primitive patch. This allows to still return an int to be used directly by the renderer. This should also fix compilation error of ES2. Change-Id: I7ec54dcb2cbb02b67fa6225bb80fb7e691687e2c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractMeshData merged with QMeshData and moved to RendererPaul Lemire2014-10-222-3/+3
| | | | | | | That implied moving QAbstractMesh to Renderer as well. Change-Id: I9013bf0458b849f7805d214a70580a80e86d8c84 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTechniqueFilter: renamed criteria property to requiresPaul Lemire2014-10-206-6/+6
| | | | | Change-Id: Id7b06add196edc64c553cdeff31bc3333fa7acaf Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QShaderProgram: remove source file properties, replace by helper methodPaul Lemire2014-10-188-29/+32
| | | | | | | | | | 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>
* QRenderPassFilter: renamed criteria property to includesPaul Lemire2014-10-174-9/+9
| | | | | Change-Id: I4422614e5ac7ebe4de08a6b5eee18c32406bb325 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QRenderPass: renamed criteria property to annotationsPaul Lemire2014-10-1710-21/+21
| | | | | Change-Id: Id824323880a3cf310adb1c581c440eeff9451d4f Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QTechnique: renamed criteria property to annotationsPaul Lemire2014-10-171-2/+2
| | | | | Change-Id: I5a919ac6d0cc5fd7b27a72b22a2a497114241d9d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed QCriterion to QAnnotationPaul Lemire2014-10-1722-50/+50
| | | | | | Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127 Task-number: QTBUG-41534 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstractShapeMesh removedPaul Lemire2014-10-172-3/+3
| | | | | | Change-Id: Ibc2cb1231ccb2d7a6f986978bd030997be0c2090 Task-number:QTBUG-41528 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Hide doClone implementations behind a macroKevin Ottens2014-10-152-8/+1
| | | | | | | | | This way we will avoid inconsistencies. It also means making some of the copy() implementations more clever. Change-Id: Ic79c9ec7c9c32f8951d5d9f5184592880bf8d5fd Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Work around MSVC compiler bug vs QStringLiteralSean Harmer2014-10-111-4/+4
| | | | | Change-Id: I2dafe9928847844ab72dc75c8ebbc338191d3f97 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Silence warnings in examplesSean Harmer2014-10-043-3/+3
| | | | | Change-Id: I626f2fde5589449536bd669993d390cb7410f209 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Use the window aspect ratio for the camera in the shadow map exampleGiuseppe D'Angelo2014-10-041-1/+1
| | | | | | Change-Id: I2115f3248afc47358440a7471fd5fc811550c763 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Give a fixed size to the FBO in the shadow map exampleGiuseppe D'Angelo2014-10-041-2/+2
| | | | | | Change-Id: I3a45ce1c49ef58f6a6bfa2120ab21020e3f7c214 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* simple-cpp fix to work with refactored QNodePaul Lemire2014-10-031-18/+9
| | | | | Change-Id: I1c9296b598db4265db10bcb096452ab4c0b8d5d1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* DeferredRendererQMLPaul Lemire2014-10-033-96/+92
| | | | | | | | | | Added comments about RGB32F RGB16F not being always supported as a color attachment formats(Mesa/Intel). Set version number of shaders on the first line to avoid complains from the Mesa GLSL parser. Change-Id: Ifb4b9dc9a4171a1f4b0fbef666f7722bfcb10423 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstract removed from corePaul Lemire2014-10-036-6/+3
| | | | | | Task-number: QTBUG-41530 Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-0311-117/+89
| | | | | | | | | | | | | | | | Move almost everything to private classes. Assimp loading restored. All examples working. QNode hierachy is now handled through QObject::setParent, addChild, removeChild are part of the private api. Note: commented QChangeArbiter unit tests as they can no longer work with this patch and will restore them when QChangeArbiter will have been made private. Task-number: QTBUG-41470 Task-number: QTBUG-41523 Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a toyplane meshGiuseppe D'Angelo2014-10-032-0/+50983
| | | | | Change-Id: I8777874278b038769e8915a107f52994b61c432d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Shadow Map example: Add plane animationsPaul Lemire2014-10-031-1/+52
| | | | | Change-Id: I3f6a46bf9a5e7e143d5c1fb9596fbb1f984f6cb7 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Add a shadow map QML exampleGiuseppe D'Angelo2014-10-0316-1/+1152
| | | | | Change-Id: Idb1c8e8b5f6f5ad1dd0124a4abb9cc625d577a00 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add simple-cpp exampleGiuseppe D'Angelo2014-10-023-0/+193
| | | | | Change-Id: Ifb3725ddd43e6feae6814feba18b84bcecb2f42e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add a simple-qml example backGiuseppe D'Angelo2014-10-015-0/+234
| | | | | Change-Id: Ic2bb7f9dffdb4804bc95d620139bf7dcf1044f10 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Tessellation-Modes example updated to use uniforms arrayPaul Lemire2014-09-303-28/+14
| | | | | Change-Id: I4a838c7867e822705f2ab65fd099ba81698f8f2a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improved/Refactored cloning and doClone off all subclassesPaul Lemire2014-09-302-3/+3
| | | | | | | | Note: As we are using QScene during cloning, it is important that node hierarchy be created and added in the proper order (parent then child). Change-Id: I8fd53f7ca696ec9aca19cc70dc116ccba4154911 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Comparison operator for QAbstractMeshFunctor subclassesPaul Lemire2014-09-301-0/+8
| | | | | Change-Id: I18f0c46631615787a5505f7591514bfd33ac6bd0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QParameter new overloaded ctorsPaul Lemire2014-09-291-12/+8
| | | | | Change-Id: Ia6e3c3285884265b303485176109a4d2c80ccabe Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Rename simple-qml to playground-qmlGiuseppe D'Angelo2014-09-2912-2/+2
| | | | | | | Because it's a playground and not simple at all...! Change-Id: I9c40972695583b761f035e3f62b54cf3772dae9f Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Simplify examples.pro's dependency managementGiuseppe D'Angelo2014-09-291-79/+24
| | | | | | Change-Id: I3c5a01472a8fa636a339160227578bdba14d77c2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed QScene to QSceneLoaderPaul Lemire2014-09-286-7/+7
| | | | | Change-Id: I075aaf1ac7a02dee89cb6646e2d1cd029373767e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Remove unnecessary #includeSean Harmer2014-09-281-1/+0
| | | | | Change-Id: Id963525ac0b03021578102a9c30bd8d1cc8e4ac4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Added C++ Deferred Renderer examplePaul Lemire2014-09-281-1/+1
| | | | | Change-Id: I5d5874810da433d608425b7eecff2d4f8cc156b2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed deferred-renderer example to deferred-renderer-qmlPaul Lemire2014-09-2828-6/+1082
| | | | | Change-Id: I7005c0a58b48e444f08a771684bde13072863db5 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add the cylinder meshKevin Ottens2014-09-288-0/+442
| | | | | Change-Id: Ic19e480dc3682a7bbc5088f7700a99cc5f588b86 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add an example to exercise tessellation shader supportSean Harmer2014-09-2122-1/+1289
| | | | | | | | | | | | | | Also extended Renderer and friends to support setting the number of vertices per patch with glPathParameteri(GL_PATCH_VERTICES, n). To support this QMeshData now also stores the vertices per patch. This demonstrates how to tessellate using quad tessellation mode. Follow-up commits will add objects to show triangle and isoline modes. Change-Id: I68afb31815db430d0b4d8d9cc525efcfb9a216fc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add a wireframe example to exercise geometry shader supportSean Harmer2014-09-2115-1/+12892
| | | | | | | | | | | | | | | 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>
* Add support for remaining shader stages and rename some propertiesSean Harmer2014-09-214-20/+20
| | | | | | | | | | | Examples updated to reflect new QShaderProgram property names. Next commit will add a new example to test the handling of tessellation and geometry shader stages. We need to somehow expose buffers and image units to make use of compute shaders. Change-Id: Idf76cef97a42d5829402c8aa8cc4e288678a3407 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added effect for GL2 in Deferred examplePaul Lemire2014-09-156-184/+446
| | | | | | Change-Id: I0907eae97f0470893c813af1449d1805a265a398 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Updated examples to use ClearBufferPaul Lemire2014-09-159-89/+127
| | | | | | Change-Id: I2ef4c1b78b973b8a0e0df1452b398b96d5b8366b Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Added Deferred-Renderer examplePaul Lemire2014-09-156-1/+526
| | | | | | Change-Id: I3e74c362a42a0da9f9fffa3f2037dc12cedccc7f Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* simple-qml updated to use RenderTargetsPaul Lemire2014-09-152-3/+64
| | | | | | Change-Id: Iec06e1f7d86837e23a4a21e3540af339aee3b633 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Transform QAbstractScene to QComponentPaul Lemire2014-09-152-3/+5
| | | | | | | Will need several other changes (in later commits) to be visible again. Change-Id: I328ae3ac5a24bd3ce1909d1ae281a31dae438925 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Texture renamed to QTexturePaul Lemire2014-08-192-2/+2
| | | | | Change-Id: I6f5570ce042b8d3ef44aa76c1fd8ce3a1dde4d3c Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix glsl errors in simple-qmlSean Harmer2014-08-191-3/+6
| | | | | Change-Id: Id4fdc23716aaecc84471577c35573897c3e6b890 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* simple-qml: use renderStates instead of drawStatesPaul Lemire2014-08-151-1/+1
| | | | | Change-Id: I21423b1e8d70ee4621b58b1252d4ad7b4bdcd62e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Simple-qml updated to use multiple render pass and drawstatesPaul Lemire2014-08-142-2/+89
| | | | | Change-Id: I0d3bd813549ea660b18ccf64c61fa6db0b07e197 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 11:18:07 +0000