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/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | |
| 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/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index 8a94575e..686c2c3e 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -121,6 +121,7 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_ReferencedMaterial L"ReferencedMaterial" #define QT3DS_WCHAR_T_Alias L"Alias" #define QT3DS_WCHAR_T_Lightmaps L"Lightmaps" +#define QT3DS_WCHAR_T_DataInput L"DataInput" #define QT3DS_WCHAR_T_type L"type" #define QT3DS_WCHAR_T_id L"id" @@ -302,6 +303,11 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_lightmapindirect L"lightmapindirect" #define QT3DS_WCHAR_T_lightmapradiosity L"lightmapradiosity" #define QT3DS_WCHAR_T_lightmapshadow L"lightmapshadow" +#define QT3DS_WCHAR_T_value L"value" +#define QT3DS_WCHAR_T_valuestr L"valuestr" +#define QT3DS_WCHAR_T_timefrom L"timefrom" +#define QT3DS_WCHAR_T_timeto L"timeto" +#define QT3DS_WCHAR_T_controlledelemprop L"controlledelemprop" const wchar_t *ComposerObjectTypes::Convert(ComposerObjectTypes::Enum inType) { @@ -504,6 +510,7 @@ SComposerObjectDefinitions::SComposerObjectDefinitions( , m_Path(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_PathAnchorPoint(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_SubPath(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) + , m_DataInput(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) { } |