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

Merge branch 'development' into Prefab/DestroyGameEntitySupport

Browse Source 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
This commit is contained in:
srikappa-amzn
2021-09-28 06:57:38 -07:00
parent 9078d1925a 1f6dfd0194
commit 27e93e3af7
1501 changed files with 34384 additions and 17743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
+56 -2
View File
@@ -36,6 +36,16 @@ namespace AzFramework
return m_end;
}
const AZ::Entity* const* SpawnableEntityContainerView::begin() const
{
return m_begin;
}
const AZ::Entity* const* SpawnableEntityContainerView::end() const
{
return m_end;
}
const AZ::Entity* const* SpawnableEntityContainerView::cbegin()
{
return m_begin;
@@ -46,11 +56,28 @@ namespace AzFramework
return m_end;
}
size_t SpawnableEntityContainerView::size()
AZ::Entity* SpawnableEntityContainerView::operator[](size_t n)
{
AZ_Assert(n < size(), "Index %zu is out of bounds (size: %llu) for Spawnable Entity Container View", n, size());
return *(m_begin + n);
}
const AZ::Entity* SpawnableEntityContainerView::operator[](size_t n) const
{
AZ_Assert(n < size(), "Index %zu is out of bounds (size: %llu) for Spawnable Entity Container View", n, size());
return *(m_begin + n);
}
size_t SpawnableEntityContainerView::size() const
{
return AZStd::distance(m_begin, m_end);
}
bool SpawnableEntityContainerView::empty() const
{
return m_begin == m_end;
}
//
// SpawnableConstEntityContainerView
@@ -78,6 +105,16 @@ namespace AzFramework
return m_end;
}
const AZ::Entity* const* SpawnableConstEntityContainerView::begin() const
{
return m_begin;
}
const AZ::Entity* const* SpawnableConstEntityContainerView::end() const
{
return m_end;
}
const AZ::Entity* const* SpawnableConstEntityContainerView::cbegin()
{
return m_begin;
@@ -88,11 +125,28 @@ namespace AzFramework
return m_end;
}
size_t SpawnableConstEntityContainerView::size()
const AZ::Entity* SpawnableConstEntityContainerView::operator[](size_t n)
{
AZ_Assert(n < size(), "Index %zu is out of bounds (size: %llu) for Spawnable Const Entity Container View", n, size());
return *(m_begin + n);
}
const AZ::Entity* SpawnableConstEntityContainerView::operator[](size_t n) const
{
AZ_Assert(n < size(), "Index %zu is out of bounds (size: %llu) for Spawnable Entity Container View", n, size());
return *(m_begin + n);
}
size_t SpawnableConstEntityContainerView::size() const
{
return AZStd::distance(m_begin, m_end);
}
bool SpawnableConstEntityContainerView::empty() const
{
return m_begin == m_end;
}
//
// SpawnableIndexEntityPair
Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.h
+24 -10
View File
@@ -36,11 +36,18 @@ namespace AzFramework
SpawnableEntityContainerView(AZ::Entity** begin, size_t length);
SpawnableEntityContainerView(AZ::Entity** begin, AZ::Entity** end);
AZ::Entity** begin();
AZ::Entity** end();
const AZ::Entity* const* cbegin();
const AZ::Entity* const* cend();
size_t size();
[[nodiscard]] AZ::Entity** begin();
[[nodiscard]] AZ::Entity** end();
[[nodiscard]] const AZ::Entity* const* begin() const;
[[nodiscard]] const AZ::Entity* const* end() const;
[[nodiscard]] const AZ::Entity* const* cbegin();
[[nodiscard]] const AZ::Entity* const* cend();
[[nodiscard]] AZ::Entity* operator[](size_t n);
[[nodiscard]] const AZ::Entity* operator[](size_t n) const;
[[nodiscard]] size_t size() const;
[[nodiscard]] bool empty() const;
private:
AZ::Entity** m_begin;
@@ -53,11 +60,18 @@ namespace AzFramework
SpawnableConstEntityContainerView(AZ::Entity** begin, size_t length);
SpawnableConstEntityContainerView(AZ::Entity** begin, AZ::Entity** end);
const AZ::Entity* const* begin();
const AZ::Entity* const* end();
const AZ::Entity* const* cbegin();
const AZ::Entity* const* cend();
size_t size();
[[nodiscard]] const AZ::Entity* const* begin();
[[nodiscard]] const AZ::Entity* const* end();
[[nodiscard]] const AZ::Entity* const* begin() const;
[[nodiscard]] const AZ::Entity* const* end() const;
[[nodiscard]] const AZ::Entity* const* cbegin();
[[nodiscard]] const AZ::Entity* const* cend();
[[nodiscard]] const AZ::Entity* operator[](size_t n);
[[nodiscard]] const AZ::Entity* operator[](size_t n) const;
[[nodiscard]] size_t size() const;
[[nodiscard]] bool empty() const;
private:
AZ::Entity** m_begin;