celeron55
/
buildat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/replicate,voxelworld: Initialize existing peers on scene at voxelworld instance creation

master
Perttu Ahola 2014-10-29 13:30:35 +02:00
parent 82e0ff612a
commit 86976cbc6c
3 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/replicate/api.h
View File

@ -50,6 +50,9 @@ namespace replicate
virtual void assign_scene_to_peer(
main_context::SceneReference scene_ref, PeerId peer) = 0;
virtual sv_<PeerId> find_peers_on_scene(
main_context::SceneReference scene_ref) = 0;
virtual sv_<PeerId> find_peers_that_know_node(
main_context::SceneReference scene_ref, uint node_id) = 0;

13
builtin/replicate/replicate.cpp
View File

@ -528,6 +528,19 @@ struct Module: public interface::Module, public replicate::Interface
}
}
sv_<PeerId> find_peers_on_scene(
main_context::SceneReference scene_ref)
{
sv_<PeerId> result;
for(auto &pair: m_peers){
PeerState &ps = pair.second;
if(ps.scene_ref == nullptr || ps.scene_ref != scene_ref)
continue;
result.push_back(ps.peer_id);
}
return result;
}
sv_<PeerId> find_peers_that_know_node(
main_context::SceneReference scene_ref, uint node_id)
{

57
builtin/voxelworld/voxelworld.cpp
View File

@ -286,9 +286,15 @@ struct CInstance: public voxelworld::Instance
}
}
// TODO
log_w(MODULE, "TODO: Send initialization stuff to clients that already"
" were on this scene");
// Find peers that already are on the scene and iniitalize them
sv_<replicate::PeerId> peers;
replicate::access(m_server, [&](replicate::Interface *ireplicate){
peers = ireplicate->find_peers_on_scene(m_scene_ref);
});
log_v(MODULE, "Existing peers on scene: %s", cs(peers));
for(auto &peer : peers){
initialize_peer(peer);
}
}
~CInstance()
@ -349,26 +355,7 @@ struct CInstance: public voxelworld::Instance
void on_peer_joined_scene(const replicate::PeerJoinedScene &event)
{
int peer = event.peer;
// Load the client-side module (can be called multiple times)
network::access(m_server, [&](network::Interface *inetwork){
inetwork->send(peer, "core:run_script",
"require(\"buildat/module/voxelworld\")");
});
// Send initialization data and tell the client that it is now ready
std::ostringstream os(std::ios::binary);
{
cereal::PortableBinaryOutputArchive ar(os);
ar(m_chunk_size_voxels);
ar(m_section_size_chunks);
}
network::access(m_server, [&](network::Interface *inetwork){
inetwork->send(peer, "voxelworld:init", os.str());
inetwork->send(peer, "voxelworld:voxel_registry",
m_voxel_reg->serialize());
inetwork->send(peer, "voxelworld:ready", "");
});
m_clients_initialized.insert(peer);
initialize_peer(event.peer);
}
void on_peer_left_scene(const replicate::PeerLeftScene &event)
@ -395,6 +382,30 @@ struct CInstance: public voxelworld::Instance
packet.sender, PV3I_PARAMS(section_p));
}*/
void initialize_peer(replicate::PeerId peer)
{
log_v(MODULE, "Initializing peer %i", peer);
// Load the client-side module (can be called multiple times)
network::access(m_server, [&](network::Interface *inetwork){
inetwork->send(peer, "core:run_script",
"require(\"buildat/module/voxelworld\")");
});
// Send initialization data and tell the client that it is now ready
std::ostringstream os(std::ios::binary);
{
cereal::PortableBinaryOutputArchive ar(os);
ar(m_chunk_size_voxels);
ar(m_section_size_chunks);
}
network::access(m_server, [&](network::Interface *inetwork){
inetwork->send(peer, "voxelworld:init", os.str());
inetwork->send(peer, "voxelworld:voxel_registry",
m_voxel_reg->serialize());
inetwork->send(peer, "voxelworld:ready", "");
});
m_clients_initialized.insert(peer);
}
void unload_node(Scene *scene, uint node_id)
{
log_d(MODULE, "Unloading node %i", node_id);