Added back infinite zoom scale up code
This commit is contained in:
parent
108da82fd4
commit
85cc0c2457
26 changed files with 191 additions and 62 deletions
|
|
@ -1,6 +1,7 @@
|
|||
#include "BookmarkListItem.hpp"
|
||||
#include <cereal/types/string.hpp>
|
||||
#include "../World.hpp"
|
||||
#include "../ScaleUpCanvas.hpp"
|
||||
|
||||
using namespace NetworkingObjects;
|
||||
|
||||
|
|
@ -27,6 +28,15 @@ void BookmarkListItem::reassign_netobj_ids_call() {
|
|||
nameData.reassign_ids();
|
||||
}
|
||||
|
||||
void BookmarkListItem::scale_up(const WorldScalar& scaleUpAmount) {
|
||||
if(folderData) {
|
||||
for(auto& i : *folderData->folderList)
|
||||
i.obj->scale_up(scaleUpAmount);
|
||||
}
|
||||
else
|
||||
bookmarkData->coords.inverseScale *= scaleUpAmount;
|
||||
}
|
||||
|
||||
bool BookmarkListItem::is_folder() const {
|
||||
return folderData != nullptr;
|
||||
}
|
||||
|
|
@ -59,12 +69,27 @@ void BookmarkListItem::set_folder_open(bool newIsFolderOpen) {
|
|||
}
|
||||
|
||||
void BookmarkListItem::register_class(World& w) {
|
||||
auto readConstructorData = [&w](const NetworkingObjects::NetObjTemporaryPtr<BookmarkListItem>& o, cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& c) {
|
||||
bool isFolder;
|
||||
a(isFolder);
|
||||
if(isFolder) {
|
||||
o->folderData = std::make_unique<BookmarkFolderData>();
|
||||
o->folderData->folderList = o.get_obj_man()->read_create_message<NetworkingObjects::NetObjOrderedList<BookmarkListItem>>(a, c);
|
||||
}
|
||||
else {
|
||||
o->bookmarkData = std::make_unique<BookmarkData>();
|
||||
a(*o->bookmarkData);
|
||||
}
|
||||
o->nameData = o.get_obj_man()->read_create_message<NameData>(a, c);
|
||||
|
||||
canvas_scale_up_check(*o, w, c);
|
||||
};
|
||||
w.netObjMan.register_class<BookmarkListItem, BookmarkListItem, BookmarkListItem, BookmarkListItem>({
|
||||
.writeConstructorFuncClient = write_constructor_data,
|
||||
.readConstructorFuncClient = read_constructor_data,
|
||||
.readConstructorFuncClient = readConstructorData,
|
||||
.readUpdateFuncClient = nullptr,
|
||||
.writeConstructorFuncServer = write_constructor_data,
|
||||
.readConstructorFuncServer = read_constructor_data,
|
||||
.readConstructorFuncServer = readConstructorData,
|
||||
.readUpdateFuncServer = nullptr
|
||||
});
|
||||
NetworkingObjects::register_ordered_list_class<BookmarkListItem>(w.netObjMan);
|
||||
|
|
@ -79,17 +104,3 @@ void BookmarkListItem::write_constructor_data(const NetObjTemporaryPtr<BookmarkL
|
|||
a(*o->bookmarkData);
|
||||
o->nameData.write_create_message(a);
|
||||
}
|
||||
|
||||
void BookmarkListItem::read_constructor_data(const NetworkingObjects::NetObjTemporaryPtr<BookmarkListItem>& o, cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& c) {
|
||||
bool isFolder;
|
||||
a(isFolder);
|
||||
if(isFolder) {
|
||||
o->folderData = std::make_unique<BookmarkFolderData>();
|
||||
o->folderData->folderList = o.get_obj_man()->read_create_message<NetworkingObjects::NetObjOrderedList<BookmarkListItem>>(a, c);
|
||||
}
|
||||
else {
|
||||
o->bookmarkData = std::make_unique<BookmarkData>();
|
||||
a(*o->bookmarkData);
|
||||
}
|
||||
o->nameData = o.get_obj_man()->read_create_message<NameData>(a, c);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ class BookmarkListItem {
|
|||
const std::string& get_name() const;
|
||||
static void register_class(World& w);
|
||||
void reassign_netobj_ids_call();
|
||||
void scale_up(const WorldScalar& scaleUpAmount);
|
||||
|
||||
void set_name(NetworkingObjects::DelayUpdateSerializedClassManager& delayedNetObjMan, const std::string& newName);
|
||||
private:
|
||||
|
|
@ -40,7 +41,6 @@ class BookmarkListItem {
|
|||
}
|
||||
};
|
||||
static void write_constructor_data(const NetworkingObjects::NetObjTemporaryPtr<BookmarkListItem>& o, cereal::PortableBinaryOutputArchive& a);
|
||||
static void read_constructor_data(const NetworkingObjects::NetObjTemporaryPtr<BookmarkListItem>& o, cereal::PortableBinaryInputArchive& a, const std::shared_ptr<NetServer::ClientData>& c);
|
||||
std::unique_ptr<BookmarkFolderData> folderData;
|
||||
std::unique_ptr<BookmarkData> bookmarkData;
|
||||
NetworkingObjects::NetObjOwnerPtr<NameData> nameData;
|
||||
|
|
|
|||
|
|
@ -198,4 +198,5 @@ NetworkingObjects::NetObjOrderedListIterator<BookmarkListItem> BookmarkManager::
|
|||
}
|
||||
|
||||
void BookmarkManager::scale_up(const WorldScalar& scaleUpAmount) {
|
||||
bookmarkListRoot->scale_up(scaleUpAmount);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue