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

Same make_obj call allocates the correct type

Browse source
This commit is contained in:
Yousef Khadadeh 2025-12-08 20:51:11 +03:00
parent 5d24b34200
commit d9a90dda16
10 changed files with 53 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/World.hpp
View file

@ -1,4 +1,5 @@
#pragma once
#include "Helpers/NetworkingObjects/NetObjOrderedList.hpp"
#include "UndoManager.hpp"
#include "BookmarkManager.hpp"
#include "ResourceManager.hpp"
@ -7,6 +8,7 @@
#include "Toolbar.hpp"
#include "SharedTypes.hpp"
#include "GridManager.hpp"
#include <Helpers/NetworkingObjects/NetObjManager.hpp>
#include <filesystem>
class MainProgram;
@ -45,6 +47,7 @@ class World {
BookmarkManager bMan;
ConnectionManager con;
GridManager gridMan;
NetworkingObjects::NetObjManager netObjMan;
std::deque<Toolbar::ChatMessage> chatMessages;
@ -88,6 +91,8 @@ class World {
std::string name;
std::unordered_map<ServerPortionID, ClientData> clients;
NetworkingObjects::NetObjPtr<NetworkingObjects::NetObjOrderedList<std::string>> stringListTest;
void set_canvas_background_color(const Vector3f& newBackColor, bool sendChangeOverNetwork = true);
struct CanvasTheme {
@ -100,6 +105,7 @@ class World {
uint64_t canvasScale = 0;
private:
ClientPortionID get_max_id(ServerPortionID serverID);
void init_client_callbacks();