diff options
author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-09-11 13:12:52 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-09-11 10:55:54 +0000 |
commit | 2242866544e682b6d604b6540e2e7e5fa36f3153 (patch) | |
tree | 74920080e88e805160207f6c9050dd39f5e652cc | |
parent | 261ba65ad6497184dc77c1e49872d92884bb3f8b (diff) |
Add Basic Properties to Material inspector
Task-number: QT3DS-2256
Change-Id: I8105f5554894c381db6dc52b2c9b22caf5bf34c5
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
3 files changed, 24 insertions, 27 deletions
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp index 289152db..d7ac3b60 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.cpp @@ -487,21 +487,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) diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h index 3faba381..c23a930e 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMComposerTypeDefinitions.h @@ -56,8 +56,8 @@ class IPropertySystem; HANDLE_COMPOSER_OBJECT_TYPE(Asset, ITERATE_COMPOSER_ASSET_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Scene, ITERATE_COMPOSER_SCENE_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Image, ITERATE_COMPOSER_IMAGE_PROPERTIES) \ - HANDLE_COMPOSER_OBJECT_TYPE(Lightmaps, ITERATE_COMPOSER_LIGHTMAP_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(MaterialBase, ITERATE_COMPOSER_MATERIAL_BASE_PROPERTIES) \ + HANDLE_COMPOSER_OBJECT_TYPE(Lightmaps, ITERATE_COMPOSER_LIGHTMAP_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(Material, ITERATE_COMPOSER_MATERIAL_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(CustomMaterial, ITERATE_COMPOSER_NO_ADDITIONAL_PROPERTIES) \ HANDLE_COMPOSER_OBJECT_TYPE(ReferencedMaterial, \ @@ -582,16 +582,16 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Image> }; template <> -struct SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> - : public SComposerBaseObjectDefinition<ComposerObjectTypes::Lightmaps> +struct SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> + : public SComposerBaseObjectDefinition<ComposerObjectTypes::MaterialBase> { SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance, SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped, SComposerObjectDefinition<ComposerObjectTypes::Asset> &inAsset) - : SComposerBaseObjectDefinition<ComposerObjectTypes::Lightmaps>(inCore, inMetaData, - inInstance) + : SComposerBaseObjectDefinition<ComposerObjectTypes::MaterialBase>(inCore, inMetaData, + inInstance) { Derive(inCore, inAsset); SetType(inCore, inTyped); @@ -599,16 +599,16 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> }; template <> -struct SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> - : public SComposerBaseObjectDefinition<ComposerObjectTypes::MaterialBase> +struct SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> + : public SComposerBaseObjectDefinition<ComposerObjectTypes::Lightmaps> { SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance, SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped, - SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> &inBase) - : SComposerBaseObjectDefinition<ComposerObjectTypes::MaterialBase>(inCore, inMetaData, - inInstance) + SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> &inBase) + : SComposerBaseObjectDefinition<ComposerObjectTypes::Lightmaps>(inCore, inMetaData, + inInstance) { Derive(inCore, inBase); SetType(inCore, inTyped); @@ -623,7 +623,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::Material> SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance, SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped, - SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> &inBase) + SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> &inBase) : SComposerBaseObjectDefinition<ComposerObjectTypes::Material>(inCore, inMetaData, inInstance) { @@ -640,7 +640,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::CustomMaterial> SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance, SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped, - SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> &inBase) + SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> &inBase) : SComposerBaseObjectDefinition<ComposerObjectTypes::CustomMaterial>(inCore, inMetaData, inInstance) { @@ -657,7 +657,7 @@ struct SComposerObjectDefinition<ComposerObjectTypes::ReferencedMaterial> SComposerObjectDefinition(IDataCore &inCore, IMetaData &inMetaData, Qt3DSDMInstanceHandle inInstance, SComposerObjectDefinition<ComposerObjectTypes::Typed> &inTyped, - SComposerObjectDefinition<ComposerObjectTypes::MaterialBase> &inBase) + SComposerObjectDefinition<ComposerObjectTypes::Lightmaps> &inBase) : SComposerBaseObjectDefinition<ComposerObjectTypes::ReferencedMaterial>(inCore, inMetaData, inInstance) { diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml index 3af22bef..e2cfd852 100644 --- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml +++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml @@ -227,18 +227,16 @@ <Property name="shdwmapfar" formalName="Shadow Far Clip" description="Affects the maximum distance for the shadow\ndepth map" default="5000" /> <Property name="shdwmapfov" formalName="Shadow Field of View" description="Affects the field of view of the shadow\ncamera" default="90" min="1" max="179" hidden="True" /> </Light> + <MaterialBase> + <Property name="name" formalName="Name" description="Object name" type="String" default="Material" hidden="False" category="Basic Properties" /> + <Property name="iblprobe" formalName="IBL Override" description="IBL probe to use in place of the\nlayer probe for this material" type="Image" category="Basic Properties" /> + </MaterialBase> <Lightmaps> - <Property name="name" formalName="Name" description="Object name" type="String" default="Lightmaps" hidden="False" category="Lighting" /> <Property name="lightmapindirect" formalName="Indirect Lightmap" description="Image providing indirect light values\nfor GI" type="Image" category="Lighting" /> <Property name="lightmapradiosity" formalName="Radiosity Lightmap" description="Image providing directional light values" type="Image" category="Lighting" /> <Property name="lightmapshadow" formalName="Shadow Lightmap" description="Baked Shadow map" type="Image" category="Lighting" /> </Lightmaps> - <MaterialBase> - <Property name="name" formalName="Name" description="Object name" type="String" default="MaterialBase" hidden="False" category="Material" /> - <Property name="iblprobe" formalName="IBL Override" description="IBL probe to use in place of the\nlayer probe for this material" type="Image" category="Material" /> - </MaterialBase> <Material> - <Property name="name" formalName="Name" description="Object name" type="String" default="Material" hidden="False" category="Material" /> <Property name="shaderlighting" formalName="Lighting" description="Light model" list="Pixel:None" default="Pixel" category="Material" /> <Property name="blendmode" formalName="Blending Mode" description="How this material blends with content\nbehind it. Modes marked with * are\navailable only with HW supporting\nadvanced blending modes." list="Normal:Screen:Multiply:*Overlay:*ColorBurn:*ColorDodge" default="Normal" category="Material" /> <Property name="vertexcolors" formalName="Enable Vertex Colors" description="Use vertex colors from the mesh" type="Boolean" default="False" animatable="False" category="Material" /> @@ -271,7 +269,6 @@ <Property name="diffuselightwrap" formalName="Diffuse Light Wrap" description="Diffuse Light Wrap" type="float" min='0.0' max='1.0' category="Material" /> </Material> <ReferencedMaterial> - <Property name="name" formalName="Name" description="Object name" type="String" default="Material" hidden="True" category="Material" /> <Property name="referencedmaterial" formalName="Referenced Material" description="Material to use all settings from" type="ObjectRef" category="Material" /> </ReferencedMaterial> <Model> |