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

Fixes to world scale up over network

Browse source
This commit is contained in:
Yousef Khadadeh 2026-05-30 20:57:50 +03:00
parent 015e9bc5df
commit 48823ebad6
4 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/ClientData.cpp
View file

@ -80,10 +80,16 @@ void ClientData::register_class(World& world) {
break;
}
case ClientDataCommand::SET_GRID_SIZE: {
uint32_t oldGridSize = o->gridSize;
a(o->gridSize);
if(oldGridSize < o->gridSize)
world.scale_up(get_canvas_scale_up_amount(o->gridSize, oldGridSize));
if(o != world.ownClientData) {
if(world.ownClientData->gridSize < o->gridSize) {
world.scale_up(get_canvas_scale_up_amount(o->gridSize, world.ownClientData->gridSize));
world.ownClientData->gridSize = o->gridSize;
world.ownClientData.send_update_to_all(RELIABLE_COMMAND_CHANNEL, [](const NetObjTemporaryPtr<ClientData>& o, cereal::PortableBinaryOutputArchive & a) {
a(ClientDataCommand::SET_GRID_SIZE, o->gridSize);
});
}
}
break;
}
}
@ -122,10 +128,14 @@ void ClientData::register_class(World& world) {
break;
}
case ClientDataCommand::SET_GRID_SIZE: {
uint32_t oldGridSize = o->gridSize;
a(o->gridSize);
if(oldGridSize < o->gridSize)
world.scale_up(get_canvas_scale_up_amount(o->gridSize, oldGridSize));
if(world.ownClientData->gridSize < o->gridSize) {
world.scale_up(get_canvas_scale_up_amount(o->gridSize, world.ownClientData->gridSize));
world.ownClientData->gridSize = o->gridSize;
world.ownClientData.send_update_to_all(RELIABLE_COMMAND_CHANNEL, [](const NetObjTemporaryPtr<ClientData>& o, cereal::PortableBinaryOutputArchive & a) {
a(ClientDataCommand::SET_GRID_SIZE, o->gridSize);
});
}
o.send_server_update_to_all_clients(RELIABLE_COMMAND_CHANNEL, [](const NetObjTemporaryPtr<ClientData>& o, cereal::PortableBinaryOutputArchive & a) {
a(ClientDataCommand::SET_GRID_SIZE, o->gridSize);
});