Use net objects in resource manager
This commit is contained in:
parent
9e049f0201
commit
9187518290
14 changed files with 113 additions and 179 deletions
|
|
@ -268,7 +268,7 @@ void NetServer::add_disconnect_callback(const NetServerDisconnectCallback& callb
|
||||||
disconnectCallback = callback;
|
disconnectCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::vector<std::shared_ptr<NetServer::ClientData>> NetServer::get_client_list() const {
|
const std::vector<std::shared_ptr<NetServer::ClientData>>& NetServer::get_client_list() const {
|
||||||
return clients;
|
return clients;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ class NetServer : public std::enable_shared_from_this<NetServer> {
|
||||||
void add_recv_callback(MessageCommandType commandID, const NetServerRecvCallback& callback);
|
void add_recv_callback(MessageCommandType commandID, const NetServerRecvCallback& callback);
|
||||||
void add_disconnect_callback(const NetServerDisconnectCallback& callback);
|
void add_disconnect_callback(const NetServerDisconnectCallback& callback);
|
||||||
|
|
||||||
const std::vector<std::shared_ptr<ClientData>> get_client_list() const;
|
const std::vector<std::shared_ptr<ClientData>>& get_client_list() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void parse_received_messages();
|
void parse_received_messages();
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,15 @@ namespace NetworkingObjects {
|
||||||
return NetObjTemporaryPtr<T>();
|
return NetObjTemporaryPtr<T>();
|
||||||
return NetObjTemporaryPtr<T>(this, id, std::static_pointer_cast<T>(it->second.p));
|
return NetObjTemporaryPtr<T>(this, id, std::static_pointer_cast<T>(it->second.p));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE: DO NOT USE THESE FUNCTIONS UNLESS SITUATION ISN'T NORMAL, EVERY OBJECT SHOULD HAVE A UNIQUE ID AND IDS SHOULDNT BE REUSED UNDER ANY CIRCUMSTANCES
|
||||||
|
template <typename T> NetObjOwnerPtr<T> make_obj_with_specific_id(const NetObjID& id) {
|
||||||
|
return emplace_raw_ptr<T>(id, static_cast<T*>(typeList.get_type_index_data<T>(isServer).allocatorFunc()));
|
||||||
|
}
|
||||||
|
template <typename T, typename... Args> NetObjOwnerPtr<T> make_obj_direct_with_specific_id(const NetObjID& id, Args&&... items) {
|
||||||
|
return emplace_raw_ptr<T>(id, new T(items...));
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T> NetObjOwnerPtr<T> make_obj() {
|
template <typename T> NetObjOwnerPtr<T> make_obj() {
|
||||||
return emplace_raw_ptr<T>(NetObjID::random_gen(), static_cast<T*>(typeList.get_type_index_data<T>(isServer).allocatorFunc()));
|
return emplace_raw_ptr<T>(NetObjID::random_gen(), static_cast<T*>(typeList.get_type_index_data<T>(isServer).allocatorFunc()));
|
||||||
}
|
}
|
||||||
|
|
@ -52,12 +61,18 @@ namespace NetworkingObjects {
|
||||||
template <typename T> NetObjOwnerPtr<T> make_obj_from_ptr(T* p) {
|
template <typename T> NetObjOwnerPtr<T> make_obj_from_ptr(T* p) {
|
||||||
return emplace_raw_ptr<T>(NetObjID::random_gen(), p);
|
return emplace_raw_ptr<T>(NetObjID::random_gen(), p);
|
||||||
}
|
}
|
||||||
template <typename T> NetObjOwnerPtr<T> get_obj_ref_from_id(NetObjID id) {
|
template <typename T> NetObjOwnerPtr<T> get_obj_from_id(NetObjID id) {
|
||||||
auto it = objectData.find(id);
|
auto it = objectData.find(id);
|
||||||
if(it == objectData.end())
|
if(it == objectData.end())
|
||||||
throw std::runtime_error("[NetObjManager::get_obj_from_id] ID doesn't exist");
|
throw std::runtime_error("[NetObjManager::get_obj_from_id] ID doesn't exist");
|
||||||
return NetObjOwnerPtr<T>(this, id, static_cast<T*>(it->second.p));
|
return NetObjOwnerPtr<T>(this, id, static_cast<T*>(it->second.p));
|
||||||
}
|
}
|
||||||
|
template <typename T> NetObjTemporaryPtr<T> get_obj_temporary_ref_from_id(NetObjID id) {
|
||||||
|
auto it = objectData.find(id);
|
||||||
|
if(it == objectData.end())
|
||||||
|
return NetObjTemporaryPtr<T>();
|
||||||
|
return NetObjTemporaryPtr<T>(this, id, static_cast<T*>(it->second.p));
|
||||||
|
}
|
||||||
template <typename ClientT, typename ServerT, typename ClientAllocatedType, typename ServerAllocatedType> void register_class(const NetObjManagerTypeList::ServerClientClassFunctions<ClientT, ServerT>& funcs) {
|
template <typename ClientT, typename ServerT, typename ClientAllocatedType, typename ServerAllocatedType> void register_class(const NetObjManagerTypeList::ServerClientClassFunctions<ClientT, ServerT>& funcs) {
|
||||||
typeList.register_class<ClientT, ServerT, ClientAllocatedType, ServerAllocatedType>(funcs);
|
typeList.register_class<ClientT, ServerT, ClientAllocatedType, ServerAllocatedType>(funcs);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ class ImageCanvasComponent : public CanvasComponent {
|
||||||
Vector2f p1;
|
Vector2f p1;
|
||||||
Vector2f p2;
|
Vector2f p2;
|
||||||
|
|
||||||
ServerClientID imageID;
|
NetworkingObjects::NetObjID imageID;
|
||||||
} d;
|
} d;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -52,10 +52,6 @@ bool ConnectionManager::client_exists() {
|
||||||
return client != nullptr;
|
return client != nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> ConnectionManager::server_get_resource_retrieval_progress() {
|
|
||||||
return localServer->resource_download_progress();
|
|
||||||
}
|
|
||||||
|
|
||||||
NetLibrary::DownloadProgress ConnectionManager::client_get_resource_retrieval_progress() {
|
NetLibrary::DownloadProgress ConnectionManager::client_get_resource_retrieval_progress() {
|
||||||
return client->get_progress_into_fragmented_message(RESOURCE_COMMAND_CHANNEL);
|
return client->get_progress_into_fragmented_message(RESOURCE_COMMAND_CHANNEL);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ class ConnectionManager {
|
||||||
bool is_host_disconnected();
|
bool is_host_disconnected();
|
||||||
bool host_exists();
|
bool host_exists();
|
||||||
bool client_exists();
|
bool client_exists();
|
||||||
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> server_get_resource_retrieval_progress();
|
|
||||||
NetLibrary::DownloadProgress client_get_resource_retrieval_progress();
|
NetLibrary::DownloadProgress client_get_resource_retrieval_progress();
|
||||||
std::unique_ptr<MainServer> localServer;
|
std::unique_ptr<MainServer> localServer;
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ bool ImageEditTool::edit_gui(const CanvasComponentContainer::ObjInfoSharedPtr& c
|
||||||
Toolbar& t = drawP.world.main.toolbar;
|
Toolbar& t = drawP.world.main.toolbar;
|
||||||
t.gui.push_id("edit tool image");
|
t.gui.push_id("edit tool image");
|
||||||
t.gui.text_label_centered("File Properties");
|
t.gui.text_label_centered("File Properties");
|
||||||
std::optional<ResourceData> resourceData = drawP.world.rMan.get_resource(a.d.imageID);
|
auto resourceData = drawP.world.netObjMan.get_obj_temporary_ref_from_id<ResourceData>(a.d.imageID);
|
||||||
|
|
||||||
if(resourceData) {
|
if(resourceData) {
|
||||||
t.gui.text_label("Name: " + resourceData->name);
|
t.gui.text_label("Name: " + resourceData->name);
|
||||||
|
|
|
||||||
|
|
@ -1,71 +1,90 @@
|
||||||
#include "ResourceManager.hpp"
|
#include "ResourceManager.hpp"
|
||||||
#include "Helpers/Networking/NetLibrary.hpp"
|
#include <Helpers/Networking/NetLibrary.hpp>
|
||||||
#include <include/core/SkImage.h>
|
#include <include/core/SkImage.h>
|
||||||
|
#include <Helpers/NetworkingObjects/NetObjID.hpp>
|
||||||
#include "ResourceDisplay/SvgResourceDisplay.hpp"
|
#include "ResourceDisplay/SvgResourceDisplay.hpp"
|
||||||
#include "Server/CommandList.hpp"
|
#include "Server/CommandList.hpp"
|
||||||
#include "ResourceDisplay/ImageResourceDisplay.hpp"
|
#include "ResourceDisplay/ImageResourceDisplay.hpp"
|
||||||
#include "ResourceDisplay/FileResourceDisplay.hpp"
|
#include "ResourceDisplay/FileResourceDisplay.hpp"
|
||||||
#include <cereal/types/string.hpp>
|
#include <cereal/types/string.hpp>
|
||||||
#include <Helpers/Logger.hpp>
|
#include <Helpers/Logger.hpp>
|
||||||
#include <optional>
|
|
||||||
#include <sstream>
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include "World.hpp"
|
#include "World.hpp"
|
||||||
#include "ResourceDisplay/FileResourceDisplay.hpp"
|
#include "ResourceDisplay/FileResourceDisplay.hpp"
|
||||||
|
#include <cereal/archives/portable_binary.hpp>
|
||||||
|
|
||||||
ResourceManager::ResourceManager(World& initWorld):
|
ResourceManager::ResourceManager(World& initWorld):
|
||||||
world(initWorld)
|
world(initWorld)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
void ResourceManager::init_client_callbacks() {
|
void ResourceManager::init_client_callbacks() {
|
||||||
world.con.client_add_recv_callback(CLIENT_NEW_RESOURCE_ID, [&](cereal::PortableBinaryInputArchive& message) {
|
world.con.client_add_recv_callback(SERVER_NEW_RESOURCE_ID, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
message(resourceBeingRetrievedClient);
|
NetworkingObjects::NetObjID idBeingRetrieved;
|
||||||
|
message(idBeingRetrieved);
|
||||||
|
resourcesBeingRetrieved.emplace(idBeingRetrieved, 0);
|
||||||
});
|
});
|
||||||
world.con.client_add_recv_callback(CLIENT_NEW_RESOURCE_DATA, [&](cereal::PortableBinaryInputArchive& message) {
|
world.con.client_add_recv_callback(SERVER_NEW_RESOURCE_DATA, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
message(resources[resourceBeingRetrievedClient]);
|
ResourceData newResource;
|
||||||
Logger::get().log("INFO", "Received new resource with id: " + std::to_string(resourceBeingRetrievedClient.first) + " " + std::to_string(resourceBeingRetrievedClient.second) + " of size " + std::to_string(resources[resourceBeingRetrievedClient].data->size()));
|
message(newResource);
|
||||||
resourceBeingRetrievedClient = {0, 0};
|
resourceList.emplace_back(world.netObjMan.make_obj_direct_with_specific_id<ResourceData>(resourcesBeingRetrieved.begin()->first, newResource));
|
||||||
|
resourcesBeingRetrieved.clear();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
float ResourceManager::get_resource_retrieval_progress(const ServerClientID& id) {
|
void ResourceManager::init_server_callbacks() {
|
||||||
if(id == ServerClientID{0, 0})
|
world.con.localServer->netServer->add_recv_callback(CLIENT_NEW_RESOURCE_ID, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
|
NetworkingObjects::NetObjID idBeingRetrieved;
|
||||||
|
message(idBeingRetrieved);
|
||||||
|
resourcesBeingRetrieved.emplace(idBeingRetrieved, client->customID);
|
||||||
|
});
|
||||||
|
world.con.localServer->netServer->add_recv_callback(CLIENT_NEW_RESOURCE_DATA, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
|
ResourceData newResource;
|
||||||
|
message(newResource);
|
||||||
|
auto it = std::find_if(resourcesBeingRetrieved.begin(), resourcesBeingRetrieved.end(), [&client](auto& p) {
|
||||||
|
return p.second == client->customID;
|
||||||
|
});
|
||||||
|
resourceList.emplace_back(world.netObjMan.make_obj_direct_with_specific_id<ResourceData>(it->first, newResource));
|
||||||
|
world.con.localServer->netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_ID, resourceList.back().get_net_id());
|
||||||
|
world.con.localServer->netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_DATA, newResource);
|
||||||
|
resourcesBeingRetrieved.erase(resourceList.back().get_net_id());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
float ResourceManager::get_resource_retrieval_progress(const NetworkingObjects::NetObjID& id) {
|
||||||
|
auto resourceClientID = resourcesBeingRetrieved.find(id);
|
||||||
|
if(resourceClientID == resourcesBeingRetrieved.end())
|
||||||
return 0.0f;
|
return 0.0f;
|
||||||
if(world.con.host_exists() && !world.con.is_host_disconnected()) {
|
if(world.con.localServer) {
|
||||||
auto it = serverDownloadProgress.find(id);
|
uint64_t clientIDToLookFor = resourceClientID->second;
|
||||||
if(it == serverDownloadProgress.end())
|
|
||||||
|
const std::vector<std::shared_ptr<NetServer::ClientData>>& clientListInNetServer = world.con.localServer->netServer->get_client_list();
|
||||||
|
auto netClientIt = std::find_if(clientListInNetServer.begin(), clientListInNetServer.end(), [&clientIDToLookFor](auto& nC) {
|
||||||
|
return nC->customID == clientIDToLookFor;
|
||||||
|
});
|
||||||
|
if(netClientIt == clientListInNetServer.end()) {
|
||||||
|
resourcesBeingRetrieved.erase(resourceClientID); // Client disconnected, remove it from the list
|
||||||
return 0.0f;
|
return 0.0f;
|
||||||
else {
|
|
||||||
auto& progressBytes = it->second;
|
|
||||||
if(progressBytes.totalBytes == 0)
|
|
||||||
return 0.0f;
|
|
||||||
return static_cast<float>(progressBytes.downloadedBytes) / static_cast<float>(progressBytes.totalBytes);
|
|
||||||
}
|
}
|
||||||
|
auto progressBytes = (*netClientIt)->get_progress_into_fragmented_message(RESOURCE_COMMAND_CHANNEL);
|
||||||
|
if(progressBytes.totalBytes == 0)
|
||||||
|
return 0.0f;
|
||||||
|
return static_cast<float>(progressBytes.downloadedBytes) / static_cast<float>(progressBytes.totalBytes);
|
||||||
}
|
}
|
||||||
else if(world.con.client_exists() && !world.con.is_client_disconnected()) {
|
else if(world.con.client_exists() && !world.con.is_client_disconnected()) {
|
||||||
if(id != resourceBeingRetrievedClient)
|
NetLibrary::DownloadProgress progressBytes = world.con.client_get_resource_retrieval_progress();
|
||||||
|
if(progressBytes.totalBytes == 0)
|
||||||
return 0.0f;
|
return 0.0f;
|
||||||
else {
|
return static_cast<float>(progressBytes.downloadedBytes) / static_cast<float>(progressBytes.totalBytes);
|
||||||
NetLibrary::DownloadProgress progressBytes = world.con.client_get_resource_retrieval_progress();
|
|
||||||
if(progressBytes.totalBytes == 0)
|
|
||||||
return 0.0f;
|
|
||||||
return static_cast<float>(progressBytes.downloadedBytes) / static_cast<float>(progressBytes.totalBytes);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return 0.0f;
|
return 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResourceManager::update() {
|
void ResourceManager::update() {
|
||||||
if(!world.con.host_exists() || world.con.is_host_disconnected())
|
|
||||||
serverDownloadProgress.clear();
|
|
||||||
else
|
|
||||||
serverDownloadProgress = world.con.server_get_resource_retrieval_progress();
|
|
||||||
|
|
||||||
for(auto& [k, v] : displays)
|
for(auto& [k, v] : displays)
|
||||||
v->update(world);
|
v->update(world);
|
||||||
}
|
}
|
||||||
|
|
||||||
ServerClientID ResourceManager::add_resource_file(const std::filesystem::path& filePath) {
|
NetworkingObjects::NetObjID ResourceManager::add_resource_file(const std::filesystem::path& filePath) {
|
||||||
// https://nullptr.org/cpp-read-file-into-string/
|
// https://nullptr.org/cpp-read-file-into-string/
|
||||||
std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate);
|
std::ifstream file(filePath, std::ios::in | std::ios::binary | std::ios::ate);
|
||||||
if(!file.is_open()) {
|
if(!file.is_open()) {
|
||||||
|
|
@ -102,72 +121,53 @@ ServerClientID ResourceManager::add_resource_file(const std::filesystem::path& f
|
||||||
return add_resource(resource);
|
return add_resource(resource);
|
||||||
}
|
}
|
||||||
|
|
||||||
ServerClientID ResourceManager::add_resource(const ResourceData& resource) {
|
NetworkingObjects::NetObjID ResourceManager::add_resource(const ResourceData& resource) {
|
||||||
auto it = std::find_if(resources.begin(), resources.end(), [&](const auto& p) {
|
auto it = std::find_if(resourceList.begin(), resourceList.end(), [&](const auto& p) {
|
||||||
return p.second.data == resource.data || (*p.second.data) == (*resource.data);
|
return p->data == resource.data || (*p->data) == (*resource.data);
|
||||||
});
|
});
|
||||||
if(it != resources.end()) {
|
if(it != resourceList.end()) {
|
||||||
Logger::get().log("INFO", "[ResourceManager::add_resource] File " + std::string(resource.name) + " is a duplicate");
|
Logger::get().log("INFO", "[ResourceManager::add_resource] File " + std::string(resource.name) + " is a duplicate");
|
||||||
return it->first;
|
return it->get_net_id();
|
||||||
}
|
}
|
||||||
ServerClientID newID = world.get_new_id();
|
auto& resourceInsert = resourceList.emplace_back(world.netObjMan.make_obj_direct<ResourceData>(resource));
|
||||||
resources[newID] = resource;
|
if(world.con.localServer) {
|
||||||
world.con.client_send_items_to_server(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_ID, newID);
|
world.con.localServer->netServer->send_items_to_all_clients(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_ID, resourceInsert.get_net_id());
|
||||||
world.con.client_send_items_to_server(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_DATA, resource);
|
world.con.localServer->netServer->send_items_to_all_clients(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_DATA, resource);
|
||||||
return newID;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ResourceManager::copy_resource_set_to_map(const std::unordered_set<ServerClientID>& resourceSet, std::unordered_map<ServerClientID, ResourceData>& resourceMap) const {
|
|
||||||
resourceMap.clear();
|
|
||||||
for(auto& [k, v] : resources) {
|
|
||||||
if(resourceSet.contains(k))
|
|
||||||
resourceMap[k] = v;
|
|
||||||
}
|
}
|
||||||
}
|
else {
|
||||||
|
world.con.client_send_items_to_server(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_ID, resourceInsert.get_net_id());
|
||||||
ClientPortionID ResourceManager::get_max_id(ServerPortionID serverID) const {
|
world.con.client_send_items_to_server(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_DATA, resource);
|
||||||
ClientPortionID maxClientID = 0;
|
|
||||||
for(auto& p : resources) {
|
|
||||||
if(p.first.first == serverID)
|
|
||||||
maxClientID = std::max(maxClientID, p.first.second);
|
|
||||||
}
|
}
|
||||||
return maxClientID;
|
return resourceInsert.get_net_id();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<ResourceData> ResourceManager::get_resource(const ServerClientID& id) const {
|
ResourceDisplay* ResourceManager::get_display_data(const NetworkingObjects::NetObjID& fileID) {
|
||||||
auto it = resources.find(id);
|
|
||||||
if(it == resources.end())
|
|
||||||
return std::nullopt;
|
|
||||||
return it->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
ResourceDisplay* ResourceManager::get_display_data(const ServerClientID& fileID) {
|
|
||||||
auto loadedDisplayIt = displays.find(fileID);
|
auto loadedDisplayIt = displays.find(fileID);
|
||||||
if(loadedDisplayIt != displays.end())
|
if(loadedDisplayIt != displays.end())
|
||||||
return loadedDisplayIt->second.get();
|
return loadedDisplayIt->second.get();
|
||||||
|
|
||||||
auto resourceIt = resources.find(fileID);
|
NetworkingObjects::NetObjTemporaryPtr<ResourceData> resourceData = world.netObjMan.get_obj_temporary_ref_from_id<ResourceData>(fileID);
|
||||||
if(resourceIt == resources.end())
|
if(resourceData == NetworkingObjects::NetObjTemporaryPtr<ResourceData>())
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
auto imgResource(std::make_unique<ImageResourceDisplay>());
|
auto imgResource(std::make_unique<ImageResourceDisplay>());
|
||||||
if(imgResource->load(*this, resourceIt->second.name, *resourceIt->second.data)) {
|
if(imgResource->load(*this, resourceData->name, *resourceData->data)) {
|
||||||
displays.emplace(fileID, std::move(imgResource));
|
displays.emplace(fileID, std::move(imgResource));
|
||||||
return displays[fileID].get();
|
return displays[fileID].get();
|
||||||
}
|
}
|
||||||
|
|
||||||
auto svgResource(std::make_unique<SvgResourceDisplay>());
|
auto svgResource(std::make_unique<SvgResourceDisplay>());
|
||||||
if(svgResource->load(*this, resourceIt->second.name, *resourceIt->second.data)) {
|
if(svgResource->load(*this, resourceData->name, *resourceData->data)) {
|
||||||
displays.emplace(fileID, std::move(svgResource));
|
displays.emplace(fileID, std::move(svgResource));
|
||||||
return displays[fileID].get();
|
return displays[fileID].get();
|
||||||
}
|
}
|
||||||
|
|
||||||
auto fileResource(std::make_unique<FileResourceDisplay>());
|
auto fileResource(std::make_unique<FileResourceDisplay>());
|
||||||
fileResource->load(*this, resourceIt->second.name, *resourceIt->second.data);
|
fileResource->load(*this, resourceData->name, *resourceData->data);
|
||||||
displays.emplace(fileID, std::move(fileResource));
|
displays.emplace(fileID, std::move(fileResource));
|
||||||
return displays[fileID].get();
|
return displays[fileID].get();
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::unordered_map<ServerClientID, ResourceData>& ResourceManager::resource_list() {
|
const std::vector<NetworkingObjects::NetObjOwnerPtr<ResourceData>>& ResourceManager::resource_list() {
|
||||||
return resources;
|
return resourceList;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "SharedTypes.hpp"
|
#include <Helpers/NetworkingObjects/NetObjOwnerPtr.hpp>
|
||||||
#include <include/codec/SkCodec.h>
|
#include <include/codec/SkCodec.h>
|
||||||
#include <include/core/SkImage.h>
|
#include "Helpers/NetworkingObjects/NetObjID.hpp"
|
||||||
#include "ResourceDisplay/ResourceDisplay.hpp"
|
#include "ResourceDisplay/ResourceDisplay.hpp"
|
||||||
#include <cereal/types/utility.hpp>
|
|
||||||
#include <cereal/types/string.hpp>
|
|
||||||
#include <cereal/types/unordered_map.hpp>
|
|
||||||
#include <queue>
|
|
||||||
#include <Helpers/Networking/NetLibrary.hpp>
|
#include <Helpers/Networking/NetLibrary.hpp>
|
||||||
|
#include <Helpers/NetworkingObjects/NetObjUnorderedSet.hpp>
|
||||||
|
|
||||||
class World;
|
class World;
|
||||||
|
|
||||||
|
|
@ -26,34 +23,21 @@ struct ResourceData {
|
||||||
class ResourceManager {
|
class ResourceManager {
|
||||||
public:
|
public:
|
||||||
ResourceManager(World& initWorld);
|
ResourceManager(World& initWorld);
|
||||||
template <typename Archive> void serialize(Archive& a) {
|
|
||||||
a(resources);
|
|
||||||
}
|
|
||||||
template <typename Archive> void save_strip_unused_resources(Archive& a, const std::unordered_set<ServerClientID>& usedResources) const {
|
|
||||||
std::unordered_map<ServerClientID, ResourceData> strippedResources = resources;
|
|
||||||
std::erase_if(strippedResources, [&](const auto& p) {
|
|
||||||
return !usedResources.contains(p.first);
|
|
||||||
});
|
|
||||||
a(strippedResources);
|
|
||||||
}
|
|
||||||
void update();
|
void update();
|
||||||
void copy_resource_set_to_map(const std::unordered_set<ServerClientID>& resourceSet, std::unordered_map<ServerClientID, ResourceData>& resourceMap) const;
|
|
||||||
void init_client_callbacks();
|
void init_client_callbacks();
|
||||||
ServerClientID add_resource_file(const std::filesystem::path& filePath);
|
void init_server_callbacks();
|
||||||
ServerClientID add_resource(const ResourceData& resource);
|
NetworkingObjects::NetObjID add_resource_file(const std::filesystem::path& filePath);
|
||||||
ResourceDisplay* get_display_data(const ServerClientID& fileID);
|
NetworkingObjects::NetObjID add_resource(const ResourceData& resource);
|
||||||
std::optional<ResourceData> get_resource(const ServerClientID& id) const;
|
ResourceDisplay* get_display_data(const NetworkingObjects::NetObjID& fileID);
|
||||||
ClientPortionID get_max_id(ServerPortionID serverID) const;
|
const std::vector<NetworkingObjects::NetObjOwnerPtr<ResourceData>>& resource_list();
|
||||||
const std::unordered_map<ServerClientID, ResourceData>& resource_list();
|
float get_resource_retrieval_progress(const NetworkingObjects::NetObjID& id);
|
||||||
float get_resource_retrieval_progress(const ServerClientID& id);
|
|
||||||
|
|
||||||
World& world;
|
World& world;
|
||||||
private:
|
private:
|
||||||
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> serverDownloadProgress;
|
std::unordered_map<NetworkingObjects::NetObjID, std::unique_ptr<ResourceDisplay>> displays;
|
||||||
ServerClientID resourceBeingRetrievedClient = {0, 0};
|
|
||||||
|
|
||||||
std::unordered_map<ServerClientID, ResourceData> resources;
|
std::unordered_map<NetworkingObjects::NetObjID, uint64_t> resourcesBeingRetrieved;
|
||||||
std::unordered_map<ServerClientID, std::unique_ptr<ResourceDisplay>> displays;
|
std::vector<NetworkingObjects::NetObjOwnerPtr<ResourceData>> resourceList;
|
||||||
|
|
||||||
static std::array<const SkCodecs::Decoder, 5> decoders;
|
static std::array<const SkCodecs::Decoder, 5> decoders;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -6,8 +6,6 @@
|
||||||
#include <Helpers/Networking/NetServer.hpp>
|
#include <Helpers/Networking/NetServer.hpp>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
|
||||||
class MainServer;
|
|
||||||
|
|
||||||
class ClientData {
|
class ClientData {
|
||||||
public:
|
public:
|
||||||
CoordSpaceHelper camCoords;
|
CoordSpaceHelper camCoords;
|
||||||
|
|
@ -20,8 +18,6 @@ class ClientData {
|
||||||
|
|
||||||
uint64_t canvasScale = 0;
|
uint64_t canvasScale = 0;
|
||||||
|
|
||||||
ServerClientID pendingResourceID = {0, 0};
|
|
||||||
|
|
||||||
template <typename Archive> void serialize(Archive& a) {
|
template <typename Archive> void serialize(Archive& a) {
|
||||||
a(camCoords, windowSize, cursorPos, cursorColor, displayName);
|
a(camCoords, windowSize, cursorPos, cursorColor, displayName);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,6 @@ MainServer::MainServer(World& initWorld, const std::string& serverLocalID):
|
||||||
world(initWorld)
|
world(initWorld)
|
||||||
{
|
{
|
||||||
data.canvasScale = world.canvasScale;
|
data.canvasScale = world.canvasScale;
|
||||||
data.resources = world.rMan.resource_list();
|
|
||||||
data.canvasBackColor = convert_vec3<Vector3f>(world.canvasTheme.backColor);
|
data.canvasBackColor = convert_vec3<Vector3f>(world.canvasTheme.backColor);
|
||||||
|
|
||||||
lastKeepAliveSent = std::chrono::steady_clock::now();
|
lastKeepAliveSent = std::chrono::steady_clock::now();
|
||||||
|
|
@ -69,9 +68,9 @@ MainServer::MainServer(World& initWorld, const std::string& serverLocalID):
|
||||||
world.drawProg.write_components_server(a);
|
world.drawProg.write_components_server(a);
|
||||||
}
|
}
|
||||||
netServer->send_string_stream_to_client(client, RELIABLE_COMMAND_CHANNEL, ss);
|
netServer->send_string_stream_to_client(client, RELIABLE_COMMAND_CHANNEL, ss);
|
||||||
for(auto& [id, rData] : data.resources) {
|
for(auto& r : world.rMan.resource_list()) {
|
||||||
netServer->send_items_to_client(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_ID, id);
|
netServer->send_items_to_client(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_ID, r.get_net_id());
|
||||||
netServer->send_items_to_client(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_DATA, rData);
|
netServer->send_items_to_client(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_DATA, *r);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
clients.emplace(newClient.serverID, newClient);
|
clients.emplace(newClient.serverID, newClient);
|
||||||
|
|
@ -89,23 +88,6 @@ MainServer::MainServer(World& initWorld, const std::string& serverLocalID):
|
||||||
message(c.cursorPos);
|
message(c.cursorPos);
|
||||||
netServer->send_items_to_all_clients_except(client, UNRELIABLE_COMMAND_CHANNEL, CLIENT_MOVE_SCREEN_MOUSE, c.serverID, c.cursorPos);
|
netServer->send_items_to_all_clients_except(client, UNRELIABLE_COMMAND_CHANNEL, CLIENT_MOVE_SCREEN_MOUSE, c.serverID, c.cursorPos);
|
||||||
});
|
});
|
||||||
netServer->add_recv_callback(SERVER_NEW_RESOURCE_ID, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
|
||||||
auto& c = clients[client->customID];
|
|
||||||
message(c.pendingResourceID);
|
|
||||||
if(c.pendingResourceID == ServerClientID{0, 0})
|
|
||||||
throw std::runtime_error("[MainServer::MainServer] Received a null resource ID");
|
|
||||||
});
|
|
||||||
netServer->add_recv_callback(SERVER_NEW_RESOURCE_DATA, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
|
||||||
ResourceData resourceData;
|
|
||||||
message(resourceData);
|
|
||||||
auto& c = clients[client->customID];
|
|
||||||
if(c.pendingResourceID == ServerClientID{0, 0})
|
|
||||||
throw std::runtime_error("[MainServer::MainServer] Received data for a null resource ID");
|
|
||||||
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_ID, c.pendingResourceID);
|
|
||||||
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_DATA, resourceData);
|
|
||||||
data.resources.emplace(c.pendingResourceID, resourceData);
|
|
||||||
c.pendingResourceID = ServerClientID{0, 0};
|
|
||||||
});
|
|
||||||
netServer->add_recv_callback(SERVER_CHAT_MESSAGE, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
netServer->add_recv_callback(SERVER_CHAT_MESSAGE, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
std::string chatMessage;
|
std::string chatMessage;
|
||||||
message(chatMessage);
|
message(chatMessage);
|
||||||
|
|
@ -182,28 +164,6 @@ void MainServer::update() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> MainServer::resource_download_progress() {
|
|
||||||
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> toRet;
|
|
||||||
|
|
||||||
if(!netServer)
|
|
||||||
return toRet;
|
|
||||||
|
|
||||||
for(auto& [serverID, c] : clients) {
|
|
||||||
if(c.pendingResourceID != ServerClientID{0, 0}) {
|
|
||||||
const std::vector<std::shared_ptr<NetServer::ClientData>>& clientListInNetServer = netServer->get_client_list();
|
|
||||||
auto netClientIt = std::find_if(clientListInNetServer.begin(), clientListInNetServer.end(), [&serverID](auto& nC) {
|
|
||||||
return nC->customID == serverID;
|
|
||||||
});
|
|
||||||
if(netClientIt != clientListInNetServer.end()) {
|
|
||||||
auto& netClient = *netClientIt;
|
|
||||||
toRet.emplace(c.pendingResourceID, netClient->get_progress_into_fragmented_message(RESOURCE_COMMAND_CHANNEL));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return toRet;
|
|
||||||
}
|
|
||||||
|
|
||||||
MainServer::~MainServer() {
|
MainServer::~MainServer() {
|
||||||
//netServer->close_server();
|
//netServer->close_server();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ class DrawComponent;
|
||||||
|
|
||||||
class ServerData {
|
class ServerData {
|
||||||
public:
|
public:
|
||||||
std::unordered_map<ServerClientID, ResourceData> resources;
|
|
||||||
uint64_t canvasScale = 0;
|
uint64_t canvasScale = 0;
|
||||||
Vector3f canvasBackColor;
|
Vector3f canvasBackColor;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
#include <Helpers/VersionNumber.hpp>
|
#include <Helpers/VersionNumber.hpp>
|
||||||
#include <Helpers/NetworkingObjects/NetObjGenericSerializedClass.hpp>
|
#include <Helpers/NetworkingObjects/NetObjGenericSerializedClass.hpp>
|
||||||
#include <Helpers/NetworkingObjects/DelayUpdateSerializedClassManager.hpp>
|
#include <Helpers/NetworkingObjects/DelayUpdateSerializedClassManager.hpp>
|
||||||
|
#include <cereal/types/unordered_map.hpp>
|
||||||
#include "Server/CommandList.hpp"
|
#include "Server/CommandList.hpp"
|
||||||
#include "MainProgram.hpp"
|
#include "MainProgram.hpp"
|
||||||
#include "SharedTypes.hpp"
|
#include "SharedTypes.hpp"
|
||||||
|
|
@ -98,7 +99,11 @@ void World::init_client_callbacks() {
|
||||||
std::string fileDisplayName;
|
std::string fileDisplayName;
|
||||||
CoordSpaceHelper camCoordsToMoveTo;
|
CoordSpaceHelper camCoordsToMoveTo;
|
||||||
Vector2f windowSizeToMoveTo;
|
Vector2f windowSizeToMoveTo;
|
||||||
message(displayName, camCoordsToMoveTo, windowSizeToMoveTo, fileDisplayName, clients);
|
message(displayName);
|
||||||
|
message(camCoordsToMoveTo);
|
||||||
|
message(windowSizeToMoveTo);
|
||||||
|
message(fileDisplayName);
|
||||||
|
message(clients);
|
||||||
set_name(fileDisplayName);
|
set_name(fileDisplayName);
|
||||||
drawData.cam.smooth_move_to(*main.world, camCoordsToMoveTo, windowSizeToMoveTo, true);
|
drawData.cam.smooth_move_to(*main.world, camCoordsToMoveTo, windowSizeToMoveTo, true);
|
||||||
Vector3f newBackColor;
|
Vector3f newBackColor;
|
||||||
|
|
@ -109,7 +114,6 @@ void World::init_client_callbacks() {
|
||||||
gridMan.grids = netObjMan.read_create_message<NetworkingObjects::NetObjOrderedList<WorldGrid>>(message, nullptr);
|
gridMan.grids = netObjMan.read_create_message<NetworkingObjects::NetObjOrderedList<WorldGrid>>(message, nullptr);
|
||||||
drawProg.read_components_client(message);
|
drawProg.read_components_client(message);
|
||||||
}
|
}
|
||||||
nextClientID = get_max_id(ownID);
|
|
||||||
clientStillConnecting = false;
|
clientStillConnecting = false;
|
||||||
});
|
});
|
||||||
con.client_add_recv_callback(CLIENT_USER_CONNECT, [&](cereal::PortableBinaryInputArchive& message) {
|
con.client_add_recv_callback(CLIENT_USER_CONNECT, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
|
|
@ -269,11 +273,6 @@ void World::add_chat_message(const std::string& name, const std::string& message
|
||||||
chatMessages.pop_back();
|
chatMessages.pop_back();
|
||||||
}
|
}
|
||||||
|
|
||||||
ServerClientID World::get_new_id() {
|
|
||||||
nextClientID++;
|
|
||||||
return {ownID, nextClientID};
|
|
||||||
}
|
|
||||||
|
|
||||||
WorldVec World::get_mouse_world_pos() {
|
WorldVec World::get_mouse_world_pos() {
|
||||||
return mousePreviousWorldVec;
|
return mousePreviousWorldVec;
|
||||||
}
|
}
|
||||||
|
|
@ -385,23 +384,15 @@ void World::load_from_file(const std::filesystem::path& filePathToLoadFrom, std:
|
||||||
|
|
||||||
cereal::PortableBinaryInputArchive a(f);
|
cereal::PortableBinaryInputArchive a(f);
|
||||||
load_file(a, fileVersion);
|
load_file(a, fileVersion);
|
||||||
nextClientID = get_max_id(ownID);
|
|
||||||
|
|
||||||
Logger::get().log("USERINFO", "File loaded");
|
Logger::get().log("USERINFO", "File loaded");
|
||||||
set_name(filePath.stem().string());
|
set_name(filePath.stem().string());
|
||||||
}
|
}
|
||||||
|
|
||||||
ClientPortionID World::get_max_id(ServerPortionID serverID) {
|
|
||||||
return rMan.get_max_id(serverID);
|
|
||||||
}
|
|
||||||
|
|
||||||
void World::save_file(cereal::PortableBinaryOutputArchive& a) const {
|
void World::save_file(cereal::PortableBinaryOutputArchive& a) const {
|
||||||
a(drawData.cam.c, main.window.size.cast<float>().eval());
|
a(drawData.cam.c, main.window.size.cast<float>().eval());
|
||||||
a(convert_vec3<Vector3f>(canvasTheme.backColor));
|
a(convert_vec3<Vector3f>(canvasTheme.backColor));
|
||||||
drawProg.save_file(a);
|
drawProg.save_file(a);
|
||||||
//a(bMan);
|
|
||||||
//a(gridMan);
|
|
||||||
rMan.save_strip_unused_resources(a, drawProg.get_used_resources());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::load_file(cereal::PortableBinaryInputArchive& a, VersionNumber version) {
|
void World::load_file(cereal::PortableBinaryInputArchive& a, VersionNumber version) {
|
||||||
|
|
@ -426,7 +417,6 @@ void World::load_file(cereal::PortableBinaryInputArchive& a, VersionNumber versi
|
||||||
//a(bMan);
|
//a(bMan);
|
||||||
//if(version >= VersionNumber(0, 2, 0))
|
//if(version >= VersionNumber(0, 2, 0))
|
||||||
// a(gridMan);
|
// a(gridMan);
|
||||||
a(rMan);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
WorldScalar World::calculate_zoom_from_uniform_zoom(WorldScalar uniformZoom, WorldVec oldWindowSize) {
|
WorldScalar World::calculate_zoom_from_uniform_zoom(WorldScalar uniformZoom, WorldVec oldWindowSize) {
|
||||||
|
|
|
||||||
|
|
@ -68,8 +68,6 @@ class World {
|
||||||
|
|
||||||
WorldScalar calculate_zoom_from_uniform_zoom(WorldScalar uniformZoom, WorldVec oldWindowSize);
|
WorldScalar calculate_zoom_from_uniform_zoom(WorldScalar uniformZoom, WorldVec oldWindowSize);
|
||||||
|
|
||||||
ServerClientID get_new_id();
|
|
||||||
|
|
||||||
void focus_update();
|
void focus_update();
|
||||||
void unfocus_update();
|
void unfocus_update();
|
||||||
|
|
||||||
|
|
@ -111,8 +109,6 @@ class World {
|
||||||
private:
|
private:
|
||||||
void init_net_obj_type_list();
|
void init_net_obj_type_list();
|
||||||
|
|
||||||
ClientPortionID get_max_id(ServerPortionID serverID);
|
|
||||||
|
|
||||||
|
|
||||||
void init_client_callbacks();
|
void init_client_callbacks();
|
||||||
void set_name(const std::string& n);
|
void set_name(const std::string& n);
|
||||||
|
|
@ -126,7 +122,6 @@ class World {
|
||||||
};
|
};
|
||||||
std::optional<SentCameraData> sentCameraData;
|
std::optional<SentCameraData> sentCameraData;
|
||||||
|
|
||||||
ClientPortionID nextClientID = 0;
|
|
||||||
WorldVec mousePreviousWorldVec = {0, 0};
|
WorldVec mousePreviousWorldVec = {0, 0};
|
||||||
WorldVec mouseWorldMove = {0, 0};
|
WorldVec mouseWorldMove = {0, 0};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue