diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-25 12:21:54 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-09-25 13:09:24 +0300 |
| commit | 424bc31512b5ac6b2202ebb39c537bcd1118d9ab (patch) | |
| tree | 4d2c9fc747340f7d8cd7f2051b5d870c185d98cc /src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | |
| parent | 1ee84df110d3cc6fc4509bc05a5699e199381a22 (diff) | |
| parent | 0e7e7996a422b47bd371115e6aa4e2998bbda6fb (diff) | |
Merge branch '2.1' into master
Change-Id: Idfecbefcf5c1e279093f250a4a46d57f2a518d25
Diffstat (limited to 'src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp')
| -rw-r--r-- | src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index ca89031b..98712791 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -208,6 +208,7 @@ struct DataConstructor<SObjectRefType> #define QT3DS_WCHAR_T_shdwfilter L"shdwfilter" #define QT3DS_WCHAR_T_orthographic L"orthographic" #define QT3DS_WCHAR_T_fov L"fov" +#define QT3DS_WCHAR_T_fovhorizontal L"fovhorizontal" #define QT3DS_WCHAR_T_clipnear L"clipnear" #define QT3DS_WCHAR_T_clipfar L"clipfar" #define QT3DS_WCHAR_T_lookatlock L"lookatlock" @@ -490,21 +491,21 @@ SComposerObjectDefinitions::SComposerObjectDefinitions( , m_Asset(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Guided, m_Named) , m_Scene(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset, m_SlideOwner) , m_Image(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) - , m_Lightmaps(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) - , m_MaterialBase(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) - , m_Material(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) - , m_CustomMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) - , m_ReferencedMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) + , m_MaterialBase(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) + , m_Lightmaps(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_MaterialBase) + , m_Material(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) + , m_CustomMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) + , m_ReferencedMaterial(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Lightmaps) , m_Behavior(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) + , m_Effect(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_Node(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_Layer(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) - , m_Model(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Group(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) + , m_Model(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Light(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Camera(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Component(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node, m_SlideOwner) , m_Text(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) - , m_Effect(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_RenderPlugin(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Asset) , m_Alias(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) , m_Path(inCore, inMetaData, inCore.CreateInstance(), m_Typed, m_Node) |