Integrating latest 47acbe8

Code/Tools/SceneAPI/SceneData/Behaviors/BehaviorsMeshGroup.cpp

@@ -115,7 +115,8 @@ namespace AZ
 
             Events::ProcessingResult MeshGroup::BuildDefault(Containers::Scene& scene) const
             {
-                if (SceneHasMeshGroup(scene) || !Utilities::DoesSceneGraphContainDataLike<DataTypes::IMeshData>(scene, true) || Utilities::DoesSceneGraphContainDataLike<DataTypes::IBoneData>(scene, true))
+                if (SceneHasMeshGroup(scene) ||
+                    !Utilities::DoesSceneGraphContainDataLike<DataTypes::IMeshData>(scene, true))
                 {
                     return Events::ProcessingResult::Ignored;
                 }

Code/Tools/SceneAPI/SceneData/Behaviors/Registry.cpp

@@ -21,6 +21,7 @@
 #include <SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.h>
 #include <SceneAPI/SceneData/Behaviors/SkeletonGroup.h>
 #include <SceneAPI/SceneData/Behaviors/SkinGroup.h>
+#include <SceneAPI/SceneData/Behaviors/SkinRuleBehavior.h>
 
 namespace AZ
 {
@@ -40,7 +41,8 @@ namespace AZ
                     Behaviors::MeshGroup::CreateDescriptor(),
                     Behaviors::ScriptProcessorRuleBehavior::CreateDescriptor(),
                     Behaviors::SkeletonGroup::CreateDescriptor(),
-                    Behaviors::SkinGroup::CreateDescriptor()
+                    Behaviors::SkinGroup::CreateDescriptor(),
+                    SkinRuleBehavior::CreateDescriptor()
                 });
             }
         } // SceneData

Code/Tools/SceneAPI/SceneData/Behaviors/ScriptProcessorRuleBehavior.cpp

@@ -29,6 +29,7 @@
 #include <SceneAPI/SceneCore/Containers/Views/FilterIterator.h>
 #include <SceneAPI/SceneCore/Containers/Views/PairIterator.h>
 #include <SceneAPI/SceneData/Rules/ScriptProcessorRule.h>
+#include <SceneAPI/SceneCore/Utilities/Reporting.h>
 
 namespace AZ
 {
@@ -36,6 +37,41 @@ namespace AZ
     {
         namespace Behaviors
         {
+            class EditorPythonConsoleNotificationHandler final
+                : protected AzToolsFramework::EditorPythonConsoleNotificationBus::Handler
+            {
+            public:
+                EditorPythonConsoleNotificationHandler()
+                {
+                    BusConnect();
+                }
+
+                ~EditorPythonConsoleNotificationHandler()
+                {
+                    BusDisconnect();
+                }
+
+                ////////////////////////////////////////////////////////////////////////////////////////////
+                // AzToolsFramework::EditorPythonConsoleNotifications
+                void OnTraceMessage(AZStd::string_view message) override
+                {
+                    using namespace AZ::SceneAPI::Utilities;
+                    AZ_TracePrintf(LogWindow, "%.*s \n", AZ_STRING_ARG(message));
+                }
+
+                void OnErrorMessage(AZStd::string_view message) override
+                {
+                    using namespace AZ::SceneAPI::Utilities;
+                    AZ_TracePrintf(ErrorWindow, "[ERROR] %.*s \n", AZ_STRING_ARG(message));
+                }
+
+                void OnExceptionMessage(AZStd::string_view message) override
+                {
+                    using namespace AZ::SceneAPI::Utilities;
+                    AZ_TracePrintf(ErrorWindow, "[EXCEPTION] %.*s \n", AZ_STRING_ARG(message));
+                }
+            };                        
+
             // a event bus to signal during scene building
             struct ScriptBuildingNotifications
                 : public AZ::EBusTraits
@@ -182,6 +218,7 @@ namespace AZ
                             &ScriptBuildingNotificationBus::Events::OnUpdateManifest,
                             scene);
                     };
+                    EditorPythonConsoleNotificationHandler logger;
                     m_editorPythonEventsInterface->ExecuteWithLock(executeCallback);
 
                     // attempt to load the manifest string back to a JSON-scene-manifest

Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.cpp

@@ -0,0 +1,65 @@
+/*
+* 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.
+*
+*/
+
+#include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/std/smart_ptr/make_shared.h>
+#include <SceneAPI/SceneCore/Containers/Scene.h>
+#include <SceneAPI/SceneCore/Containers/Utilities/SceneGraphUtilities.h>
+#include <SceneAPI/SceneCore/DataTypes/Groups/IMeshGroup.h>
+#include <SceneAPI/SceneCore/DataTypes/GraphData/ISkinWeightData.h>
+#include <SceneAPI/SceneData/Rules/SkinRule.h>
+#include <SceneAPI/SceneData/Behaviors/SkinRuleBehavior.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneData
+        {
+            void SkinRuleBehavior::Reflect(AZ::ReflectContext* context)
+            {
+                SkinRule::Reflect(context);
+
+                AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
+                if (serializeContext)
+                {
+                    serializeContext->Class<SkinRuleBehavior, SceneCore::BehaviorComponent>()->Version(1);
+                }
+            }
+
+            void SkinRuleBehavior::Activate()
+            {
+                AZ::SceneAPI::Events::ManifestMetaInfoBus::Handler::BusConnect();
+            }
+
+            void SkinRuleBehavior::Deactivate()
+            {
+                AZ::SceneAPI::Events::ManifestMetaInfoBus::Handler::BusDisconnect();
+            }
+
+            void SkinRuleBehavior::InitializeObject([[maybe_unused]] const Containers::Scene& scene, DataTypes::IManifestObject& target)
+            {
+                if (azrtti_istypeof<DataTypes::IMeshGroup>(target))
+                {
+                    DataTypes::IMeshGroup* meshGroup = azrtti_cast<DataTypes::IMeshGroup*>(&target);
+
+                    AZ::SceneAPI::Containers::RuleContainer& rules = meshGroup->GetRuleContainer();
+                    // Only add the skin rule if the scene contain any skinning data.
+                    if (!rules.ContainsRuleOfType<SkinRule>() && Utilities::DoesSceneGraphContainDataLike<DataTypes::ISkinWeightData>(scene, true))
+                    {
+                        rules.AddRule(AZStd::make_shared<SkinRule>());
+                    }
+                }
+            }
+        }
+    }
+}

Code/Tools/SceneAPI/SceneData/Behaviors/SkinRuleBehavior.h

@@ -0,0 +1,43 @@
+#pragma once
+
+/*
+* 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.
+*
+*/
+
+#include <AzCore/Memory/Memory.h>
+#include <SceneAPI/SceneCore/Events/ManifestMetaInfoBus.h>
+#include <SceneAPI/SceneCore/Components/BehaviorComponent.h>
+
+namespace AZ
+{
+    namespace SceneAPI
+    {
+        namespace SceneData
+        {
+            class SkinRuleBehavior
+                : public SceneCore::BehaviorComponent
+                , public Events::ManifestMetaInfoBus::Handler
+            {
+            public:
+                AZ_COMPONENT(SkinRuleBehavior, "{B212A863-32DD-4F92-948C-FC0ADAEEAB4A}", SceneCore::BehaviorComponent);
+
+                ~SkinRuleBehavior() override = default;
+
+                // From BehaviorComponent
+                void Activate() override;
+                void Deactivate() override;
+                static void Reflect(AZ::ReflectContext* context);
+
+                void InitializeObject(const Containers::Scene& scene, DataTypes::IManifestObject& target) override;
+            };
+        }
+    }
+}