Allow .shader suffix for .material files

Also renames *.material files to *.shader files inside the Material
Library.

Task-number: QT3DS-2787
Change-Id: Iaa3e64fae934b526ad0903c19d3cdb2b6923cc95
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

43 files changed, 20 insertions, 16 deletions

diff --git a/Studio/Content/Material Library/aluminium_anodized.material b/Studio/Content/Material Library/aluminium_anodized.shader
index f989cbcd..f989cbcd 100644
--- a/Studio/Content/Material Library/aluminium_anodized.material
+++ b/Studio/Content/Material Library/aluminium_anodized.shader
diff --git a/Studio/Content/Material Library/aluminium_anodized_emissive.material b/Studio/Content/Material Library/aluminium_anodized_emissive.shader
index 22ebcab4..22ebcab4 100644
--- a/Studio/Content/Material Library/aluminium_anodized_emissive.material
+++ b/Studio/Content/Material Library/aluminium_anodized_emissive.shader
diff --git a/Studio/Content/Material Library/aluminum.material b/Studio/Content/Material Library/aluminum.shader
index 00909fa3..00909fa3 100644
--- a/Studio/Content/Material Library/aluminum.material
+++ b/Studio/Content/Material Library/aluminum.shader
diff --git a/Studio/Content/Material Library/aluminum_anisotropic.material b/Studio/Content/Material Library/aluminum_anisotropic.shader
index b5fed9fd..b5fed9fd 100644
--- a/Studio/Content/Material Library/aluminum_anisotropic.material
+++ b/Studio/Content/Material Library/aluminum_anisotropic.shader
diff --git a/Studio/Content/Material Library/aluminum_brushed.material b/Studio/Content/Material Library/aluminum_brushed.shader
index a3492898..a3492898 100644
--- a/Studio/Content/Material Library/aluminum_brushed.material
+++ b/Studio/Content/Material Library/aluminum_brushed.shader
diff --git a/Studio/Content/Material Library/aluminum_emissive.material b/Studio/Content/Material Library/aluminum_emissive.shader
index 5512dcd0..5512dcd0 100644
--- a/Studio/Content/Material Library/aluminum_emissive.material
+++ b/Studio/Content/Material Library/aluminum_emissive.shader
diff --git a/Studio/Content/Material Library/aluminum_textured_aniso.material b/Studio/Content/Material Library/aluminum_textured_aniso.shader
index ed9fb88a..ed9fb88a 100644
--- a/Studio/Content/Material Library/aluminum_textured_aniso.material
+++ b/Studio/Content/Material Library/aluminum_textured_aniso.shader
diff --git a/Studio/Content/Material Library/asphalt.material b/Studio/Content/Material Library/asphalt.shader
index da37ed41..da37ed41 100644
--- a/Studio/Content/Material Library/asphalt.material
+++ b/Studio/Content/Material Library/asphalt.shader
diff --git a/Studio/Content/Material Library/bamboo_natural_matte.material b/Studio/Content/Material Library/bamboo_natural_matte.shader
index 28ab611d..28ab611d 100644
--- a/Studio/Content/Material Library/bamboo_natural_matte.material
+++ b/Studio/Content/Material Library/bamboo_natural_matte.shader
diff --git a/Studio/Content/Material Library/bamboo_natural_matte_emissive.material b/Studio/Content/Material Library/bamboo_natural_matte_emissive.shader
index fde99ae1..fde99ae1 100644
--- a/Studio/Content/Material Library/bamboo_natural_matte_emissive.material
+++ b/Studio/Content/Material Library/bamboo_natural_matte_emissive.shader
diff --git a/Studio/Content/Material Library/carbon_fiber.material b/Studio/Content/Material Library/carbon_fiber.shader
index fd3eca38..fd3eca38 100644
--- a/Studio/Content/Material Library/carbon_fiber.material
+++ b/Studio/Content/Material Library/carbon_fiber.shader
diff --git a/Studio/Content/Material Library/carbon_fiber_emissive.material b/Studio/Content/Material Library/carbon_fiber_emissive.shader
index 255ec618..255ec618 100644
--- a/Studio/Content/Material Library/carbon_fiber_emissive.material
+++ b/Studio/Content/Material Library/carbon_fiber_emissive.shader
diff --git a/Studio/Content/Material Library/carpaint_blue_standard.material b/Studio/Content/Material Library/carpaint_blue_standard.shader
index 5fed8438..5fed8438 100644
--- a/Studio/Content/Material Library/carpaint_blue_standard.material
+++ b/Studio/Content/Material Library/carpaint_blue_standard.shader
diff --git a/Studio/Content/Material Library/carpaint_color_peel_2_layer.material b/Studio/Content/Material Library/carpaint_color_peel_2_layer.shader
index 2db1bf52..2db1bf52 100644
--- a/Studio/Content/Material Library/carpaint_color_peel_2_layer.material
+++ b/Studio/Content/Material Library/carpaint_color_peel_2_layer.shader
diff --git a/Studio/Content/Material Library/carpaint_yellow_standard.material b/Studio/Content/Material Library/carpaint_yellow_standard.shader
index 52d32e8b..52d32e8b 100644
--- a/Studio/Content/Material Library/carpaint_yellow_standard.material
+++ b/Studio/Content/Material Library/carpaint_yellow_standard.shader
diff --git a/Studio/Content/Material Library/concrete.material b/Studio/Content/Material Library/concrete.shader
index 1bcdadcd..1bcdadcd 100644
--- a/Studio/Content/Material Library/concrete.material
+++ b/Studio/Content/Material Library/concrete.shader
diff --git a/Studio/Content/Material Library/copper.material b/Studio/Content/Material Library/copper.shader
index 5f407def..5f407def 100644
--- a/Studio/Content/Material Library/copper.material
+++ b/Studio/Content/Material Library/copper.shader
diff --git a/Studio/Content/Material Library/leather_smoothed_black.material b/Studio/Content/Material Library/leather_smoothed_black.shader
index 8d456694..8d456694 100644
--- a/Studio/Content/Material Library/leather_smoothed_black.material
+++ b/Studio/Content/Material Library/leather_smoothed_black.shader
diff --git a/Studio/Content/Material Library/mesh_fence.material b/Studio/Content/Material Library/mesh_fence.shader
index df5d8170..df5d8170 100644
--- a/Studio/Content/Material Library/mesh_fence.material
+++ b/Studio/Content/Material Library/mesh_fence.shader
diff --git a/Studio/Content/Material Library/metal_mesh_fine.material b/Studio/Content/Material Library/metal_mesh_fine.shader
index f4e2d9fe..f4e2d9fe 100644
--- a/Studio/Content/Material Library/metal_mesh_fine.material
+++ b/Studio/Content/Material Library/metal_mesh_fine.shader
diff --git a/Studio/Content/Material Library/paper_artistic.material b/Studio/Content/Material Library/paper_artistic.shader
index 6c7b0755..6c7b0755 100644
--- a/Studio/Content/Material Library/paper_artistic.material
+++ b/Studio/Content/Material Library/paper_artistic.shader
diff --git a/Studio/Content/Material Library/paper_office.material b/Studio/Content/Material Library/paper_office.shader
index 22f60721..22f60721 100644
--- a/Studio/Content/Material Library/paper_office.material
+++ b/Studio/Content/Material Library/paper_office.shader
diff --git a/Studio/Content/Material Library/plastic_structured_red.material b/Studio/Content/Material Library/plastic_structured_red.shader
index f9be9ec3..f9be9ec3 100644
--- a/Studio/Content/Material Library/plastic_structured_red.material
+++ b/Studio/Content/Material Library/plastic_structured_red.shader
diff --git a/Studio/Content/Material Library/plastic_structured_red_emissive.material b/Studio/Content/Material Library/plastic_structured_red_emissive.shader
index 9e834df2..9e834df2 100644
--- a/Studio/Content/Material Library/plastic_structured_red_emissive.material
+++ b/Studio/Content/Material Library/plastic_structured_red_emissive.shader
diff --git a/Studio/Content/Material Library/porcelain.material b/Studio/Content/Material Library/porcelain.shader
index b21cda76..b21cda76 100644
--- a/Studio/Content/Material Library/porcelain.material
+++ b/Studio/Content/Material Library/porcelain.shader
diff --git a/Studio/Content/Material Library/powder_coat.material b/Studio/Content/Material Library/powder_coat.shader
index e5c55ae5..e5c55ae5 100644
--- a/Studio/Content/Material Library/powder_coat.material
+++ b/Studio/Content/Material Library/powder_coat.shader
diff --git a/Studio/Content/Material Library/powder_coat_emissive.material b/Studio/Content/Material Library/powder_coat_emissive.shader
index 4470c960..4470c960 100644
--- a/Studio/Content/Material Library/powder_coat_emissive.material
+++ b/Studio/Content/Material Library/powder_coat_emissive.shader
diff --git a/Studio/Content/Material Library/rubber_studded_black.material b/Studio/Content/Material Library/rubber_studded_black.shader
index b6173812..b6173812 100644
--- a/Studio/Content/Material Library/rubber_studded_black.material
+++ b/Studio/Content/Material Library/rubber_studded_black.shader
diff --git a/Studio/Content/Material Library/rubber_studded_emissive.material b/Studio/Content/Material Library/rubber_studded_emissive.shader
index ff4526ae..ff4526ae 100644
--- a/Studio/Content/Material Library/rubber_studded_emissive.material
+++ b/Studio/Content/Material Library/rubber_studded_emissive.shader
diff --git a/Studio/Content/Material Library/simple_glass.material b/Studio/Content/Material Library/simple_glass.shader
index bf3b75c6..bf3b75c6 100644
--- a/Studio/Content/Material Library/simple_glass.material
+++ b/Studio/Content/Material Library/simple_glass.shader
diff --git a/Studio/Content/Material Library/steel_milled_concentric.material b/Studio/Content/Material Library/steel_milled_concentric.shader
index 3cf95851..3cf95851 100644
--- a/Studio/Content/Material Library/steel_milled_concentric.material
+++ b/Studio/Content/Material Library/steel_milled_concentric.shader
diff --git a/Studio/Content/Material Library/thin_glass_frosted.material b/Studio/Content/Material Library/thin_glass_frosted.shader
index d1719431..d1719431 100644
--- a/Studio/Content/Material Library/thin_glass_frosted.material
+++ b/Studio/Content/Material Library/thin_glass_frosted.shader
diff --git a/Studio/Content/Material Library/thin_glass_frosted_sp.material b/Studio/Content/Material Library/thin_glass_frosted_sp.shader
index d6a20ecd..d6a20ecd 100644
--- a/Studio/Content/Material Library/thin_glass_frosted_sp.material
+++ b/Studio/Content/Material Library/thin_glass_frosted_sp.shader
diff --git a/Studio/Content/Material Library/thin_glass_refractive.material b/Studio/Content/Material Library/thin_glass_refractive.shader
index 958faf0c..958faf0c 100644
--- a/Studio/Content/Material Library/thin_glass_refractive.material
+++ b/Studio/Content/Material Library/thin_glass_refractive.shader
diff --git a/Studio/Content/Material Library/walnut_matte.material b/Studio/Content/Material Library/walnut_matte.shader
index 45412415..45412415 100644
--- a/Studio/Content/Material Library/walnut_matte.material
+++ b/Studio/Content/Material Library/walnut_matte.shader
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
index eab8b2eb..e4c9c6ef 100644
--- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp
@@ -869,7 +869,8 @@ public:
                             absAssetPath = QDir::cleanPath(projDir.absoluteFilePath(path));
                         }
                         if (recurseSourceMaterial
-                                && absAssetPath.endsWith(QLatin1String(".material"))
+                                && (absAssetPath.endsWith(QLatin1String(".material"))
+                                    || absAssetPath.endsWith(QLatin1String(".shader")))
                                 && !outPathMap.contains(path)) {
                             ParseSourcePathsOutOfEffectFile(absAssetPath, projectPath,
                                                             false, outPathMap, outPropertySet);
diff --git a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
index 94c3a29f..2e8f44a4 100644
--- a/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
+++ b/src/Authoring/Client/Code/Core/Doc/IComposerSerializer.cpp
@@ -2530,7 +2530,9 @@ struct SComposerSerializerImpl : public IComposerSerializer
                                                             warnings);
                                 }
                             } else if (theFullPath.GetExtension().Compare(
-                                           L"material", CString::ENDOFSTRING, false)) {
+                                           L"material", CString::ENDOFSTRING, false)
+                                       || theFullPath.GetExtension().Compare(
+                                           L"shader", CString::ENDOFSTRING, false)) {
                                 if (theFullPath.Exists()) {
                                     std::vector<SMetaDataLoadWarning> warnings;
                                     NVScopedRefCounted<qt3ds::render::IRefCountedInputStream>
diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
index 9ac7a3ea..8c599cfb 100644
--- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
+++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMMetaData.cpp
@@ -3828,7 +3828,7 @@ public:
                               qt3ds::foundation::IInStream &inStream) override
     {
         QString shaderFile(inShaderFile);
-        if (shaderFile.endsWith(".material")) {
+        if (shaderFile.endsWith(".material") || shaderFile.endsWith(".shader")) {
             LoadMaterialClassFromSourcePath(inShaderFile, inInstance, inName, outWarnings,
                                             inStream);
         } else {
diff --git a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
index f9dedc12..4016fb33 100644
--- a/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
+++ b/src/Authoring/Studio/Palettes/Inspector/InspectorControlView.cpp
@@ -95,6 +95,7 @@ void InspectorControlView::filterMaterials(std::vector<Q3DStudio::CFilePath> &ma
 {
     static const wchar_t *extensions[] = {
         L"material",
+        L"shader",
         nullptr
     };
     for (size_t i = 0; i < m_fileList.size(); ++i) {
@@ -139,7 +140,7 @@ void InspectorControlView::onFilesChanged(
         const Q3DStudio::TFileModificationList &inFileModificationList)
 {
     static const wchar_t *materialExtensions[] = {
-        L"material", L"materialdef",
+        L"material", L"shader", L"materialdef",
         nullptr
     };
     static const wchar_t *fontExtensions[] = {
diff --git a/src/Authoring/Studio/Workspace/Dialogs.cpp b/src/Authoring/Studio/Workspace/Dialogs.cpp
index e9ad3ede..7d3ea989 100644
--- a/src/Authoring/Studio/Workspace/Dialogs.cpp
+++ b/src/Authoring/Studio/Workspace/Dialogs.cpp
@@ -155,11 +155,11 @@ const wchar_t *wideEffectExts[] = {
 };
 
 const char *materialExts[] = {
-    "material", "materialdef", nullptr,
+    "material", "shader", "materialdef", nullptr,
 };
 
 const wchar_t *wideMaterialExts[] = {
-    L"material", L"materialdef", nullptr,
+    L"material", L"shader", L"materialdef", nullptr,
 };
 
 const char *soundExts[] = {
diff --git a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp
index 52aaa180..a9c581aa 100644
--- a/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp
+++ b/src/Runtime/Source/UIPParser/Source/Qt3DSUIPParserImpl.cpp
@@ -653,7 +653,7 @@ BOOL CUIPParserImpl::LoadClasses(IPresentation & /*inPresentation*/, IDOMReader
                     theLoadFlag = m_MetaData.LoadEffectXMLFile(inReader.GetNarrowElementName(),
                                                                theId, theName,
                                                                theFullPath.toUtf8().data());
-                } else if (theFullPath.endsWith(".material")) {
+                } else if (theFullPath.endsWith(".material") || theFullPath.endsWith(".shader")) {
                     theLoadFlag = m_MetaData.LoadMaterialXMLFile(
                         inReader.GetNarrowElementName(), theId, theName,
                                 theFullPath.toUtf8().data());
diff --git a/src/Runtime/testres.qrc b/src/Runtime/testres.qrc
index d099c345..7b3c20bc 100644
--- a/src/Runtime/testres.qrc
+++ b/src/Runtime/testres.qrc
@@ -1,11 +1,11 @@
 <RCC>
     <qresource prefix="/">
-        <file alias="aluminium.material">../../Studio/Content/Material Library/aluminum.material</file>
-        <file alias="asphalt.material">../../Studio/Content/Material Library/asphalt.material</file>
-        <file alias="concrete.material">../../Studio/Content/Material Library/concrete.material</file>
-        <file alias="copper.material">../../Studio/Content/Material Library/copper.material</file>
-        <file alias="porcelain.material">../../Studio/Content/Material Library/porcelain.material</file>
-        <file alias="simple_glass.material">../../Studio/Content/Material Library/simple_glass.material</file>
+        <file alias="aluminium.shader">../../Studio/Content/Material Library/aluminum.shader</file>
+        <file alias="asphalt.shader">../../Studio/Content/Material Library/asphalt.shader</file>
+        <file alias="concrete.shader">../../Studio/Content/Material Library/concrete.shader</file>
+        <file alias="copper.shader">../../Studio/Content/Material Library/copper.shader</file>
+        <file alias="porcelain.shader">../../Studio/Content/Material Library/porcelain.shader</file>
+        <file alias="simple_glass.shader">../../Studio/Content/Material Library/simple_glass.shader</file>
         <file alias="Desaturate.effect">../../Studio/Content/Effect Library/Desaturate.effect</file>
         <file alias="Gaussian Blur.effect">../../Studio/Content/Effect Library/Gaussian Blur.effect</file>
         <file alias="Sepia.effect">../../Studio/Content/Effect Library/Sepia.effect</file>
diff --git a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
index a071fb82..75e1ce3d 100644
--- a/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
+++ b/tests/auto/runtime/shadergenerator/Qt3DSRenderTestCustomMaterialGenerator.cpp
@@ -436,11 +436,11 @@ bool Qt3DSRenderTestCustomMaterialGenerator::run(NVRenderContext *context,
     }
 
     if (success) {
-        CRegisteredString name = context->GetStringTable().RegisterStr("qrc:/copper.material");
+        CRegisteredString name = context->GetStringTable().RegisterStr("qrc:/copper.shader");
 
-        metadata()->LoadMaterialXMLFile("CustomMaterial", "", "copper", "qrc:/copper.material");
+        metadata()->LoadMaterialXMLFile("CustomMaterial", "", "copper", "qrc:/copper.shader");
         Option<qt3dsdm::SMetaDataCustomMaterial> metaMaterial =
-                            metadata()->GetMaterialMetaDataBySourcePath("qrc:/copper.material");
+                            metadata()->GetMaterialMetaDataBySourcePath("qrc:/copper.shader");
 
         if (metaMaterial.hasValue()) {
             qt3ds::render::IUIPLoader::CreateMaterialClassFromMetaMaterial(