Fixes to get code to compile on emscripten
This commit is contained in:
parent
1d0a7fc495
commit
207e173c1a
4 changed files with 13 additions and 13 deletions
|
|
@ -16,7 +16,7 @@ ByteMemStream::ByteMemStream(char* p, size_t l):
|
||||||
rdbuf(&buffer);
|
rdbuf(&buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::shared_ptr<std::stringstream>> fragment_message(std::string_view uncompressedView, uint64_t stride) {
|
std::vector<std::shared_ptr<std::stringstream>> fragment_message(std::string_view uncompressedView, size_t stride) {
|
||||||
if(uncompressedView.length() <= stride)
|
if(uncompressedView.length() <= stride)
|
||||||
return {};
|
return {};
|
||||||
|
|
||||||
|
|
@ -30,7 +30,7 @@ std::vector<std::shared_ptr<std::stringstream>> fragment_message(std::string_vie
|
||||||
|
|
||||||
toRet.emplace_back(std::make_shared<std::stringstream>());
|
toRet.emplace_back(std::make_shared<std::stringstream>());
|
||||||
|
|
||||||
size_t messFirstStride = std::min(stride, v.size());
|
size_t messFirstStride = std::min<size_t>(stride, v.size());
|
||||||
|
|
||||||
{
|
{
|
||||||
cereal::PortableBinaryOutputArchive m(*toRet.back());
|
cereal::PortableBinaryOutputArchive m(*toRet.back());
|
||||||
|
|
@ -46,7 +46,7 @@ std::vector<std::shared_ptr<std::stringstream>> fragment_message(std::string_vie
|
||||||
toRet.emplace_back(std::make_shared<std::stringstream>());
|
toRet.emplace_back(std::make_shared<std::stringstream>());
|
||||||
{
|
{
|
||||||
cereal::PortableBinaryOutputArchive m(*toRet.back());
|
cereal::PortableBinaryOutputArchive m(*toRet.back());
|
||||||
m((MessageCommandType)0, cereal::binary_data(v.data() + nextByte, (uint64_t)(v.length() - nextByte)));
|
m((MessageCommandType)0, cereal::binary_data(v.data() + nextByte, v.length() - nextByte));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -78,7 +78,7 @@ void decode_fragmented_message(cereal::PortableBinaryInputArchive& inArchive, Pa
|
||||||
inArchive(messageSize);
|
inArchive(messageSize);
|
||||||
spfm.partialFragmentMessage.resize(messageSize);
|
spfm.partialFragmentMessage.resize(messageSize);
|
||||||
|
|
||||||
size_t messStride = std::min(fragmentMessageStride, spfm.partialFragmentMessage.size());
|
size_t messStride = std::min<size_t>(fragmentMessageStride, spfm.partialFragmentMessage.size());
|
||||||
|
|
||||||
inArchive(cereal::binary_data(spfm.partialFragmentMessage.data() + spfm.partialFragmentMessageLoc, messStride));
|
inArchive(cereal::binary_data(spfm.partialFragmentMessage.data() + spfm.partialFragmentMessageLoc, messStride));
|
||||||
spfm.partialFragmentMessageLoc += messStride;
|
spfm.partialFragmentMessageLoc += messStride;
|
||||||
|
|
|
||||||
|
|
@ -22,5 +22,5 @@ struct PartialFragmentMessage {
|
||||||
uint64_t partialFragmentMessageLoc = 0;
|
uint64_t partialFragmentMessageLoc = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::vector<std::shared_ptr<std::stringstream>> fragment_message(std::string_view uncompressedView, uint64_t stride);
|
std::vector<std::shared_ptr<std::stringstream>> fragment_message(std::string_view uncompressedView, size_t stride);
|
||||||
void decode_fragmented_message(cereal::PortableBinaryInputArchive& inArchive, PartialFragmentMessage& spfm, size_t fragmentMessageStride, std::function<void(cereal::PortableBinaryInputArchive& completeArchive)> runAfterDecoded);
|
void decode_fragmented_message(cereal::PortableBinaryInputArchive& inArchive, PartialFragmentMessage& spfm, size_t fragmentMessageStride, std::function<void(cereal::PortableBinaryInputArchive& completeArchive)> runAfterDecoded);
|
||||||
|
|
|
||||||
|
|
@ -181,12 +181,12 @@ template <typename T, typename IDType> class CollabList {
|
||||||
obj->obj->collabListInfo = obj;
|
obj->obj->collabListInfo = obj;
|
||||||
idToObjectMap.emplace(obj->id, obj);
|
idToObjectMap.emplace(obj->id, obj);
|
||||||
if(obj->pos - objOrderedVector[startPoint]->pos != (i - startPoint)) {
|
if(obj->pos - objOrderedVector[startPoint]->pos != (i - startPoint)) {
|
||||||
uint64_t insertPosition = std::min(clientSideList.size(), objOrderedVector[startPoint]->pos);
|
uint64_t insertPosition = std::min<uint64_t>(clientSideList.size(), objOrderedVector[startPoint]->pos);
|
||||||
clientSideList.insert(clientSideList.begin() + insertPosition, objOrderedVector.begin() + startPoint, objOrderedVector.begin() + i);
|
clientSideList.insert(clientSideList.begin() + insertPosition, objOrderedVector.begin() + startPoint, objOrderedVector.begin() + i);
|
||||||
startPoint = i;
|
startPoint = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
clientSideList.insert(clientSideList.begin() + std::min(clientSideList.size(), objOrderedVector[startPoint]->pos), objOrderedVector.begin() + startPoint, objOrderedVector.end());
|
clientSideList.insert(clientSideList.begin() + std::min<uint64_t>(clientSideList.size(), objOrderedVector[startPoint]->pos), objOrderedVector.begin() + startPoint, objOrderedVector.end());
|
||||||
|
|
||||||
complete_client_pos_refresh(false);
|
complete_client_pos_refresh(false);
|
||||||
if(updateCallback)
|
if(updateCallback)
|
||||||
|
|
@ -222,15 +222,15 @@ template <typename T, typename IDType> class CollabList {
|
||||||
obj->obj->collabListInfo = obj;
|
obj->obj->collabListInfo = obj;
|
||||||
|
|
||||||
if(obj->pos - objOrderedVector[startPoint]->pos != (i - startPoint)) {
|
if(obj->pos - objOrderedVector[startPoint]->pos != (i - startPoint)) {
|
||||||
uint64_t insertPosition = std::min(clientSideList.size(), objOrderedVector[startPoint]->pos);
|
uint64_t insertPosition = std::min<uint64_t>(clientSideList.size(), objOrderedVector[startPoint]->pos);
|
||||||
clientSideList.insert(clientSideList.begin() + insertPosition, objOrderedVector.begin() + startPoint, objOrderedVector.begin() + i);
|
clientSideList.insert(clientSideList.begin() + insertPosition, objOrderedVector.begin() + startPoint, objOrderedVector.begin() + i);
|
||||||
uint64_t insertPositionServer = std::min(serverSideList.size(), objOrderedVector[startPoint]->pos);
|
uint64_t insertPositionServer = std::min<uint64_t>(serverSideList.size(), objOrderedVector[startPoint]->pos);
|
||||||
serverSideList.insert(serverSideList.begin() + insertPositionServer, objOrderedVector.begin() + startPoint, objOrderedVector.begin() + i);
|
serverSideList.insert(serverSideList.begin() + insertPositionServer, objOrderedVector.begin() + startPoint, objOrderedVector.begin() + i);
|
||||||
startPoint = i;
|
startPoint = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
clientSideList.insert(clientSideList.begin() + std::min(clientSideList.size(), objOrderedVector[startPoint]->pos), objOrderedVector.begin() + startPoint, objOrderedVector.end());
|
clientSideList.insert(clientSideList.begin() + std::min<uint64_t>(clientSideList.size(), objOrderedVector[startPoint]->pos), objOrderedVector.begin() + startPoint, objOrderedVector.end());
|
||||||
serverSideList.insert(serverSideList.begin() + std::min(serverSideList.size(), objOrderedVector[startPoint]->pos), objOrderedVector.begin() + startPoint, objOrderedVector.end());
|
serverSideList.insert(serverSideList.begin() + std::min<uint64_t>(serverSideList.size(), objOrderedVector[startPoint]->pos), objOrderedVector.begin() + startPoint, objOrderedVector.end());
|
||||||
|
|
||||||
if(clientInsertOrderedVectorCallback)
|
if(clientInsertOrderedVectorCallback)
|
||||||
clientInsertOrderedVectorCallback(objOrderedVector);
|
clientInsertOrderedVectorCallback(objOrderedVector);
|
||||||
|
|
|
||||||
|
|
@ -142,13 +142,13 @@ MainServer::MainServer(World& initWorld, const std::string& serverLocalID):
|
||||||
auto& obj = objOrderedVector[i];
|
auto& obj = objOrderedVector[i];
|
||||||
data.idToComponentMap.emplace(obj->id, obj->obj);
|
data.idToComponentMap.emplace(obj->id, obj->obj);
|
||||||
if(obj->pos - objOrderedVector[startPoint]->pos != (i - startPoint)) {
|
if(obj->pos - objOrderedVector[startPoint]->pos != (i - startPoint)) {
|
||||||
uint64_t insertPosition = std::min(data.components.size(), objOrderedVector[startPoint]->pos);
|
uint64_t insertPosition = std::min<uint64_t>(data.components.size(), objOrderedVector[startPoint]->pos);
|
||||||
data.components.insert(data.components.begin() + insertPosition, objOrderedComponentPairs.begin() + startPoint, objOrderedComponentPairs.begin() + i);
|
data.components.insert(data.components.begin() + insertPosition, objOrderedComponentPairs.begin() + startPoint, objOrderedComponentPairs.begin() + i);
|
||||||
startPoint = i;
|
startPoint = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
data.components.insert(data.components.begin() + std::min(data.components.size(), objOrderedVector[startPoint]->pos), objOrderedComponentPairs.begin() + startPoint, objOrderedComponentPairs.end());
|
data.components.insert(data.components.begin() + std::min<uint64_t>(data.components.size(), objOrderedVector[startPoint]->pos), objOrderedComponentPairs.begin() + startPoint, objOrderedComponentPairs.end());
|
||||||
|
|
||||||
startPoint = 0;
|
startPoint = 0;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue