diff options
author | Janne Kangas <janne.kangas@symbio.com> | 2017-09-26 15:00:52 +0300 |
---|---|---|
committer | Janne Kangas <janne.kangas@qt.io> | 2017-12-18 12:16:24 +0000 |
commit | 85da752abaad18450716ec03586c03a800277ff6 (patch) | |
tree | 9ef7300c61edd7723fedf9be349d2e4e2d95a9cc /src/Authoring/Studio/Palettes/BasicObjects | |
parent | 28be612ad6429f8197ebb3095a2852d0b78c2602 (diff) |
Add Datainput part 1
Implements Datainput as graph object that can be parsed from UIP files and
fed data from QML. Adding Datainput object from studio UI is disabled
intentionally as functionality will be fleshed out in the following
patches.
Task-ID: QT3DS-2
Change-Id: I449087aa968ae2331f203c4cb6e41b8ac6eef5cf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/BasicObjects')
-rw-r--r-- | src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp index 6364b0ca..11b5892b 100644 --- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp +++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp @@ -53,7 +53,13 @@ void BasicObjectsModel::initialize() {tr("Text"), "Asset-Text-Normal.png"_L1, OBJTYPE_TEXT, PRIMITIVETYPE_UNKNOWN}, {tr("Camera"), "Asset-Camera-Normal.png"_L1, OBJTYPE_CAMERA, PRIMITIVETYPE_UNKNOWN}, {tr("Light"), "Asset-Light-Normal.png"_L1, OBJTYPE_LIGHT, PRIMITIVETYPE_UNKNOWN}, - {tr("Alias"), "Asset-Alias-Normal.png"_L1, OBJTYPE_ALIAS, PRIMITIVETYPE_UNKNOWN} + {tr("Alias"), "Asset-Alias-Normal.png"_L1, OBJTYPE_ALIAS, PRIMITIVETYPE_UNKNOWN}, + // For now, adding Datainput (and Layer) is done by drag-drop. TODO: remove after a separate + // panel for adding these metaobjects exists + + // Master control for adding datainput functionality to studio, uncomment to enable adding + // datainput + // {tr("Datainput"), "Objects-DataInput-Normal.png"_L1, OBJTYPE_DATAINPUT, PRIMITIVETYPE_UNKNOWN} }; } |