Added generic delayed update objects

src/BookmarkManager.cpp

@@ -12,12 +12,14 @@ void Bookmark::scale_up(const WorldScalar& scaleUpAmount) {
 
 BookmarkManager::BookmarkManager(World& w):
     world(w)
-{
+{}
+
+void BookmarkManager::init() {
     // NOTE: Should find a way for bookmarks added from the network to take into account the client's canvasScale
     // Have the canvasScale variable come with the ClientData object, and the grid scale commands can be part of 
     // the client data class
-    if(w.netObjMan.is_server())
-        bookmarks = w.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<Bookmark>>();
+    if(world.netObjMan.is_server())
+        bookmarks = world.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<Bookmark>>();
 }
 
 void BookmarkManager::add_bookmark(const std::string& name) {

src/BookmarkManager.hpp

@@ -20,6 +20,7 @@ class World;
 class BookmarkManager {
     public:
         BookmarkManager(World& w);
+        void init();
         void add_bookmark(const std::string& name);
         void remove_bookmark(uint32_t bookmarkIndex);
         void jump_to_bookmark(uint32_t bookmarkIndex);

src/DrawingProgram/DrawingProgram.cpp

@@ -20,7 +20,6 @@
 #include "../World.hpp"
 #include "../MainProgram.hpp"
 #include "Helpers/FileDownloader.hpp"
-#include "Helpers/NetworkingObjects/NetObjWeakPtr.hpp"
 #include "Helpers/StringHelpers.hpp"
 #include "LassoSelectTool.hpp"
 #include <Helpers/Logger.hpp>

src/DrawingProgram/GridModifyTool.cpp

@@ -2,6 +2,7 @@
 #include "DrawingProgram.hpp"
 #include "../MainProgram.hpp"
 #include "../DrawData.hpp"
+#include "Helpers/Networking/NetLibrary.hpp"
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
 #include <Helpers/NetworkingObjects/NetObjGenericSerializedClass.hpp>
 #include <cstddef>
@@ -136,6 +137,7 @@ void GridModifyTool::tool_update() {
                     selectionMode = 0;
                 break;
         }
+        drawP.world.delayedUpdateObjectManager.send_update_to_all<WorldGrid>(grid);
     }
     else
         selectionMode = 0;

src/GridManager.cpp

@@ -7,9 +7,11 @@
 #include <algorithm>
 
 GridManager::GridManager(World& w):
-    world(w) {
-    if(w.netObjMan.is_server())
-        grids = w.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<WorldGrid>>();
+    world(w) {}
+
+void GridManager::init() {
+    if(world.netObjMan.is_server())
+        grids = world.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<WorldGrid>>();
 }
 
 void GridManager::add_default_grid(const std::string& newName) {

src/GridManager.hpp

@@ -8,6 +8,7 @@ class World;
 class GridManager {
     public:
         GridManager(World& w);
+        void init();
 
         void add_default_grid(const std::string& newName);
 

src/MainProgram.cpp

@@ -45,14 +45,6 @@ MainProgram::MainProgram():
     fonts(std::make_shared<FontData>()),
     toolbar(*this)
 {
-    netObjectTypeList = std::make_shared<NetworkingObjects::NetObjManagerTypeList>();
-    NetworkingObjects::register_generic_serialized_class<std::string>(*netObjectTypeList);
-    NetworkingObjects::register_ordered_list_class<std::string>(*netObjectTypeList);
-    NetworkingObjects::register_generic_serialized_class<Bookmark>(*netObjectTypeList);
-    NetworkingObjects::register_ordered_list_class<Bookmark>(*netObjectTypeList);
-    NetworkingObjects::register_generic_serialized_class<WorldGrid>(*netObjectTypeList);
-    NetworkingObjects::register_ordered_list_class<WorldGrid>(*netObjectTypeList);
-
     displayName = Random::get().alphanumeric_str(10);
 
     Logger::get().add_log("WORLDFATAL", [&](const std::string& text) {

src/MainProgram.hpp

@@ -9,7 +9,6 @@
 #include "SharedTypes.hpp"
 #include <Eigen/Dense>
 #include <include/core/SkSurfaceProps.h>
-#include <Helpers/NetworkingObjects/NetObjManagerTypeList.hpp>
 #include "Toolbar.hpp"
 #include "World.hpp"
 
@@ -116,8 +115,6 @@ class MainProgram {
 
         std::string displayName;
 
-        std::shared_ptr<NetworkingObjects::NetObjManagerTypeList> netObjectTypeList;
-
         ~MainProgram();
     private:
         void new_tab_open();

src/World.cpp

@@ -1,10 +1,13 @@
 #include "World.hpp"
 #include "DrawComponents/DrawComponent.hpp"
-#include "Helpers/HsvRgb.hpp"
-#include "Helpers/MathExtras.hpp"
-#include "Helpers/Networking/ByteStream.hpp"
-#include "Helpers/NetworkingObjects/NetObjManager.hpp"
-#include "Helpers/VersionNumber.hpp"
+#include <Helpers/HsvRgb.hpp>
+#include <Helpers/MathExtras.hpp>
+#include <Helpers/Networking/ByteStream.hpp>
+#include <Helpers/NetworkingObjects/NetObjManager.hpp>
+#include <Helpers/NetworkingObjects/NetObjManagerTypeList.hpp>
+#include <Helpers/VersionNumber.hpp>
+#include <Helpers/NetworkingObjects/NetObjGenericSerializedClass.hpp>
+#include <Helpers/NetworkingObjects/DelayUpdateSerializedClassManager.hpp>
 #include "Server/CommandList.hpp"
 #include "MainProgram.hpp"
 #include "SharedTypes.hpp"
@@ -27,13 +30,18 @@
 #endif
 
 World::World(MainProgram& initMain, OpenWorldInfo& worldInfo):
-    netObjMan(initMain.netObjectTypeList, worldInfo.conType != CONNECTIONTYPE_CLIENT),
+    netObjectTypeList(std::make_shared<NetworkingObjects::NetObjManagerTypeList>()),
+    netObjMan(netObjectTypeList, worldInfo.conType != CONNECTIONTYPE_CLIENT),
     main(initMain),
     rMan(*this),
     drawProg(*this),
     bMan(*this),
     gridMan(*this)
 {
+    init_net_obj_type_list();
+    gridMan.init();
+    bMan.init();
+
     set_canvas_background_color(main.defaultCanvasBackgroundColor);
     displayName = main.displayName;
 
@@ -70,6 +78,13 @@ World::World(MainProgram& initMain, OpenWorldInfo& worldInfo):
     con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_INITIAL_DATA, displayName, false);
 }
 
+void World::init_net_obj_type_list() {
+    NetworkingObjects::register_generic_serialized_class<Bookmark>(*netObjectTypeList);
+    NetworkingObjects::register_ordered_list_class<Bookmark>(*netObjectTypeList);
+    delayedUpdateObjectManager.register_class<WorldGrid>(*netObjectTypeList);
+    NetworkingObjects::register_ordered_list_class<WorldGrid>(*netObjectTypeList);
+}
+
 void World::init_client_callbacks() {
     con.client_add_recv_callback(CLIENT_INITIAL_DATA, [&](cereal::PortableBinaryInputArchive& message) {
         bool isDirectConnect;
@@ -171,6 +186,7 @@ void World::focus_update() {
     }
 
     if(!clientStillConnecting) {
+        delayedUpdateObjectManager.update();
         constexpr float SECONDS_TO_SEND_CAMERA_DATA = 0.5f;
         timeToSendCameraData.update_time_since();
         if(timeToSendCameraData.get_time_since() > SECONDS_TO_SEND_CAMERA_DATA) {

src/World.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include "Helpers/NetworkingObjects/DelayUpdateSerializedClassManager.hpp"
 #include "Helpers/NetworkingObjects/NetObjOrderedList.hpp"
 #include "UndoManager.hpp"
 #include "BookmarkManager.hpp"
@@ -36,6 +37,7 @@ class World {
 
         World(MainProgram& initMain, OpenWorldInfo& worldInfo);
 
+        std::shared_ptr<NetworkingObjects::NetObjManagerTypeList> netObjectTypeList;
         // NOTE: Keep at the very beginning so that it's destroyed last
         NetworkingObjects::NetObjManager netObjMan;
 
@@ -106,10 +108,13 @@ class World {
         uint64_t canvasScale = 0;
 
         bool setToDestroy = false;
+        NetworkingObjects::DelayUpdateSerializedClassManager delayedUpdateObjectManager;
     private:
+        void init_net_obj_type_list();
 
         ClientPortionID get_max_id(ServerPortionID serverID);
 
+
         void init_client_callbacks();
         void set_name(const std::string& n);