Explorar o código

Merge pull request #2308 from aws-lumberyard-dev/Prefabs/SmallFormatImprovements

Remove unneeded fields from Entity and EditorTransform JsonSerializers
AMZN-koppersr %!s(int64=4) %!d(string=hai) anos
pai
achega
c831f8037a

+ 0 - 23
Code/Framework/AzCore/AzCore/Component/EntitySerializer.cpp

@@ -89,15 +89,6 @@ namespace AZ
             result.Combine(componentLoadResult);
         }
 
-        {
-            JSR::ResultCode dependencyReadyLoadResult =
-                ContinueLoadingFromJsonObjectField(&entityInstance->m_isDependencyReady,
-                    azrtti_typeid<decltype(entityInstance->m_isDependencyReady)>(),
-                    inputValue, "IsDependencyReady", context);
-
-            result.Combine(dependencyReadyLoadResult);
-        }
-
         {
             JSR::ResultCode runtimeActiveLoadResult =
                 ContinueLoadingFromJsonObjectField(&entityInstance->m_isRuntimeActiveByDefault,
@@ -184,20 +175,6 @@ namespace AZ
             result.Combine(resultComponents);
         }
 
-        {
-            AZ::ScopedContextPath subPathDependencyReady(context, "m_isDependencyReady");
-            const bool* dependencyReady = &entityInstance->m_isDependencyReady;
-            const bool* dependencyReadyDefault =
-                defaultEntityInstance ? &defaultEntityInstance->m_isDependencyReady : nullptr;
-
-            JSR::ResultCode resultDependencyReady =
-                ContinueStoringToJsonObjectField(outputValue, "IsDependencyReady",
-                    dependencyReady, dependencyReadyDefault,
-                    azrtti_typeid<decltype(entityInstance->m_isDependencyReady)>(), context);
-
-            result.Combine(resultDependencyReady);
-        }
-
         {
             AZ::ScopedContextPath subPathRuntimeActive(context, "m_isRuntimeActiveByDefault");
             const bool* runtimeActive = &entityInstance->m_isRuntimeActiveByDefault;

+ 0 - 20
Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponentSerializer.cpp

@@ -67,14 +67,6 @@ namespace AzToolsFramework
                 result.Combine(isStaticLoadResult);
             }
 
-            {
-                JSR::ResultCode netSyncEnabledLoadResult = ContinueLoadingFromJsonObjectField(
-                    &transformComponentInstance->m_netSyncEnabled, azrtti_typeid<decltype(transformComponentInstance->m_netSyncEnabled)>(),
-                    inputValue, "Sync Enabled", context);
-
-                result.Combine(netSyncEnabledLoadResult);
-            }
-
             {
                 JSR::ResultCode interpolatePositionLoadResult = ContinueLoadingFromJsonObjectField(
                     &transformComponentInstance->m_interpolatePosition, azrtti_typeid<decltype(transformComponentInstance->m_interpolatePosition)>(),
@@ -172,18 +164,6 @@ namespace AzToolsFramework
                 result.Combine(resultIsStatic);
             }
 
-            {
-                AZ::ScopedContextPath subPathName(context, "m_netSyncEnabled");
-                const bool* netSyncEnabled = &transformComponentInstance->m_netSyncEnabled;
-                const bool* defaultNetSyncEnabled = defaultTransformComponentInstance ? &defaultTransformComponentInstance->m_netSyncEnabled : nullptr;
-
-                JSR::ResultCode resultNetSyncEnabled = ContinueStoringToJsonObjectField(
-                    outputValue, "Sync Enabled", netSyncEnabled, defaultNetSyncEnabled, azrtti_typeid<decltype(transformComponentInstance->m_netSyncEnabled)>(),
-                    context);
-
-                result.Combine(resultNetSyncEnabled);
-            }
-
             {
                 AZ::ScopedContextPath subPathName(context, "m_interpolatePosition");
                 const AZ::InterpolationMode* interpolatePosition = &transformComponentInstance->m_interpolatePosition;