copilot/infinipaint
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Fixed erase_it_list order, and fixed Emscripten bug

Browse source
This commit is contained in:
Yousef Khadadeh 2026-02-10 11:33:19 +03:00
parent ed931f0a78
commit 9d539367ec
5 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/Helpers/NetworkingObjects/NetObjOrderedList.hpp
View file

@ -374,10 +374,15 @@ namespace NetworkingObjects {
return;
std::vector<std::pair<uint32_t, NetObjOwnerPtr<T>>> erasedObjectsWithPos;
if(erasedObjects) {
for(auto& it : itList)
erasedObjectsWithPos.emplace_back(it->pos, NetObjOwnerPtr<T>());
}
NetObjOrderedListIterator<T> smallestPosIt = data.end();
std::vector<NetObjID> idListToSend;
for(auto& it : itList) {
for(size_t i = 0; i < itList.size(); i++) {
auto& it = itList[i];
if(smallestPosIt == data.end() || smallestPosIt->pos >= it->pos) {
smallestPosIt = std::next(it);
if(smallestPosIt != data.end())
@ -387,7 +392,7 @@ namespace NetworkingObjects {
this->call_erase_callback(it);
idToDataMap.erase(it->obj.get_net_id());
if(erasedObjects)
erasedObjectsWithPos.emplace_back(it->pos, std::move(it->obj));
erasedObjectsWithPos[i].second = std::move(it->obj);
data.erase(it);
}
@ -516,9 +521,15 @@ namespace NetworkingObjects {
return;
std::vector<std::pair<uint32_t, NetObjOwnerPtr<T>>> erasedObjectsWithPos;
if(erasedObjects) {
for(auto& it : itList)
erasedObjectsWithPos.emplace_back(it->pos, NetObjOwnerPtr<T>());
}
NetObjOrderedListIterator<T> smallestPosIt = clientData.end();
std::vector<NetObjID> idListToSend;
for(auto& it : itList) {
for(size_t i = 0; i < itList.size(); i++) {
auto& it = itList[i];
if(smallestPosIt == clientData.end() || smallestPosIt->pos >= it->pos) {
smallestPosIt = std::next(it);
if(smallestPosIt != clientData.end())
@ -528,7 +539,7 @@ namespace NetworkingObjects {
this->call_erase_callback(it);
clientIdToDataMap.erase(it->obj.get_net_id());
if(erasedObjects)
erasedObjectsWithPos.emplace_back(it->pos, std::move(it->obj));
erasedObjectsWithPos[i].second = std::move(it->obj);
clientData.erase(it);
}

1
include/Helpers/NetworkingObjects/NetObjOwnerPtr.impl.hpp
View file

@ -11,6 +11,7 @@
namespace NetworkingObjects {
template <typename T> NetObjOwnerPtr<T>::NetObjOwnerPtr():
objMan(nullptr),
id(NetObjID{0, 0}),
rawPtr(nullptr)
{}