summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Increment UIP versionMahmoud Badri2019-05-161-1/+1
| | | | | | | | | | | | - increment UIP version and show a warning if a UIP version is lower - remove 3 obsolete text shadow props - small update to checking for material container in the timeline - few cleanups Task-number: QT3DS-3366 Task-number: QT3DS-2903 Change-Id: Ib4d8c33e786001d0e5a18037a52303449630adf5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix shader compilation errors in copies of VignetteEffect.effectJari Karppinen2019-05-071-6/+4
| | | | | | | | | | | | Apply updates from qt3d-runtime commit 6945d224433d731aaff1f83bf4d05ba812c8c36c to qt3dstudio files. Task-number: QT3DS-3387 Change-Id: I777ed67d53ece891d8d338732221de16c9019713 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* New version of SampleProjectTomi Korpipaa2019-04-1017-434/+325
| | | | | | Task-number: QT3DS-3281 Change-Id: I4c3896d1fc7a38e4b8e3eff38a4869197447a85e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename "qml streams" folder to "qml"Tomi Korpipaa2019-03-203-1/+1
| | | | | | | | Task-number: QT3DS-3182 Change-Id: Ifb1b7f18b6652d26f38eeab2351c329e7cbeb425 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update sample project to new project structureMiikka Heikkinen2018-10-264-71/+71
| | | | | | Change-Id: I2aea9a9595c1e605f7b706aec15bb025d739bb00 Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Move turn signals in SampleProjectTomi Korpipaa2018-09-191-2/+2
| | | | | | Task-number: QT3DS-1918 Change-Id: I9f9e24822207e77fe689d05bc44dcd8599d5f087 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add behavior script to update date and time in SampleProjectTomi Korpipaa2018-06-052-0/+100
| | | | | | | Task-number: QT3DS-1855 Change-Id: I8173829e093a3ca772306ced7ad46bda30e09b88 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update SampleProject to new UIP versionTomi Korpipaa2018-05-3010-1/+1
| | | | | | | | Task-number: QT3DS-1820 Change-Id: Ia8bf2374ccbee8c7bf1ebe2d62d8227398586233 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update data inputs to 2.0 format in SampleProjectv2.0.0-beta2Tomi Korpipaa2018-05-241-8/+8
| | | | | | Task-number: QT3DS-1770 Change-Id: Ide953a26c1e4c3644a5af74a2834221def04d1ad Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove application examplesTomi Korpipaa2018-05-2149-3088/+0
| | | | | | | | Remove examples that use old runtime. Leave presentation-only example. Task-number: QT3DS-1712 Change-Id: I37e045ca22586fbe81cfabd37d5952abdf25f08f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update SampleProjectTomi Korpipaa2018-05-1438-394/+783
| | | | | | Task-number: QT3DS-1541 Change-Id: Icda4411f35b724e03291f07a7ccd29d8136ac839 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Convert dds files to pngMäättä Antti2018-05-111-2/+2
| | | | | | | | | | Leave the dds files in, but use the png files where they were used. Task-number: QT3DS-926 Change-Id: I0844833767c80ea1f3abd0c55b68596caedfc9fe Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disable Evaluator DatainputJanne Kangas2018-05-043-26/+0
| | | | | | | | | | | | Disable evaluator from Studio UI. Also remove use of evaluator from example. Task-ID: QT3DS-1500 Change-Id: I9e8557d3a3aec3d0e2f3c64a8a2447220ac5fbed Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix erroneous comments in examplesTomi Korpipaa2018-04-236-18/+12
| | | | | | | | | | Generalize the comment wording, so it's correct for both QML and widget examples. Task-number: QT3DS-592 Change-Id: I57f03e9afc6308803e4acea04af25f2174bac200 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement Evaluator datainput part 2Janne Kangas2018-04-112-2/+2
| | | | | | | | | | | | | | | | Adds enablers for using JS expressions with other datainputs as arguments. See datainput.uia for an example. Restrictions: only scalar types allowed (vec support TODO). Evaluator type datainputs cannot be used as input sources to other evaluators in order to block circular dependencies. Evaluator can refer to itself in the JS expression in order to read value set to it using SetDataInputValue API. Task-ID: QT3DS-1310 Change-Id: I51b16a00ec5c40a9d468ed21d7f88db6c3db0ed3 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement Evaluator datainput type part 1Janne Kangas2018-04-093-5/+27
| | | | | | | | | | | | | | | | | Adds Evaluator type datainput which can be given JS expressions that are evaluated in runtime. Expression can contain a single argument which is assigned the value that has been set using setDataInputValue API, e.g. (function(value) { return value * 2.0; }). Also updates qmldatainput example. Future commits add support for using additional arguments which allow using current values of other datainputs in the expression. Task-ID: QT3DS-1310 Change-Id: I7ffbedc65f686279d393c27f8494234278ca4f60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add '$' prefix to datainput names in UIP fileJanne Kangas2018-04-051-9/+9
| | | | | | | | | | | | | Differentiate between controller datainput and property with similar name by using a special character prefix for the controller. Disallow using special characters in datainput addition dialog. Update example to follow convention. Task-ID: QT3DS-1360 Change-Id: I40b8b5f36b24b96b14798eddb594f897ed9ef624 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Expand datainput exampleJanne Kangas2018-04-033-20/+140
| | | | | | | | | | Also, add controlledproperty attribute to Material so diffuse color can be controlled in the example. Change-Id: Icbb696f478a4907cfe0933f46a92ff63c6cc1820 Task-Id: QT3DS-1328 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove binary compiler and binary format handlingTomi Korpipaa2018-03-071-6/+6
| | | | | | Task-number: QT3DS-907 Change-Id: Id278db9a0179424f2d86d4ba9e91f76ebef41b46 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Take DataInput into use in examplesMiikka Heikkinen2018-02-029-40/+118
| | | | | | | | | | | | | Changed Element and SceneElement usage to DataInput usage where appropriate. Some cases still need the old API, such as listening to slide changes and modifying color attributes. Task-number: QT3DS-882 Change-Id: Ifde9facb5adedca946a26b520d720ae9dff2dd0a Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add SetDataInputValue to IScriptBridgeMiikka Heikkinen2018-01-266-29/+31
| | | | | | | | | | | Data inputs and their linked attributes are collected into a map at presentation initialization time. Task-number: QT3DS-857 Change-Id: I6a22ddf16867e76b0fed1c1b5d7e6ab08153c024 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add QML type and C++ class for data inputMiikka Heikkinen2018-01-2610-1/+337
| | | | | | | | QML type is DataInput. C++ class is Q3DSDataInput. Task-number: QT3DS-387 Change-Id: I7f871ae3e1149adee7859fdb8f844e8f90837264 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Disable autoclear in qml streamerMäättä Antti2018-01-121-1/+3
| | | | | | | | | | | The Qt 3D QScene2D doesn't clear the texture automatically so this will unify the runtime 1.0 and 2.0 implementation. Change-Id: I9a5dd913476996e01467fca47113d48ff7372805 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve custom material GLES2 supportMäättä Antti2018-01-101-1/+1
| | | | | | | | | | Implement light shader property setting for custom materials when constant buffers are not supported. Remove floating point .f from glsllib. Task-number: QT3DS-36 Change-Id: I30df0ef8841daaa166910c2384613a1c9f4e6b46 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Change AA for static layer in exampleMats Honkamaa2017-12-181-1/+1
| | | | | | | | Changing AA to 8x progressive AA for the static layer in the sample project. Task-number: QT3DS-585 Change-Id: I1159950659a669664453b1c86d2cf1558558d002 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Unify file dialogsTomi Korpipaa2017-12-141-1/+1
| | | | | | Task-number: QT3DS-644 Change-Id: Ie280c2cc2577ad8ec2cc9209a1107848ae110c25 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix qml examples for macOSTomi Korpipaa2017-11-292-0/+24
| | | | | | Task-number: QT3DS-583 Change-Id: If51b8caf3cf5c3f8422cf17fa45fdfece10f2668 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix sample project crash for macOSTomi Korpipaa2017-11-291-2/+2
| | | | | | | Task-number: QT3DS-582 Change-Id: Ic9819db98901a31784551d0a8df93cc358094c8e Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix viewer examples for macOSTomi Korpipää2017-11-293-16/+37
| | | | | | | | | Also update the surface format of all macOS viewers to 4.1. Task-number: QT3DS-581 Change-Id: I642bc9a145b225dd3ac71e6c66dbf8d096d4e538 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Fix viewer scaling in macOSTomi Korpipaa2017-11-281-0/+16
| | | | | | Task-number: QT3DS-497 Change-Id: Id1ece6334a123960c796a4b7be238c680f2690e0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add docs for qmldynamickeyframes and qmlstreamer examplesMäättä Antti2017-11-284-0/+118
| | | | | | | | Task-number: QT3DS-521 Change-Id: Id3d54f1c7a2bf955d73e95548ead5fef675f7a81 Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add sample project to Qt 3D StudioMats Honkamaa2017-11-2812-0/+435
| | | | | | | | | Adding a simple sample project to Qt 3D Studio. Task-number: QT3DS-569 Task-number: QT3DS-572 Change-Id: I11677ee355882d354855feb3e5f1b2044f91cf82 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Remove QML behavior exampleJere Tuliniemi2017-11-228-857/+0
| | | | | Change-Id: I159df71d92dfc0a2d4609ef05b54693586239fa9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Cleanup QML behavior scriptsMäättä Antti2017-11-146-54/+54
| | | | | | | | | | | | Add Qt3DSQmlBehavior in QtStudio3D.Behavior, which can only be used from qml behavior scripts. Impement onInitialize, onUpdate and others as signals. Implement predefined function inside the new type and remove the Qt3DSRuntime context type. Task-number: QT3DS-408 Change-Id: Iefb1d8c39afa5f09a625b6f9131ddc790fa1e4a3 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update behavior example scriptsTomi Korpipaa2017-11-106-34/+34
| | | | | Change-Id: Ia68d9066363ba3d2296a1a6f630d51400354fe55 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix building with clang without the need for C++14Andras Mantia2017-10-106-0/+13
| | | | | | | | | This reverts the change to std::sort to use a lambda with auto parameters. When using clang the latest g++ std libraries (eg. from g++ 7) needs to be installed. Change-Id: I95007707adec0b7a9c215822457351e6b7fcdbee Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Initial importOswald Buddenhagen2017-10-0642-0/+3232