Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

most StructureOfArray<> methods cannot be constexpr

Browse Source 
This is because we can't create a constexpr SoA in the first place,
and it wouldn't be very useful if we could.

This change ripples into users of SoA.
This commit is contained in:
Mathias Agopian
2019-08-13 15:14:50 -07:00
committed by Mathias Agopian
parent a09c3b154a
commit 76cca21c65
5 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libs/utils/include/utils/SingleInstanceComponentManager.h
View File

@@ -140,46 +140,46 @@ public:
// return a pointer to the first element of the ElementIndex'th array
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex>* begin() noexcept {
typename SoA::template TypeAt<ElementIndex>* begin() noexcept {
return mData.template data<ElementIndex>() + 1;
}
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex> const* begin() const noexcept {
typename SoA::template TypeAt<ElementIndex> const* begin() const noexcept {
return mData.template data<ElementIndex>() + 1;
}
// return a pointer to the past-the-end element of the ElementIndex'th array
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex>* end() noexcept {
typename SoA::template TypeAt<ElementIndex>* end() noexcept {
return begin<ElementIndex>() + getComponentCount();
}
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex> const* end() const noexcept {
typename SoA::template TypeAt<ElementIndex> const* end() const noexcept {
return begin<ElementIndex>() + getComponentCount();
}
// return a Slice<>
template<size_t ElementIndex>
constexpr Slice<typename SoA::template TypeAt<ElementIndex>> slice() noexcept {
Slice<typename SoA::template TypeAt<ElementIndex>> slice() noexcept {
return { begin<ElementIndex>(), end<ElementIndex>() };
}
template<size_t ElementIndex>
constexpr Slice<const typename SoA::template TypeAt<ElementIndex>> slice() const noexcept {
Slice<const typename SoA::template TypeAt<ElementIndex>> slice() const noexcept {
return { begin<ElementIndex>(), end<ElementIndex>() };
}
// return a reference to the index'th element of the ElementIndex'th array
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex>& elementAt(Instance index) noexcept {
typename SoA::template TypeAt<ElementIndex>& elementAt(Instance index) noexcept {
assert(index);
return data<ElementIndex>()[index];
}
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex> const& elementAt(Instance index) const noexcept {
typename SoA::template TypeAt<ElementIndex> const& elementAt(Instance index) const noexcept {
assert(index);
return data<ElementIndex>()[index];
}
@@ -187,14 +187,14 @@ public:
// returns a pointer to the RAW ARRAY of components including the first dummy component
// Use with caution.
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex> const* raw_array() const noexcept {
typename SoA::template TypeAt<ElementIndex> const* raw_array() const noexcept {
return data<ElementIndex>();
}
// We need our own version of Field because mData is private
template<size_t E>
struct Field : public SoA::template Field<E> {
constexpr Field(SingleInstanceComponentManager& soa, EntityInstanceBase::Type i) noexcept
Field(SingleInstanceComponentManager& soa, EntityInstanceBase::Type i) noexcept
: SoA::template Field<E>{ soa.mData, i } {
}
using SoA::template Field<E>::operator =;
@@ -202,12 +202,12 @@ public:
protected:
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex>* data() noexcept {
typename SoA::template TypeAt<ElementIndex>* data() noexcept {
return mData.template data<ElementIndex>();
}
template<size_t ElementIndex>
constexpr typename SoA::template TypeAt<ElementIndex> const* data() const noexcept {
typename SoA::template TypeAt<ElementIndex> const* data() const noexcept {
return mData.template data<ElementIndex>();
}