Merge pull request #1205 from aws-lumberyard-dev/Atom/guthadam/ATOM-15748_fixing_material_editor_launch_failure_for_new_projects

Fixing material editor startup and critical asset issues

Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt

@@ -113,6 +113,10 @@ ly_add_target(
             Gem::MaterialEditor.Document
 )
 
+# Add a 'builders' alias to allow the MaterialEditor root gem path to be added to the generated
+# cmake_dependencies.<project>.assetprocessor.setreg to allow the asset scan folder for it to be added
+ly_create_alias(NAME MaterialEditor.Builders NAMESPACE Gem)
+
 # Add build dependency to Editor for the MaterialEditor application since
 # Editor opens up the MaterialEditor
 ly_add_dependencies(Editor Gem::MaterialEditor)

Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Linux.cpp

@@ -0,0 +1,42 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or
+* a third party where indicated.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <AzCore/std/string/string.h>
+#include <QWidget>
+#include <AzFramework/Windowing/WindowBus.h>
+
+namespace Platform
+{
+    void LoadPluginDependencies()
+    {
+        AZ_Warning("Material Editor", false, "LoadPluginDependencies() function is not implemented");
+    }
+
+    void ProcessInput(void* message)
+    {
+        AZ_Warning("Material Editor", false, "ProcessInput() function is not implemented");
+    }
+
+    AzFramework::NativeWindowHandle GetWindowHandle(WId winId)
+    {
+        AZ_Warning("Material Editor", false, "GetWindowHandle() function is not implemented");
+        AZ_UNUSED(winId);
+        return nullptr;
+    }
+
+    AzFramework::WindowSize GetClientAreaSize(AzFramework::NativeWindowHandle window)
+    {
+        AZ_Warning("Material Editor", false, "GetClientAreaSize() function is not implemented");
+        AZ_UNUSED(window);
+        return AzFramework::WindowSize{1,1};
+    }
+}

Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Linux.h

@@ -0,0 +1,15 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#define AZ_TRAIT_MATERIALEDITOR_EXT ""
+

Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/MaterialEditor_Traits_Platform.h

@@ -0,0 +1,14 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+#pragma once
+
+#include <MaterialEditor_Traits_Linux.h>

Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/PAL_linux.cmake

@@ -9,4 +9,4 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #
 
-set(PAL_TRAIT_ATOM_MATERIAL_EDITOR_APPLICATION_SUPPORTED FALSE)
+set(PAL_TRAIT_ATOM_MATERIAL_EDITOR_APPLICATION_SUPPORTED TRUE)

Gems/Atom/Tools/MaterialEditor/Code/Source/Platform/Linux/platform_linux_files.cmake

@@ -10,4 +10,7 @@
 #
 
 set(FILES
+    MaterialEditor_Traits_Platform.h
+    MaterialEditor_Traits_Linux.h
+    MaterialEditor_Linux.cpp
 )

Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorBrowserInteractions.cpp

@@ -30,7 +30,7 @@
 #include <Atom/RPI.Edit/Common/AssetUtils.h>
 #include <Atom/Document/MaterialDocumentSystemRequestBus.h>
 
-#include <WIndow/MaterialEditorBrowserInteractions.h>
+#include <Window/MaterialEditorBrowserInteractions.h>
 #include <Window/CreateMaterialDialog/CreateMaterialDialog.h>
 
 #include <Atom/RPI.Reflect/Material/MaterialAsset.h>

Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp

@@ -15,7 +15,7 @@
 #include <Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h>
 #include <Source/Window/PerformanceMonitor/ui_PerformanceMonitorWidget.h>
 
-#include <Qtimer>
+#include <QTimer>
 
 namespace MaterialEditor
 {

Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <QWidget>
-#include <Qtimer>
+#include <QTimer>
 
 namespace Ui
 {

Gems/Atom/Tools/MaterialEditor/gem.json

@@ -0,0 +1,10 @@
+{
+    "gem_name": "MaterialEditor",
+    "display_name": "Atom Material Editor",
+    "summary": "Editor for creating, modifying, and previewing materials",
+    "canonical_tags": [
+        "Gem"
+    ],
+    "user_tags": [
+    ]
+}

Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt

@@ -111,6 +111,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
             Gem::AtomToolsFramework.Editor
             Gem::AtomViewportDisplayInfo
             Gem::AtomViewportDisplayIcons.Editor
+            Gem::MaterialEditor.Builders
     )