Fixed issue when inserting objects in client net list
This commit is contained in:
parent
2c9908bcea
commit
92115957b2
6 changed files with 68 additions and 55 deletions
|
|
@ -111,7 +111,11 @@ namespace NetworkingObjects {
|
||||||
virtual bool empty() const = 0;
|
virtual bool empty() const = 0;
|
||||||
virtual ~NetObjOrderedList() {}
|
virtual ~NetObjOrderedList() {}
|
||||||
protected:
|
protected:
|
||||||
virtual NetObjOrderedListIterator<T> insert_single(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, const NetObjOrderedListIterator<T> it, NetObjOwnerPtr<T> newObj) = 0;
|
NetObjOrderedListIterator<T> insert_single(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, const NetObjOrderedListIterator<T> it, NetObjOwnerPtr<T> newObj) {
|
||||||
|
std::vector<std::pair<NetObjOrderedListIterator<T>, NetObjOwnerPtr<T>>> toInsert;
|
||||||
|
toInsert.emplace_back(it, std::move(newObj));
|
||||||
|
return insert_ordered_list(l, clientInserting, toInsert).back();
|
||||||
|
}
|
||||||
virtual std::vector<NetObjOrderedListIterator<T>> insert_ordered_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, std::vector<std::pair<NetObjOrderedListIterator<T>, NetObjOwnerPtr<T>>>& newObj) = 0;
|
virtual std::vector<NetObjOrderedListIterator<T>> insert_ordered_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, std::vector<std::pair<NetObjOrderedListIterator<T>, NetObjOwnerPtr<T>>>& newObj) = 0;
|
||||||
virtual void erase_it_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::vector<NetObjOrderedListIterator<T>>& itList, std::vector<NetObjOwnerPtr<T>>* erasedObjects) = 0;
|
virtual void erase_it_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::vector<NetObjOrderedListIterator<T>>& itList, std::vector<NetObjOwnerPtr<T>>* erasedObjects) = 0;
|
||||||
virtual void write_constructor(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, cereal::PortableBinaryOutputArchive& a) = 0;
|
virtual void write_constructor(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, cereal::PortableBinaryOutputArchive& a) = 0;
|
||||||
|
|
@ -211,29 +215,6 @@ namespace NetworkingObjects {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
protected:
|
protected:
|
||||||
virtual NetObjOrderedListIterator<T> insert_single(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, const NetObjOrderedListIterator<T> it, NetObjOwnerPtr<T> newObj) override {
|
|
||||||
NetworkingObjects::NetObjID idPosition;
|
|
||||||
if(it == data.begin())
|
|
||||||
idPosition = NetworkingObjects::NetObjID{0, 0};
|
|
||||||
else
|
|
||||||
idPosition = std::prev(it)->obj.get_net_id();
|
|
||||||
|
|
||||||
NetObjOrderedListIterator<T> toRet = data.emplace(it, std::move(newObj), it == data.end() ? data.size() : it->pos);
|
|
||||||
idToDataMap.emplace(toRet->obj.get_net_id(), toRet);
|
|
||||||
|
|
||||||
set_position_obj_info_list<T>(toRet, data.end());
|
|
||||||
l.send_server_update_to_all_clients_except(clientInserting, RELIABLE_COMMAND_CHANNEL, [&toRet, &idPosition](const NetObjTemporaryPtr<NetObjOrderedList<T>>&, cereal::PortableBinaryOutputArchive& a) {
|
|
||||||
a(ObjPtrOrderedListCommand_StoC::INSERT_LIST_CONSTRUCT, static_cast<uint32_t>(1));
|
|
||||||
a(idPosition);
|
|
||||||
toRet->obj.write_create_message(a);
|
|
||||||
});
|
|
||||||
l.send_server_update_to_client(clientInserting, RELIABLE_COMMAND_CHANNEL, [&toRet, &idPosition](const NetObjTemporaryPtr<NetObjOrderedList<T>>&, cereal::PortableBinaryOutputArchive& a) {
|
|
||||||
a(ObjPtrOrderedListCommand_StoC::INSERT_LIST_REFERENCE, static_cast<uint32_t>(1));
|
|
||||||
a(idPosition, toRet->obj.get_net_id());
|
|
||||||
});
|
|
||||||
this->call_insert_callback(toRet);
|
|
||||||
return toRet;
|
|
||||||
}
|
|
||||||
virtual std::vector<NetObjOrderedListIterator<T>> insert_ordered_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, std::vector<std::pair<NetObjOrderedListIterator<T>, NetObjOwnerPtr<T>>>& newObjs) override {
|
virtual std::vector<NetObjOrderedListIterator<T>> insert_ordered_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, std::vector<std::pair<NetObjOrderedListIterator<T>, NetObjOwnerPtr<T>>>& newObjs) override {
|
||||||
if(newObjs.empty())
|
if(newObjs.empty())
|
||||||
return {};
|
return {};
|
||||||
|
|
@ -431,20 +412,6 @@ namespace NetworkingObjects {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
protected:
|
protected:
|
||||||
virtual NetObjOrderedListIterator<T> insert_single(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, const NetObjOrderedListIterator<T> it, NetObjOwnerPtr<T> newObj) override {
|
|
||||||
NetObjOrderedListIterator<T> toRet = clientData.emplace(it, std::move(newObj), it == clientData.end() ? clientData.size() : it->pos);
|
|
||||||
clientIdToDataMap.emplace(toRet->obj.get_net_id(), toRet);
|
|
||||||
|
|
||||||
set_position_obj_info_list<T>(toRet, clientData.end());
|
|
||||||
l.send_server_update_to_all_clients_except(clientInserting, RELIABLE_COMMAND_CHANNEL, [&toRet](const NetObjTemporaryPtr<NetObjOrderedList<T>>&, cereal::PortableBinaryOutputArchive& a) {
|
|
||||||
a(ObjPtrOrderedListCommand_CtoS::INSERT_LIST, static_cast<uint32_t>(1));
|
|
||||||
a(toRet->pos);
|
|
||||||
toRet->obj.write_create_message(a);
|
|
||||||
});
|
|
||||||
|
|
||||||
this->call_insert_callback(toRet);
|
|
||||||
return toRet;
|
|
||||||
}
|
|
||||||
virtual std::vector<NetObjOrderedListIterator<T>> insert_ordered_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, std::vector<std::pair<NetObjOrderedListIterator<T>, NetObjOwnerPtr<T>>>& newObjs) override {
|
virtual std::vector<NetObjOrderedListIterator<T>> insert_ordered_list(const NetObjTemporaryPtr<NetObjOrderedList<T>>& l, const std::shared_ptr<NetServer::ClientData>& clientInserting, std::vector<std::pair<NetObjOrderedListIterator<T>, NetObjOwnerPtr<T>>>& newObjs) override {
|
||||||
if(newObjs.empty())
|
if(newObjs.empty())
|
||||||
return {};
|
return {};
|
||||||
|
|
|
||||||
|
|
@ -151,7 +151,7 @@ void GridModifyTool::tool_update() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GridModifyTool::prevent_undo_or_redo() {
|
bool GridModifyTool::prevent_undo_or_redo() {
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GridModifyTool::draw(SkCanvas* canvas, const DrawData& drawData) {
|
void GridModifyTool::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,9 @@ void GridManager::add_default_grid(const std::string& newName) {
|
||||||
gridData(initGridData),
|
gridData(initGridData),
|
||||||
undoID(initUndoID)
|
undoID(initUndoID)
|
||||||
{}
|
{}
|
||||||
|
const char* get_name() const override {
|
||||||
|
return "Add Grid";
|
||||||
|
}
|
||||||
bool undo(WorldUndoManager& undoMan) override {
|
bool undo(WorldUndoManager& undoMan) override {
|
||||||
std::optional<NetworkingObjects::NetObjID> toEraseID = undoMan.get_netid_from_undoid(undoID);
|
std::optional<NetworkingObjects::NetObjID> toEraseID = undoMan.get_netid_from_undoid(undoID);
|
||||||
if(!toEraseID.has_value())
|
if(!toEraseID.has_value())
|
||||||
|
|
@ -64,6 +67,9 @@ void GridManager::remove_grid(uint32_t indexToRemove) {
|
||||||
gridData(initGridData),
|
gridData(initGridData),
|
||||||
undoID(initUndoID)
|
undoID(initUndoID)
|
||||||
{}
|
{}
|
||||||
|
const char* get_name() const override {
|
||||||
|
return "Remove Grid";
|
||||||
|
}
|
||||||
bool undo(WorldUndoManager& undoMan) override {
|
bool undo(WorldUndoManager& undoMan) override {
|
||||||
std::optional<NetworkingObjects::NetObjID> toInsertID = undoMan.get_netid_from_undoid(undoID);
|
std::optional<NetworkingObjects::NetObjID> toInsertID = undoMan.get_netid_from_undoid(undoID);
|
||||||
if(toInsertID.has_value())
|
if(toInsertID.has_value())
|
||||||
|
|
@ -104,6 +110,9 @@ void GridManager::finalize_grid_modify(const NetworkingObjects::NetObjTemporaryP
|
||||||
gridDataNew(initGridDataNew),
|
gridDataNew(initGridDataNew),
|
||||||
undoID(initUndoID)
|
undoID(initUndoID)
|
||||||
{}
|
{}
|
||||||
|
const char* get_name() const override {
|
||||||
|
return "Modify Grid";
|
||||||
|
}
|
||||||
bool undo(WorldUndoManager& undoMan) override {
|
bool undo(WorldUndoManager& undoMan) override {
|
||||||
std::optional<NetworkingObjects::NetObjID> toModifyID = undoMan.get_netid_from_undoid(undoID);
|
std::optional<NetworkingObjects::NetObjID> toModifyID = undoMan.get_netid_from_undoid(undoID);
|
||||||
if(!toModifyID.has_value())
|
if(!toModifyID.has_value())
|
||||||
|
|
|
||||||
|
|
@ -1216,6 +1216,31 @@ bool Toolbar::color_palette(const std::string& id, Vector4f* color, bool& hoveri
|
||||||
}
|
}
|
||||||
|
|
||||||
void Toolbar::performance_metrics() {
|
void Toolbar::performance_metrics() {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.padding = CLAY_PADDING_ALL(io->theme->padding1),
|
||||||
|
.childGap = io->theme->childGap1,
|
||||||
|
.childAlignment = { .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_BOTTOM},
|
||||||
|
.layoutDirection = CLAY_LEFT_TO_RIGHT
|
||||||
|
},
|
||||||
|
.floating = {.offset = {-10, -10}, .attachPoints = {.element = CLAY_ATTACH_POINT_RIGHT_BOTTOM, .parent = CLAY_ATTACH_POINT_RIGHT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
|
}) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
.padding = CLAY_PADDING_ALL(io->theme->padding1),
|
||||||
|
.childGap = io->theme->childGap1,
|
||||||
|
.childAlignment = { .x = CLAY_ALIGN_X_RIGHT, .y = CLAY_ALIGN_Y_TOP},
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(io->theme->backColor1),
|
||||||
|
}) {
|
||||||
|
gui.text_label("Undo queue");
|
||||||
|
std::vector<const char*> undoList = main.world->undo.get_front_undo_queue_names(10);
|
||||||
|
for(const char* u : undoList)
|
||||||
|
gui.text_label(u);
|
||||||
|
}
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
.sizing = {.width = CLAY_SIZING_FIT(0), .height = CLAY_SIZING_FIT(0) },
|
||||||
|
|
@ -1225,7 +1250,6 @@ void Toolbar::performance_metrics() {
|
||||||
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
},
|
},
|
||||||
.backgroundColor = convert_vec4<Clay_Color>(io->theme->backColor1),
|
.backgroundColor = convert_vec4<Clay_Color>(io->theme->backColor1),
|
||||||
.floating = {.offset = {-10, -10}, .attachPoints = {.element = CLAY_ATTACH_POINT_RIGHT_BOTTOM, .parent = CLAY_ATTACH_POINT_RIGHT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
|
||||||
}) {
|
}) {
|
||||||
std::stringstream a;
|
std::stringstream a;
|
||||||
a << "FPS: " << std::fixed << std::setprecision(0) << (1.0 / main.deltaTime);
|
a << "FPS: " << std::fixed << std::setprecision(0) << (1.0 / main.deltaTime);
|
||||||
|
|
@ -1242,6 +1266,7 @@ void Toolbar::performance_metrics() {
|
||||||
gui.text_label(d.str());
|
gui.text_label(d.str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void Toolbar::player_list() {
|
void Toolbar::player_list() {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
|
|
|
||||||
|
|
@ -122,3 +122,13 @@ std::optional<NetworkingObjects::NetObjID> WorldUndoManager::get_netid_from_undo
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
return it->second;
|
return it->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::vector<const char*> WorldUndoManager::get_front_undo_queue_names(unsigned count) {
|
||||||
|
std::vector<const char*> toRet;
|
||||||
|
for(auto& u : undoQueue | std::views::reverse) {
|
||||||
|
toRet.emplace_back(u->get_name());
|
||||||
|
if(toRet.size() == count)
|
||||||
|
return toRet;
|
||||||
|
}
|
||||||
|
return toRet;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ class WorldUndoManager;
|
||||||
|
|
||||||
class WorldUndoAction {
|
class WorldUndoAction {
|
||||||
public:
|
public:
|
||||||
|
virtual const char* get_name() const = 0;
|
||||||
virtual bool undo(WorldUndoManager& undoMan) = 0;
|
virtual bool undo(WorldUndoManager& undoMan) = 0;
|
||||||
virtual bool redo(WorldUndoManager& undoMan) = 0;
|
virtual bool redo(WorldUndoManager& undoMan) = 0;
|
||||||
virtual void scale_up(const WorldScalar& scaleAmount);
|
virtual void scale_up(const WorldScalar& scaleAmount);
|
||||||
|
|
@ -34,6 +35,7 @@ class WorldUndoManager {
|
||||||
UndoObjectID get_undoid_from_netid(const NetworkingObjects::NetObjID& netObjID);
|
UndoObjectID get_undoid_from_netid(const NetworkingObjects::NetObjID& netObjID);
|
||||||
void register_new_netid_to_existing_undoid(UndoObjectID existingUndoID, const NetworkingObjects::NetObjID& netObjID);
|
void register_new_netid_to_existing_undoid(UndoObjectID existingUndoID, const NetworkingObjects::NetObjID& netObjID);
|
||||||
std::optional<NetworkingObjects::NetObjID> get_netid_from_undoid(UndoObjectID undoID);
|
std::optional<NetworkingObjects::NetObjID> get_netid_from_undoid(UndoObjectID undoID);
|
||||||
|
std::vector<const char*> get_front_undo_queue_names(unsigned count);
|
||||||
|
|
||||||
World& world;
|
World& world;
|
||||||
private:
|
private:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue