stephenseo/EntityComponentMetaSystem
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into cxx17

Browse source
This commit is contained in:
Stephen Seo 2021-09-08 15:56:44 +09:00
commit 60f35e8270
1 changed files with 43 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/EC/Manager.hpp
View file

@ -733,13 +733,13 @@ namespace EC
} }
else else
{ {
std::array<TPFnDataStructZero, ThreadCount> fnDataAr; std::array<TPFnDataStructZero, ThreadCount * 2> fnDataAr;
std::size_t s = currentSize / ThreadCount; std::size_t s = currentSize / (ThreadCount * 2);
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = currentSize; end = currentSize;
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -854,13 +854,13 @@ namespace EC
} }
else else
{ {
std::array<TPFnDataStructOne<Function>, ThreadCount> fnDataAr; std::array<TPFnDataStructOne<Function>, ThreadCount * 2> fnDataAr;
std::size_t s = currentSize / ThreadCount; std::size_t s = currentSize / (ThreadCount * 2);
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = currentSize; end = currentSize;
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1004,13 +1004,13 @@ namespace EC
} }
else else
{ {
std::array<TPFnDataStructTwo, ThreadCount> fnDataAr; std::array<TPFnDataStructTwo, ThreadCount * 2> fnDataAr;
std::size_t s = matching.size() / ThreadCount; std::size_t s = matching.size() / (ThreadCount * 2);
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = matching.size(); end = matching.size();
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1077,14 +1077,14 @@ namespace EC
} }
else else
{ {
std::array<TPFnDataStructThree, ThreadCount> fnDataAr; std::array<TPFnDataStructThree, ThreadCount * 2> fnDataAr;
std::size_t s = currentSize / ThreadCount; std::size_t s = currentSize / (ThreadCount * 2);
std::mutex mutex; std::mutex mutex;
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = currentSize; end = currentSize;
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1454,14 +1454,14 @@ namespace EC
} }
else else
{ {
std::array<TPFnDataStructFour, ThreadCount> fnDataAr; std::array<TPFnDataStructFour, ThreadCount * 2> fnDataAr;
std::mutex mutex; std::mutex mutex;
std::size_t s = currentSize / ThreadCount; std::size_t s = currentSize / (ThreadCount * 2);
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = currentSize; end = currentSize;
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1524,13 +1524,14 @@ namespace EC
} }
} }
} else { } else {
std::array<TPFnDataStructFive, ThreadCount> fnDataAr; std::array<TPFnDataStructFive, ThreadCount * 2>
fnDataAr;
std::size_t s = multiMatchingEntities[index].size() std::size_t s = multiMatchingEntities[index].size()
/ ThreadCount; / (ThreadCount * 2);
for(unsigned int i = 0; i < ThreadCount; ++i) { for(unsigned int i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = multiMatchingEntities[index].size(); end = multiMatchingEntities[index].size();
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1662,14 +1663,14 @@ namespace EC
} }
else else
{ {
std::array<TPFnDataStructSix, ThreadCount> fnDataAr; std::array<TPFnDataStructSix, ThreadCount * 2> fnDataAr;
std::mutex mutex; std::mutex mutex;
std::size_t s = currentSize / ThreadCount; std::size_t s = currentSize / (ThreadCount * 2);
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = currentSize; end = currentSize;
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1737,13 +1738,14 @@ namespace EC
} }
else else
{ {
std::array<TPFnDataStructFive, ThreadCount> fnDataAr; std::array<TPFnDataStructFive, ThreadCount * 2>
fnDataAr;
std::size_t s = multiMatchingEntities[index].size() std::size_t s = multiMatchingEntities[index].size()
/ ThreadCount; / (ThreadCount * 2);
for(unsigned int i = 0; i < ThreadCount; ++i) { for(unsigned int i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = multiMatchingEntities[index].size(); end = multiMatchingEntities[index].size();
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1823,13 +1825,13 @@ namespace EC
} }
} }
} else { } else {
std::array<TPFnDataStructZero, ThreadCount> fnDataAr; std::array<TPFnDataStructZero, ThreadCount * 2> fnDataAr;
std::size_t s = currentSize / ThreadCount; std::size_t s = currentSize / (ThreadCount * 2);
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = currentSize; end = currentSize;
} else { } else {
end = s * (i + 1); end = s * (i + 1);
@ -1908,13 +1910,14 @@ namespace EC
fn(i, this, userData); fn(i, this, userData);
} }
} else { } else {
std::array<TPFnDataStructSeven<Iterable>, ThreadCount> fnDataAr; std::array<TPFnDataStructSeven<Iterable>, ThreadCount * 2>
fnDataAr;
std::size_t s = currentSize / ThreadCount; std::size_t s = currentSize / (ThreadCount * 2);
for(std::size_t i = 0; i < ThreadCount; ++i) { for(std::size_t i = 0; i < ThreadCount * 2; ++i) {
std::size_t begin = s * i; std::size_t begin = s * i;
std::size_t end; std::size_t end;
if(i == ThreadCount - 1) { if(i == ThreadCount * 2 - 1) {
end = currentSize; end = currentSize;
} else { } else {
end = s * (i + 1); end = s * (i + 1);