birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More removal fixes

Browse Source
This commit is contained in:
karlberg
2021-05-11 16:36:44 -07:00
parent b2a92b1950
commit 35500981eb
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
+2
View File
@@ -878,6 +878,8 @@ namespace AzFramework
AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflection);
if (serializeContext)
{
serializeContext->ClassDeprecate("NetBindable", "{80206665-D429-4703-B42E-94434F82F381}");
serializeContext->Class<TransformComponent, AZ::Component>()
->Version(4, &TransformComponentVersionConverter)
->Field("Parent", &TransformComponent::m_parentId)
Gems/LmbrCentral/Code/Tests/Builders/LevelBuilderTest.cpp
+16
View File
@@ -309,6 +309,22 @@ TEST_F(LevelBuilderTest, DynamicSlice_NoAssetReferences_HasNoProductDependencies
ASSERT_EQ(productPathDependencies.size(), 0);
}
TEST_F(LevelBuilderTest, DynamicSlice_HasAssetReference_HasCorrectProductDependency)
{
LevelBuilderWorker worker;
AZStd::vector<AssetBuilderSDK::ProductDependency> productDependencies;
ProductPathDependencySet productPathDependencies;
AZStd::string filePath(GetTestFileAliasedPath("levelSlice_oneAssetRef.entities_xml"));
ASSERT_TRUE(AZ::IO::FileIOBase::GetInstance()->Exists(filePath.c_str()));
worker.PopulateLevelSliceDependenciesHelper(filePath, productDependencies, productPathDependencies);
ASSERT_EQ(productPathDependencies.size(), 0);
ASSERT_EQ(productDependencies.size(), 1);
ASSERT_EQ(productDependencies[0].m_dependencyId.m_guid, AZ::Uuid("A8970A25-5043-5519-A927-F180E7D6E8C1"));
ASSERT_EQ(productDependencies[0].m_dependencyId.m_subId, 1);
}
void BuildSliceWithSimpleAssetReference(const AZStd::vector<AZStd::string>& filePaths, AZStd::vector<AssetBuilderSDK::ProductDependency>& productDependencies, ProductPathDependencySet& productPathDependencies)
{
auto* assetComponent = aznew MockSimpleAssetRefComponent;
Gems/PhysX/Code/Tests/PhysXTestCommon.h
+1
View File
@@ -15,6 +15,7 @@
#include <AzCore/Asset/AssetCommon.h>
#include <AzCore/std/containers/vector.h>
#include <AzCore/std/smart_ptr/shared_ptr.h>
#include <AzCore/std/smart_ptr/make_shared.h>
#include <AzFramework/Physics/Material.h>
#include <AzFramework/Physics/Common/PhysicsTypes.h>