Added layer menu and layer list
This commit is contained in:
parent
a29c5dc926
commit
c9aba47db1
19 changed files with 435 additions and 3 deletions
|
|
@ -80,7 +80,11 @@ set(sources "src/main.cpp"
|
||||||
"src/DrawingProgram/EllipseDrawEditTool.cpp"
|
"src/DrawingProgram/EllipseDrawEditTool.cpp"
|
||||||
"src/DrawingProgram/RectDrawEditTool.cpp"
|
"src/DrawingProgram/RectDrawEditTool.cpp"
|
||||||
"src/DrawingProgram/TextBoxEditTool.cpp"
|
"src/DrawingProgram/TextBoxEditTool.cpp"
|
||||||
|
"src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp"
|
||||||
|
"src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp"
|
||||||
"src/DrawingProgram/Layers/DrawingProgramLayerListItem.cpp"
|
"src/DrawingProgram/Layers/DrawingProgramLayerListItem.cpp"
|
||||||
|
"src/DrawingProgram/Layers/DrawingProgramLayerFolder.cpp"
|
||||||
|
"src/DrawingProgram/Layers/DrawingProgramLayer.cpp"
|
||||||
"src/CanvasComponents/CanvasComponentContainer.cpp"
|
"src/CanvasComponents/CanvasComponentContainer.cpp"
|
||||||
"src/CanvasComponents/CanvasComponentAllocator.cpp"
|
"src/CanvasComponents/CanvasComponentAllocator.cpp"
|
||||||
"src/CanvasComponents/BrushStrokeCanvasComponent.cpp"
|
"src/CanvasComponents/BrushStrokeCanvasComponent.cpp"
|
||||||
|
|
|
||||||
87
data/icons/layer.svg
Normal file
87
data/icons/layer.svg
Normal file
|
|
@ -0,0 +1,87 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
width="32"
|
||||||
|
height="32"
|
||||||
|
viewBox="0 0 8.4666666 8.4666666"
|
||||||
|
version="1.1"
|
||||||
|
id="svg1"
|
||||||
|
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
|
||||||
|
sodipodi:docname="layer.svg"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg">
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="namedview1"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#000000"
|
||||||
|
borderopacity="0.25"
|
||||||
|
inkscape:showpageshadow="2"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pagecheckerboard="0"
|
||||||
|
inkscape:deskcolor="#d1d1d1"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
showgrid="true"
|
||||||
|
inkscape:zoom="23.020096"
|
||||||
|
inkscape:cx="4.2788701"
|
||||||
|
inkscape:cy="15.768831"
|
||||||
|
inkscape:window-width="3440"
|
||||||
|
inkscape:window-height="1354"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="0"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:current-layer="layer1">
|
||||||
|
<inkscape:grid
|
||||||
|
id="grid1"
|
||||||
|
units="px"
|
||||||
|
originx="0"
|
||||||
|
originy="0"
|
||||||
|
spacingx="0.26458333"
|
||||||
|
spacingy="0.26458333"
|
||||||
|
empcolor="#0099e5"
|
||||||
|
empopacity="0.30196078"
|
||||||
|
color="#0099e5"
|
||||||
|
opacity="0.14901961"
|
||||||
|
empspacing="5"
|
||||||
|
enabled="true"
|
||||||
|
visible="true"
|
||||||
|
dotted="true" />
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<defs
|
||||||
|
id="defs1" />
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1">
|
||||||
|
<path
|
||||||
|
style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.66145833;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
|
||||||
|
d="m 4.233333,0.79374996 3.175,1.58749994 -3.175,1.5874998 -3.1749997,-1.5874998 z"
|
||||||
|
id="path1" />
|
||||||
|
<path
|
||||||
|
style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.66145833;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
|
||||||
|
d="m 1.0583333,4.233333 3.1749997,1.5875 3.175,-1.5875"
|
||||||
|
id="path2" />
|
||||||
|
<path
|
||||||
|
style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.66145833;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
|
||||||
|
d="m 1.0583333,6.0854163 3.1749997,1.5875 3.175,-1.5875"
|
||||||
|
id="path3" />
|
||||||
|
<path
|
||||||
|
style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.66145833;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
|
||||||
|
d="M 1.0583333,4.233333 2.6458332,3.439583"
|
||||||
|
id="path4" />
|
||||||
|
<path
|
||||||
|
style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.66145833;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
|
||||||
|
d="m 7.408333,4.233333 -1.5875,-0.79375"
|
||||||
|
id="path5" />
|
||||||
|
<path
|
||||||
|
style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.66145833;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
|
||||||
|
d="m 1.0583333,6.0854163 1.5874999,-0.79375"
|
||||||
|
id="path6" />
|
||||||
|
<path
|
||||||
|
style="opacity:1;fill:none;fill-opacity:0;stroke:#000000;stroke-width:0.66145833;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
|
||||||
|
d="m 7.408333,6.0854163 -1.5875,-0.79375"
|
||||||
|
id="path7" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 3.2 KiB |
|
|
@ -68,6 +68,7 @@ void BookmarkManager::setup_list_gui(const std::string& id) {
|
||||||
},
|
},
|
||||||
.drawObjGUI = [&](const GUIStuff::TreeListing::ParentObjectIDPair& idPair) {
|
.drawObjGUI = [&](const GUIStuff::TreeListing::ParentObjectIDPair& idPair) {
|
||||||
auto tempPtr = world.netObjMan.get_obj_temporary_ref_from_id<BookmarkListItem>(idPair.object);
|
auto tempPtr = world.netObjMan.get_obj_temporary_ref_from_id<BookmarkListItem>(idPair.object);
|
||||||
|
bool isButtonClicked = false;
|
||||||
if(Clay_Hovered() && gui.io->mouse.leftClick >= 2 && !tempPtr->is_folder() && selectionData.objsSelected.contains(idPair.object) && !gui.io->key.leftCtrl && !gui.io->key.leftShift)
|
if(Clay_Hovered() && gui.io->mouse.leftClick >= 2 && !tempPtr->is_folder() && selectionData.objsSelected.contains(idPair.object) && !gui.io->key.leftCtrl && !gui.io->key.leftShift)
|
||||||
tempPtr->get_bookmark_data().jump_to(world);
|
tempPtr->get_bookmark_data().jump_to(world);
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
|
|
@ -80,14 +81,14 @@ void BookmarkManager::setup_list_gui(const std::string& id) {
|
||||||
}
|
}
|
||||||
if(!tempPtr->is_folder() && gui.svg_icon_button_transparent("jump button", "data/icons/jump.svg", false, GUIStuff::TreeListing::ENTRY_HEIGHT)) {
|
if(!tempPtr->is_folder() && gui.svg_icon_button_transparent("jump button", "data/icons/jump.svg", false, GUIStuff::TreeListing::ENTRY_HEIGHT)) {
|
||||||
tempPtr->get_bookmark_data().jump_to(world);
|
tempPtr->get_bookmark_data().jump_to(world);
|
||||||
return true;
|
isButtonClicked = true;
|
||||||
}
|
}
|
||||||
if(gui.svg_icon_button_transparent("delete button", "data/icons/trash.svg", false, GUIStuff::TreeListing::ENTRY_HEIGHT)) {
|
if(gui.svg_icon_button_transparent("delete button", "data/icons/trash.svg", false, GUIStuff::TreeListing::ENTRY_HEIGHT)) {
|
||||||
toDeleteParent = idPair.parent;
|
toDeleteParent = idPair.parent;
|
||||||
toDeleteObject = idPair.object;
|
toDeleteObject = idPair.object;
|
||||||
return true;
|
isButtonClicked = true;
|
||||||
}
|
}
|
||||||
return false;
|
return isButtonClicked;
|
||||||
},
|
},
|
||||||
.moveObjectsToListAtIndex = [&](NetObjID listObj, size_t index, const std::vector<GUIStuff::TreeListing::ParentObjectIDPair>& objsToInsert) {
|
.moveObjectsToListAtIndex = [&](NetObjID listObj, size_t index, const std::vector<GUIStuff::TreeListing::ParentObjectIDPair>& objsToInsert) {
|
||||||
world.netObjMan.send_multi_update_messsage([&]() {
|
world.netObjMan.send_multi_update_messsage([&]() {
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@
|
||||||
DrawingProgram::DrawingProgram(World& initWorld):
|
DrawingProgram::DrawingProgram(World& initWorld):
|
||||||
world(initWorld),
|
world(initWorld),
|
||||||
compCache(*this),
|
compCache(*this),
|
||||||
|
layerMan(*this),
|
||||||
selection(*this)
|
selection(*this)
|
||||||
{
|
{
|
||||||
drawTool = DrawingProgramToolBase::allocate_tool_type(*this, DrawingProgramToolType::BRUSH);
|
drawTool = DrawingProgramToolBase::allocate_tool_type(*this, DrawingProgramToolType::BRUSH);
|
||||||
|
|
@ -43,6 +44,7 @@ void DrawingProgram::init() {
|
||||||
components = world.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<CanvasComponentContainer>>();
|
components = world.netObjMan.make_obj<NetworkingObjects::NetObjOrderedList<CanvasComponentContainer>>();
|
||||||
set_component_list_callbacks();
|
set_component_list_callbacks();
|
||||||
}
|
}
|
||||||
|
layerMan.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawingProgram::set_component_list_callbacks() {
|
void DrawingProgram::set_component_list_callbacks() {
|
||||||
|
|
@ -93,6 +95,7 @@ void DrawingProgram::clear_draw_cache() {
|
||||||
|
|
||||||
void DrawingProgram::write_components_server(cereal::PortableBinaryOutputArchive& a) {
|
void DrawingProgram::write_components_server(cereal::PortableBinaryOutputArchive& a) {
|
||||||
components.write_create_message(a);
|
components.write_create_message(a);
|
||||||
|
layerMan.write_components_server(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawingProgram::read_components_client(cereal::PortableBinaryInputArchive& a) {
|
void DrawingProgram::read_components_client(cereal::PortableBinaryInputArchive& a) {
|
||||||
|
|
@ -102,6 +105,7 @@ void DrawingProgram::read_components_client(cereal::PortableBinaryInputArchive&
|
||||||
});
|
});
|
||||||
compCache.test_rebuild(components->get_data(), true);
|
compCache.test_rebuild(components->get_data(), true);
|
||||||
set_component_list_callbacks();
|
set_component_list_callbacks();
|
||||||
|
layerMan.read_components_client(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawingProgram::toolbar_gui() {
|
void DrawingProgram::toolbar_gui() {
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@
|
||||||
#include "DrawingProgramToolBase.hpp"
|
#include "DrawingProgramToolBase.hpp"
|
||||||
#include <Helpers/FileDownloader.hpp>
|
#include <Helpers/FileDownloader.hpp>
|
||||||
#include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
|
#include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
|
||||||
|
#include "Layers/DrawingProgramLayerManager.hpp"
|
||||||
|
|
||||||
class World;
|
class World;
|
||||||
|
|
||||||
|
|
@ -49,6 +50,7 @@ class DrawingProgram {
|
||||||
|
|
||||||
DrawingProgramCache compCache;
|
DrawingProgramCache compCache;
|
||||||
|
|
||||||
|
DrawingProgramLayerManager layerMan;
|
||||||
CanvasComponentContainer::NetListOwnerPtr components;
|
CanvasComponentContainer::NetListOwnerPtr components;
|
||||||
|
|
||||||
Vector4f* get_foreground_color_ptr();
|
Vector4f* get_foreground_color_ptr();
|
||||||
|
|
|
||||||
6
src/DrawingProgram/Layers/DrawingProgramLayer.cpp
Normal file
6
src/DrawingProgram/Layers/DrawingProgramLayer.cpp
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
#include "DrawingProgramLayer.hpp"
|
||||||
|
|
||||||
|
void DrawingProgramLayer::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
|
for(auto& p : components->get_data())
|
||||||
|
p->obj->draw(canvas, drawData);
|
||||||
|
}
|
||||||
|
|
@ -6,5 +6,7 @@ class DrawingProgramLayerListItem;
|
||||||
|
|
||||||
class DrawingProgramLayer {
|
class DrawingProgramLayer {
|
||||||
public:
|
public:
|
||||||
|
void draw(SkCanvas* canvas, const DrawData& drawData);
|
||||||
|
|
||||||
CanvasComponentContainer::NetListOwnerPtr components;
|
CanvasComponentContainer::NetListOwnerPtr components;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
7
src/DrawingProgram/Layers/DrawingProgramLayerFolder.cpp
Normal file
7
src/DrawingProgram/Layers/DrawingProgramLayerFolder.cpp
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
#include "DrawingProgramLayerFolder.hpp"
|
||||||
|
#include "DrawingProgramLayerListItem.hpp"
|
||||||
|
|
||||||
|
void DrawingProgramLayerFolder::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
|
for(auto& p : folderList->get_data())
|
||||||
|
p->obj->draw(canvas, drawData);
|
||||||
|
}
|
||||||
|
|
@ -1,10 +1,14 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
|
#include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
|
||||||
|
#include <include/core/SkCanvas.h>
|
||||||
|
#include "../../DrawData.hpp"
|
||||||
|
|
||||||
class DrawingProgramLayerListItem;
|
class DrawingProgramLayerListItem;
|
||||||
|
|
||||||
class DrawingProgramLayerFolder {
|
class DrawingProgramLayerFolder {
|
||||||
public:
|
public:
|
||||||
|
void draw(SkCanvas* canvas, const DrawData& drawData);
|
||||||
|
|
||||||
NetworkingObjects::NetObjOwnerPtr<NetworkingObjects::NetObjOrderedList<DrawingProgramLayerListItem>> folderList;
|
NetworkingObjects::NetObjOwnerPtr<NetworkingObjects::NetObjOrderedList<DrawingProgramLayerListItem>> folderList;
|
||||||
bool isFolderOpen = false;
|
bool isFolderOpen = false;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,17 @@ DrawingProgramLayer& DrawingProgramLayerListItem::get_layer() const {
|
||||||
return *layerData;
|
return *layerData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DrawingProgramLayerListItem::draw(SkCanvas* canvas, const DrawData& drawData) const {
|
||||||
|
if(displayData->visible) {
|
||||||
|
canvas->saveLayerAlphaf(nullptr, displayData->alpha);
|
||||||
|
if(folderData)
|
||||||
|
folderData->draw(canvas, drawData);
|
||||||
|
else
|
||||||
|
layerData->draw(canvas, drawData);
|
||||||
|
canvas->restore();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void DrawingProgramLayerListItem::set_name(NetworkingObjects::DelayUpdateSerializedClassManager& delayedNetObjMan, const std::string& newName) const {
|
void DrawingProgramLayerListItem::set_name(NetworkingObjects::DelayUpdateSerializedClassManager& delayedNetObjMan, const std::string& newName) const {
|
||||||
if(nameData && nameData->name != newName) {
|
if(nameData && nameData->name != newName) {
|
||||||
nameData->name = newName;
|
nameData->name = newName;
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@ class DrawingProgramLayerListItem {
|
||||||
DrawingProgramLayer& get_layer() const;
|
DrawingProgramLayer& get_layer() const;
|
||||||
static void register_class(World& w);
|
static void register_class(World& w);
|
||||||
void reassign_netobj_ids_call();
|
void reassign_netobj_ids_call();
|
||||||
|
void draw(SkCanvas* canvas, const DrawData& drawData) const;
|
||||||
|
|
||||||
void set_name(NetworkingObjects::DelayUpdateSerializedClassManager& delayedNetObjMan, const std::string& newName) const;
|
void set_name(NetworkingObjects::DelayUpdateSerializedClassManager& delayedNetObjMan, const std::string& newName) const;
|
||||||
const std::string& get_name() const;
|
const std::string& get_name() const;
|
||||||
|
|
|
||||||
20
src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp
Normal file
20
src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
#include "DrawingProgramLayerManager.hpp"
|
||||||
|
#include "../../World.hpp"
|
||||||
|
|
||||||
|
DrawingProgramLayerManager::DrawingProgramLayerManager(DrawingProgram& drawProg):
|
||||||
|
drawP(drawProg), // initialize drawP first for next objects to be initialized properly
|
||||||
|
listGUI(*this)
|
||||||
|
{}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManager::init() {
|
||||||
|
if(drawP.world.netObjMan.is_server())
|
||||||
|
layerTreeRoot = drawP.world.netObjMan.make_obj_from_ptr<DrawingProgramLayerListItem>(new DrawingProgramLayerListItem(drawP.world.netObjMan, "ROOT", true));
|
||||||
|
}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManager::write_components_server(cereal::PortableBinaryOutputArchive& a) {
|
||||||
|
layerTreeRoot.write_create_message(a);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManager::read_components_client(cereal::PortableBinaryInputArchive& a) {
|
||||||
|
layerTreeRoot = drawP.world.netObjMan.read_create_message<DrawingProgramLayerListItem>(a, nullptr);
|
||||||
|
}
|
||||||
17
src/DrawingProgram/Layers/DrawingProgramLayerManager.hpp
Normal file
17
src/DrawingProgram/Layers/DrawingProgramLayerManager.hpp
Normal file
|
|
@ -0,0 +1,17 @@
|
||||||
|
#pragma once
|
||||||
|
#include "DrawingProgramLayerListItem.hpp"
|
||||||
|
#include "DrawingProgramLayerManagerGUI.hpp"
|
||||||
|
|
||||||
|
class DrawingProgramLayerManager {
|
||||||
|
private:
|
||||||
|
DrawingProgram& drawP;
|
||||||
|
friend class DrawingProgramLayerManagerGUI;
|
||||||
|
NetworkingObjects::NetObjOwnerPtr<DrawingProgramLayerListItem> layerTreeRoot;
|
||||||
|
|
||||||
|
public:
|
||||||
|
DrawingProgramLayerManager(DrawingProgram& drawProg);
|
||||||
|
void init();
|
||||||
|
void write_components_server(cereal::PortableBinaryOutputArchive& a);
|
||||||
|
void read_components_client(cereal::PortableBinaryInputArchive& a);
|
||||||
|
DrawingProgramLayerManagerGUI listGUI;
|
||||||
|
};
|
||||||
197
src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp
Normal file
197
src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp
Normal file
|
|
@ -0,0 +1,197 @@
|
||||||
|
#include "DrawingProgramLayerManagerGUI.hpp"
|
||||||
|
#include "DrawingProgramLayerManager.hpp"
|
||||||
|
#include "../DrawingProgram.hpp"
|
||||||
|
#include "../../World.hpp"
|
||||||
|
#include "../../MainProgram.hpp"
|
||||||
|
|
||||||
|
DrawingProgramLayerManagerGUI::DrawingProgramLayerManagerGUI(DrawingProgramLayerManager& drawLayerMan):
|
||||||
|
layerMan(drawLayerMan)
|
||||||
|
{}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManagerGUI::refresh_gui_data() {
|
||||||
|
selectionData = GUIStuff::TreeListing::SelectionData();
|
||||||
|
oldSelection.clear();
|
||||||
|
nameToEdit.clear();
|
||||||
|
nameForNew.clear();
|
||||||
|
alphaValToEdit = 0.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
void DrawingProgramLayerManagerGUI::setup_list_gui(const std::string& id) {
|
||||||
|
using namespace NetworkingObjects;
|
||||||
|
auto& world = layerMan.drawP.world;
|
||||||
|
if(layerMan.layerTreeRoot) {
|
||||||
|
auto& gui = world.main.toolbar.gui;
|
||||||
|
gui.push_id(id);
|
||||||
|
if(layerMan.layerTreeRoot->get_folder().folderList->empty()) {
|
||||||
|
gui.text_label_centered("No layers exist.");
|
||||||
|
selectionData = GUIStuff::TreeListing::SelectionData();
|
||||||
|
oldSelection.clear();
|
||||||
|
nameToEdit.clear();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
std::optional<NetObjID> toDeleteParent;
|
||||||
|
std::optional<NetObjID> toDeleteObject;
|
||||||
|
gui.tree_listing("list", layerMan.layerTreeRoot.get_net_id(), GUIStuff::TreeListing::DisplayData{
|
||||||
|
.getObjInListAtIndex = [&](NetObjID parentId, size_t index) -> std::optional<GUIStuff::TreeListing::DisplayData::ObjInList> {
|
||||||
|
NetObjOrderedList<DrawingProgramLayerListItem>& parentFolder = *world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(parentId)->get_folder().folderList;
|
||||||
|
if(parentFolder.size() <= index)
|
||||||
|
return std::nullopt;
|
||||||
|
return GUIStuff::TreeListing::DisplayData::ObjInList{
|
||||||
|
.id = parentFolder.at(index)->obj.get_net_id(),
|
||||||
|
.isDirectory = parentFolder.at(index)->obj->is_folder(),
|
||||||
|
.isDirectoryOpen = parentFolder.at(index)->obj->is_folder() ? parentFolder.at(index)->obj->get_folder().isFolderOpen : false
|
||||||
|
};
|
||||||
|
},
|
||||||
|
.getIndexOfObjInList = [&](const GUIStuff::TreeListing::ParentObjectIDPair& idPair) {
|
||||||
|
return world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(idPair.parent)->get_folder().folderList->get(idPair.object)->pos;
|
||||||
|
},
|
||||||
|
.setDirectoryOpen = [&](NetObjID netID, bool newDirectoryOpen) {
|
||||||
|
world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(netID)->get_folder().isFolderOpen = newDirectoryOpen;
|
||||||
|
},
|
||||||
|
.drawNonDirectoryObjIconGUI = [&](NetObjID netID) {
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
|
.padding = CLAY_PADDING_ALL(2),
|
||||||
|
},
|
||||||
|
}) {
|
||||||
|
gui.svg_icon("ico", "data/icons/layer.svg");
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
.drawObjGUI = [&](const GUIStuff::TreeListing::ParentObjectIDPair& idPair) {
|
||||||
|
auto tempPtr = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(idPair.object);
|
||||||
|
bool isButtonClicked = false;
|
||||||
|
if(Clay_Hovered() && gui.io->mouse.leftClick >= 2 && !tempPtr->is_folder() && selectionData.objsSelected.contains(idPair.object) && !gui.io->key.leftCtrl && !gui.io->key.leftShift)
|
||||||
|
std::cout << "Double clicked layer!" << std::endl;
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)},
|
||||||
|
.childAlignment = {.x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER}
|
||||||
|
},
|
||||||
|
}) {
|
||||||
|
gui.text_label(tempPtr->get_name());
|
||||||
|
}
|
||||||
|
if(gui.svg_icon_button_transparent("visible button", tempPtr->get_visible() ? "data/icons/eyeopen.svg" : "data/icons/eyeclose.svg", false, GUIStuff::TreeListing::ENTRY_HEIGHT)) {
|
||||||
|
tempPtr->set_visible(world.delayedUpdateObjectManager, !tempPtr->get_visible());
|
||||||
|
isButtonClicked = true;
|
||||||
|
}
|
||||||
|
if(gui.svg_icon_button_transparent("delete button", "data/icons/trash.svg", false, GUIStuff::TreeListing::ENTRY_HEIGHT)) {
|
||||||
|
toDeleteParent = idPair.parent;
|
||||||
|
toDeleteObject = idPair.object;
|
||||||
|
isButtonClicked = true;
|
||||||
|
}
|
||||||
|
return isButtonClicked;
|
||||||
|
},
|
||||||
|
.moveObjectsToListAtIndex = [&](NetObjID listObj, size_t index, const std::vector<GUIStuff::TreeListing::ParentObjectIDPair>& objsToInsert) {
|
||||||
|
world.netObjMan.send_multi_update_messsage([&]() {
|
||||||
|
std::unordered_map<NetObjID, std::unordered_set<NetObjID>> toEraseMap;
|
||||||
|
uint32_t newIndex = index;
|
||||||
|
std::vector<NetObjOwnerPtr<DrawingProgramLayerListItem>> toInsertObjPtrs;
|
||||||
|
auto& listPtr = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(listObj)->get_folder().folderList;
|
||||||
|
|
||||||
|
for(size_t i = 0; i < objsToInsert.size(); i++) {
|
||||||
|
toEraseMap[objsToInsert[i].parent].emplace(objsToInsert[i].object);
|
||||||
|
if(newIndex != 0 && objsToInsert[i].parent == listObj && listPtr->get(objsToInsert[i].object)->pos <= index)
|
||||||
|
newIndex--;
|
||||||
|
}
|
||||||
|
|
||||||
|
for(auto& [listToEraseFrom, setToErase] : toEraseMap) {
|
||||||
|
auto& listToEraseFromPtr = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(listToEraseFrom)->get_folder().folderList;
|
||||||
|
listToEraseFromPtr->erase_unordered_set(listToEraseFromPtr, setToErase, &toInsertObjPtrs);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<std::pair<uint32_t, NetObjOwnerPtr<DrawingProgramLayerListItem>>> toInsert;
|
||||||
|
for(uint32_t i = 0; i < objsToInsert.size(); i++) {
|
||||||
|
auto it = std::find_if(toInsertObjPtrs.begin(), toInsertObjPtrs.end(), [id = objsToInsert[i].object](NetObjOwnerPtr<DrawingProgramLayerListItem>& objPtr) {
|
||||||
|
return objPtr.get_net_id() == id;
|
||||||
|
});
|
||||||
|
toInsert.emplace_back(newIndex + i, std::move(*it));
|
||||||
|
toInsert.back().second.reassign_ids();
|
||||||
|
}
|
||||||
|
listPtr->insert_ordered_list_and_send_create(listPtr, toInsert);
|
||||||
|
}, NetObjManager::SendUpdateType::SEND_TO_ALL, nullptr);
|
||||||
|
}
|
||||||
|
}, selectionData);
|
||||||
|
|
||||||
|
|
||||||
|
if(selectionData.objsSelected != oldSelection) {
|
||||||
|
oldSelection = selectionData.objsSelected;
|
||||||
|
if(selectionData.objsSelected.size() == 1) {
|
||||||
|
NetObjTemporaryPtr<DrawingProgramLayerListItem> tempPtr = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(*selectionData.objsSelected.begin());
|
||||||
|
if(tempPtr) {
|
||||||
|
nameToEdit = tempPtr->get_name();
|
||||||
|
alphaValToEdit = tempPtr->get_alpha();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
nameToEdit.clear();
|
||||||
|
alphaValToEdit = 0.0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
nameToEdit.clear();
|
||||||
|
alphaValToEdit = 0.0f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(toDeleteObject.has_value()) {
|
||||||
|
auto& folderList = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(toDeleteParent.value())->get_folder().folderList;
|
||||||
|
folderList->erase(folderList, toDeleteObject.value());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gui.left_to_right_line_layout([&]() {
|
||||||
|
bool addByEnter = false;
|
||||||
|
gui.input_text("input new name", &nameForNew, true, [&](GUIStuff::SelectionHelper& s) {
|
||||||
|
addByEnter = s.selected && gui.io->key.enter;
|
||||||
|
});
|
||||||
|
|
||||||
|
if(gui.svg_icon_button("create new layer", "data/icons/plusbold.svg", false, gui.SMALL_BUTTON_SIZE) || addByEnter)
|
||||||
|
create_in_proper_position(new DrawingProgramLayerListItem(world.netObjMan, nameForNew, false));
|
||||||
|
else if(gui.svg_icon_button("create new folder", "data/icons/folderbold.svg", false, gui.SMALL_BUTTON_SIZE)) {
|
||||||
|
auto newFolderObjInfo = create_in_proper_position(new DrawingProgramLayerListItem(world.netObjMan, nameForNew, true));
|
||||||
|
newFolderObjInfo->obj->get_folder().isFolderOpen = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if(selectionData.objsSelected.size() == 1) {
|
||||||
|
NetObjTemporaryPtr<DrawingProgramLayerListItem> tempPtr = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(*selectionData.objsSelected.begin());
|
||||||
|
if(tempPtr) {
|
||||||
|
gui.text_label_centered(tempPtr->is_folder() ? "Edit Layer Folder" : "Edit Layer");
|
||||||
|
gui.input_text_field("input edit name", "Name", &nameToEdit);
|
||||||
|
tempPtr->set_name(world.delayedUpdateObjectManager, nameToEdit);
|
||||||
|
gui.slider_scalar_field("input alpha slider", "Alpha", &alphaValToEdit, 0.0f, 1.0f, 2);
|
||||||
|
tempPtr->set_alpha(world.delayedUpdateObjectManager, alphaValToEdit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
gui.pop_id();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
NetworkingObjects::NetObjOrderedListObjectInfoPtr<DrawingProgramLayerListItem> DrawingProgramLayerManagerGUI::try_to_create_in_proper_position(DrawingProgramLayerListItem* newItem) {
|
||||||
|
using namespace NetworkingObjects;
|
||||||
|
auto& world = layerMan.drawP.world;
|
||||||
|
if(selectionData.orderedObjsSelected.empty())
|
||||||
|
return nullptr;
|
||||||
|
auto& backObjParentObjectPair = selectionData.orderedObjsSelected.back();
|
||||||
|
NetObjTemporaryPtr<DrawingProgramLayerListItem> parentPtr = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(backObjParentObjectPair.parent);
|
||||||
|
if(!parentPtr)
|
||||||
|
return nullptr;
|
||||||
|
NetObjTemporaryPtr<DrawingProgramLayerListItem> objectPtr = world.netObjMan.get_obj_temporary_ref_from_id<DrawingProgramLayerListItem>(backObjParentObjectPair.object);
|
||||||
|
if(!objectPtr)
|
||||||
|
return nullptr;
|
||||||
|
if(objectPtr->is_folder()) {
|
||||||
|
objectPtr->get_folder().isFolderOpen = true;
|
||||||
|
return objectPtr->get_folder().folderList->push_back_and_send_create(objectPtr->get_folder().folderList, newItem);
|
||||||
|
}
|
||||||
|
uint32_t insertPos = parentPtr->get_folder().folderList->get(objectPtr.get_net_id())->pos;
|
||||||
|
return parentPtr->get_folder().folderList->insert_and_send_create(parentPtr->get_folder().folderList, insertPos + 1, newItem);
|
||||||
|
}
|
||||||
|
|
||||||
|
NetworkingObjects::NetObjOrderedListObjectInfoPtr<DrawingProgramLayerListItem> DrawingProgramLayerManagerGUI::create_in_proper_position(DrawingProgramLayerListItem* newItem) {
|
||||||
|
auto toRet = try_to_create_in_proper_position(newItem);
|
||||||
|
if(!toRet)
|
||||||
|
return layerMan.layerTreeRoot->get_folder().folderList->push_back_and_send_create(layerMan.layerTreeRoot->get_folder().folderList, newItem);
|
||||||
|
return toRet;
|
||||||
|
}
|
||||||
26
src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.hpp
Normal file
26
src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.hpp
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
#pragma once
|
||||||
|
#include <unordered_set>
|
||||||
|
#include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
|
||||||
|
#include "../../GUIStuff/Elements/TreeListing.hpp"
|
||||||
|
#include "DrawingProgramLayerListItem.hpp"
|
||||||
|
|
||||||
|
class World;
|
||||||
|
class DrawingProgramLayerManager;
|
||||||
|
|
||||||
|
class DrawingProgramLayerManagerGUI {
|
||||||
|
public:
|
||||||
|
DrawingProgramLayerManagerGUI(DrawingProgramLayerManager& layerManager);
|
||||||
|
void refresh_gui_data();
|
||||||
|
void setup_list_gui(const std::string& id);
|
||||||
|
private:
|
||||||
|
NetworkingObjects::NetObjOrderedListObjectInfoPtr<DrawingProgramLayerListItem> try_to_create_in_proper_position(DrawingProgramLayerListItem* newItem);
|
||||||
|
NetworkingObjects::NetObjOrderedListObjectInfoPtr<DrawingProgramLayerListItem> create_in_proper_position(DrawingProgramLayerListItem* newItem);
|
||||||
|
|
||||||
|
GUIStuff::TreeListing::SelectionData selectionData;
|
||||||
|
std::unordered_set<NetworkingObjects::NetObjID> oldSelection;
|
||||||
|
std::string nameToEdit;
|
||||||
|
std::string nameForNew;
|
||||||
|
float alphaValToEdit = 0.0f;
|
||||||
|
|
||||||
|
DrawingProgramLayerManager& layerMan;
|
||||||
|
};
|
||||||
|
|
@ -463,6 +463,7 @@ void Toolbar::top_toolbar() {
|
||||||
bool menuPopUpJustOpen = false;
|
bool menuPopUpJustOpen = false;
|
||||||
bool bookmarkMenuPopUpJustOpen = false;
|
bool bookmarkMenuPopUpJustOpen = false;
|
||||||
bool gridMenuPopUpJustOpen = false;
|
bool gridMenuPopUpJustOpen = false;
|
||||||
|
bool layerMenuPopUpJustOpen = false;
|
||||||
if(gui.svg_icon_button_transparent("Main Menu Button", "data/icons/menu.svg", menuPopUpOpen)) {
|
if(gui.svg_icon_button_transparent("Main Menu Button", "data/icons/menu.svg", menuPopUpOpen)) {
|
||||||
menuPopUpOpen = true;
|
menuPopUpOpen = true;
|
||||||
menuPopUpJustOpen = true;
|
menuPopUpJustOpen = true;
|
||||||
|
|
@ -486,6 +487,14 @@ void Toolbar::top_toolbar() {
|
||||||
gridMenuPopUpJustOpen = true;
|
gridMenuPopUpJustOpen = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(gui.svg_icon_button_transparent("Layer Menu Button", "data/icons/layer.svg", layerMenuPopupOpen)) {
|
||||||
|
if(layerMenuPopupOpen)
|
||||||
|
layerMenuPopupOpen = false;
|
||||||
|
else {
|
||||||
|
layerMenuPopupOpen = true;
|
||||||
|
layerMenuPopUpJustOpen = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
if(gui.svg_icon_button_transparent("Bookmark Menu Button", "data/icons/bookmark.svg", bookmarkMenuPopupOpen)) {
|
if(gui.svg_icon_button_transparent("Bookmark Menu Button", "data/icons/bookmark.svg", bookmarkMenuPopupOpen)) {
|
||||||
if(bookmarkMenuPopupOpen)
|
if(bookmarkMenuPopupOpen)
|
||||||
bookmarkMenuPopupOpen = false;
|
bookmarkMenuPopupOpen = false;
|
||||||
|
|
@ -502,6 +511,8 @@ void Toolbar::top_toolbar() {
|
||||||
grid_menu(gridMenuPopUpJustOpen);
|
grid_menu(gridMenuPopUpJustOpen);
|
||||||
if(bookmarkMenuPopupOpen)
|
if(bookmarkMenuPopupOpen)
|
||||||
bookmark_menu(bookmarkMenuPopUpJustOpen);
|
bookmark_menu(bookmarkMenuPopUpJustOpen);
|
||||||
|
if(layerMenuPopupOpen)
|
||||||
|
layer_menu(layerMenuPopUpJustOpen);
|
||||||
if(menuPopUpOpen) {
|
if(menuPopUpOpen) {
|
||||||
CLAY_AUTO_ID({
|
CLAY_AUTO_ID({
|
||||||
.layout = {
|
.layout = {
|
||||||
|
|
@ -810,6 +821,31 @@ void Toolbar::bookmark_menu(bool justOpened) {
|
||||||
gui.pop_id();
|
gui.pop_id();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Toolbar::layer_menu(bool justOpened) {
|
||||||
|
gui.push_id("layer menu");
|
||||||
|
CLAY_AUTO_ID({
|
||||||
|
.layout = {
|
||||||
|
.sizing = {.width = CLAY_SIZING_FIT(300), .height = CLAY_SIZING_FIT(0, 600) },
|
||||||
|
.padding = CLAY_PADDING_ALL(io->theme->padding1),
|
||||||
|
.childGap = io->theme->childGap1,
|
||||||
|
.childAlignment = { .x = CLAY_ALIGN_X_CENTER, .y = CLAY_ALIGN_Y_TOP},
|
||||||
|
.layoutDirection = CLAY_TOP_TO_BOTTOM
|
||||||
|
},
|
||||||
|
.backgroundColor = convert_vec4<Clay_Color>(io->theme->backColor1),
|
||||||
|
.cornerRadius = CLAY_CORNER_RADIUS(io->theme->windowCorners1),
|
||||||
|
.floating = {.offset = {.x = 0, .y = static_cast<float>(io->theme->padding1)}, .attachPoints = {.element = CLAY_ATTACH_POINT_RIGHT_TOP, .parent = CLAY_ATTACH_POINT_RIGHT_BOTTOM}, .attachTo = CLAY_ATTACH_TO_PARENT}
|
||||||
|
}) {
|
||||||
|
gui.obstructing_window();
|
||||||
|
gui.text_label_centered("Layers");
|
||||||
|
main.world->drawProg.layerMan.listGUI.setup_list_gui("layer menu list");
|
||||||
|
if(io->mouse.leftClick && !Clay_Hovered() && !justOpened) {
|
||||||
|
layerMenuPopupOpen = false;
|
||||||
|
main.world->drawProg.layerMan.listGUI.refresh_gui_data();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gui.pop_id();
|
||||||
|
}
|
||||||
|
|
||||||
std::unique_ptr<skia::textlayout::Paragraph> Toolbar::build_paragraph_from_chat_message(const ChatMessage& message, float alpha) {
|
std::unique_ptr<skia::textlayout::Paragraph> Toolbar::build_paragraph_from_chat_message(const ChatMessage& message, float alpha) {
|
||||||
skia::textlayout::ParagraphStyle pStyle;
|
skia::textlayout::ParagraphStyle pStyle;
|
||||||
pStyle.setTextAlign(skia::textlayout::TextAlign::kLeft);
|
pStyle.setTextAlign(skia::textlayout::TextAlign::kLeft);
|
||||||
|
|
|
||||||
|
|
@ -103,6 +103,7 @@ class Toolbar {
|
||||||
void grid_menu(bool justOpened);
|
void grid_menu(bool justOpened);
|
||||||
void stop_displaying_grid_menu();
|
void stop_displaying_grid_menu();
|
||||||
void bookmark_menu(bool justOpened);
|
void bookmark_menu(bool justOpened);
|
||||||
|
void layer_menu(bool justOpened);
|
||||||
void drawing_program_gui();
|
void drawing_program_gui();
|
||||||
void options_menu();
|
void options_menu();
|
||||||
void file_picker_gui();
|
void file_picker_gui();
|
||||||
|
|
@ -189,6 +190,7 @@ class Toolbar {
|
||||||
} generalSettingsOptions = GSETTINGS_GENERAL;
|
} generalSettingsOptions = GSETTINGS_GENERAL;
|
||||||
|
|
||||||
bool bookmarkMenuPopupOpen = false;
|
bool bookmarkMenuPopupOpen = false;
|
||||||
|
bool layerMenuPopupOpen = false;
|
||||||
|
|
||||||
struct GridMenu {
|
struct GridMenu {
|
||||||
bool popupOpen = false;
|
bool popupOpen = false;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
#include "UndoManager.hpp"
|
#include "UndoManager.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
// NOTE: It might be possible to track net objects through their raw pointer values instead of NetObjIDs, as the NetObjID is just reassigned when moved, and it isn't reallocated.
|
||||||
|
|
||||||
bool UndoManager::can_undo() {
|
bool UndoManager::can_undo() {
|
||||||
return !undoQueue.empty();
|
return !undoQueue.empty();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@
|
||||||
#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 <cereal/types/unordered_map.hpp>
|
||||||
|
#include "DrawingProgram/Layers/DrawingProgramLayerListItem.hpp"
|
||||||
#include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
|
#include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
|
||||||
#include "Helpers/NetworkingObjects/NetObjUnorderedSet.hpp"
|
#include "Helpers/NetworkingObjects/NetObjUnorderedSet.hpp"
|
||||||
#include "CommandList.hpp"
|
#include "CommandList.hpp"
|
||||||
|
|
@ -116,6 +117,8 @@ void World::init_net_obj_type_list() {
|
||||||
CanvasComponentAllocator::register_class(*this);
|
CanvasComponentAllocator::register_class(*this);
|
||||||
CanvasComponentContainer::register_class(netObjMan);
|
CanvasComponentContainer::register_class(netObjMan);
|
||||||
NetworkingObjects::register_ordered_list_class<CanvasComponentContainer>(netObjMan);
|
NetworkingObjects::register_ordered_list_class<CanvasComponentContainer>(netObjMan);
|
||||||
|
DrawingProgramLayerListItem::register_class(*this);
|
||||||
|
NetworkingObjects::register_ordered_list_class<DrawingProgramLayerListItem>(netObjMan);
|
||||||
canvasTheme.register_class();
|
canvasTheme.register_class();
|
||||||
ClientData::register_class(*this);
|
ClientData::register_class(*this);
|
||||||
NetworkingObjects::register_unordered_set_class<ClientData>(netObjMan);
|
NetworkingObjects::register_unordered_set_class<ClientData>(netObjMan);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue