save brushes settings
This commit is contained in:
@@ -47,7 +47,6 @@ Node* NodePanelBrush::clone_instantiate() const
|
||||
void NodePanelBrush::init()
|
||||
{
|
||||
init_template("tpl-panel-brushes");
|
||||
static auto icons = Asset::list_files("data/thumbs", true, ".*\\.png$");
|
||||
|
||||
m_btn_add = find<NodeButtonCustom>("btn-add");
|
||||
m_btn_add->on_click = [this](Node*) {
|
||||
@@ -80,10 +79,12 @@ void NodePanelBrush::init()
|
||||
brush->thumb_path = path_thumb;
|
||||
brush->high_path = path_high;
|
||||
brush->brush_name = name;
|
||||
brush->m_user_brush = true;
|
||||
brush->on_click = std::bind(&NodePanelBrush::handle_click, this, std::placeholders::_1);
|
||||
|
||||
app_redraw();
|
||||
async_end();
|
||||
save();
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -94,8 +95,12 @@ void NodePanelBrush::init()
|
||||
if (m_current)
|
||||
{
|
||||
int idx = m_container->get_child_index(m_current);
|
||||
Asset::delete_file(m_current->thumb_path);
|
||||
Asset::delete_file(m_current->high_path);
|
||||
if (m_current->m_user_brush)
|
||||
{
|
||||
// only delete user brushes
|
||||
Asset::delete_file(m_current->thumb_path);
|
||||
Asset::delete_file(m_current->high_path);
|
||||
}
|
||||
m_container->remove_child(m_current);
|
||||
if (m_container->m_children.size() > 0)
|
||||
{
|
||||
@@ -109,12 +114,37 @@ void NodePanelBrush::init()
|
||||
{
|
||||
m_current = nullptr;
|
||||
}
|
||||
save();
|
||||
}
|
||||
};
|
||||
|
||||
if ((m_container = find<NodeScroll>("brushes")))
|
||||
m_btn_up = find<NodeButtonCustom>("btn-up");
|
||||
m_btn_up->on_click = [this](Node*) {
|
||||
if (m_current)
|
||||
{
|
||||
int idx = m_container->get_child_index(m_current);
|
||||
idx = std::max(0, std::min(idx - 1, (int)m_container->m_children.size() - 1));
|
||||
m_container->move_child(m_current, idx);
|
||||
save();
|
||||
}
|
||||
};
|
||||
|
||||
m_btn_down = find<NodeButtonCustom>("btn-down");
|
||||
m_btn_down->on_click = [this](Node*) {
|
||||
if (m_current)
|
||||
{
|
||||
int idx = m_container->get_child_index(m_current);
|
||||
idx = std::max(0, std::min(idx + 1, (int)m_container->m_children.size() - 1));
|
||||
m_container->move_child(m_current, idx);
|
||||
save();
|
||||
}
|
||||
};
|
||||
|
||||
m_container = find<NodeScroll>("brushes");
|
||||
restore();
|
||||
if (m_container->m_children.empty())
|
||||
{
|
||||
int count = 0;
|
||||
auto icons = Asset::list_files("data/brushes", true, ".*\\.png$");
|
||||
for (auto& i : icons)
|
||||
{
|
||||
std::string path = "data/thumbs/" + i;
|
||||
@@ -128,6 +158,7 @@ void NodePanelBrush::init()
|
||||
brush->thumb_path = path;
|
||||
brush->high_path = path_hi;
|
||||
brush->brush_name = i;
|
||||
brush->m_user_brush = false; // system brush, cannot be deleted from file
|
||||
brush->on_click = std::bind(&NodePanelBrush::handle_click, this, std::placeholders::_1);
|
||||
}
|
||||
|
||||
@@ -145,9 +176,11 @@ void NodePanelBrush::init()
|
||||
brush->thumb_path = path_thumb;
|
||||
brush->high_path = path_high;
|
||||
brush->brush_name = i;
|
||||
brush->m_user_brush = true;
|
||||
brush->on_click = std::bind(&NodePanelBrush::handle_click, this, std::placeholders::_1);
|
||||
}
|
||||
}
|
||||
save();
|
||||
}
|
||||
|
||||
kEventResult NodePanelBrush::handle_event(Event* e)
|
||||
@@ -203,25 +236,94 @@ std::string NodePanelBrush::get_thumb_path(int index) const
|
||||
return ((NodeButtonBrush*)m_container->m_children[index].get())->thumb_path;
|
||||
}
|
||||
|
||||
// select the current brush based on the texture id
|
||||
//void NodePanelBrush::select_brush(int brush_id)
|
||||
//{
|
||||
// if (m_current)
|
||||
// m_current->m_selected = false;
|
||||
// for (auto b : m_brushes)
|
||||
// {
|
||||
// if (b->m_brushID == brush_id)
|
||||
// {
|
||||
// b->m_selected = true;
|
||||
// m_current = b;
|
||||
// TextureManager::load(b->high_path.c_str(), true);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
bool NodePanelBrush::save()
|
||||
{
|
||||
auto path = App::I.data_path + "/settings/brushes.bin";
|
||||
if (FILE* fp = fopen(path.c_str(), "wb"))
|
||||
{
|
||||
header_t h;
|
||||
h.brushes = m_container->m_children.size();
|
||||
fwrite(&h, sizeof(h), 1, fp);
|
||||
for (const auto& child : m_container->m_children)
|
||||
{
|
||||
auto b = std::static_pointer_cast<NodeButtonBrush>(child);
|
||||
item_t i;
|
||||
i.m_name_len = b->brush_name.size();
|
||||
i.m_high_len = b->high_path.size();
|
||||
i.m_thumb_len = b->thumb_path.size();
|
||||
fwrite(&i, sizeof(i), 1, fp);
|
||||
fwrite(b->brush_name.c_str(), 1, b->brush_name.size(), fp);
|
||||
fwrite(b->high_path.c_str(), 1, b->high_path.size(), fp);
|
||||
fwrite(b->thumb_path.c_str(), 1, b->thumb_path.size(), fp);
|
||||
}
|
||||
for (const auto& d : m_deleted)
|
||||
{
|
||||
item_t i;
|
||||
i.m_high_len = d.size();
|
||||
i.m_thumb_len = 0;
|
||||
fwrite(&i, sizeof(i), 1, fp);
|
||||
fwrite(d.c_str(), 1, d.size(), fp);
|
||||
}
|
||||
fclose(fp);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool NodePanelBrush::restore()
|
||||
{
|
||||
auto path = App::I.data_path + "/settings/brushes.bin";
|
||||
if (FILE* fp = fopen(path.c_str(), "rb"))
|
||||
{
|
||||
header_t h;
|
||||
fread(&h, sizeof(h), 1, fp);
|
||||
if (strcmp(h.magic, "PPBR") != 0)
|
||||
{
|
||||
fclose(fp);
|
||||
LOG("Brushes file malformed: %s", path.c_str());
|
||||
return false;
|
||||
}
|
||||
if (h.version < 0 || h.version > 0)
|
||||
{
|
||||
fclose(fp);
|
||||
LOG("Brushes file version %d not supported: %s", h.version, path.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
for (int k = 0; k < h.brushes; k++)
|
||||
{
|
||||
item_t i;
|
||||
fread(&i, sizeof(i), 1, fp);
|
||||
std::string name(i.m_name_len, 0);
|
||||
std::string path_high(i.m_high_len, 0);
|
||||
std::string path_thumb(i.m_thumb_len, 0);
|
||||
fread((char*)name.c_str(), 1, name.size(), fp);
|
||||
fread((char*)path_high.c_str(), 1, path_high.size(), fp);
|
||||
fread((char*)path_thumb.c_str(), 1, path_thumb.size(), fp);
|
||||
|
||||
if (Asset::exist(path_high))
|
||||
{
|
||||
NodeButtonBrush* brush = new NodeButtonBrush;
|
||||
m_container->add_child(brush);
|
||||
brush->init();
|
||||
brush->create();
|
||||
brush->loaded();
|
||||
brush->set_icon(path_thumb.c_str());
|
||||
brush->thumb_path = path_thumb;
|
||||
brush->high_path = path_high;
|
||||
brush->brush_name = name;
|
||||
brush->m_user_brush = true;
|
||||
brush->on_click = std::bind(&NodePanelBrush::handle_click, this, std::placeholders::_1);
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
|
||||
Node* NodeBrushPresetItem::clone_instantiate() const
|
||||
{
|
||||
return new NodeBrushPresetItem();
|
||||
@@ -244,11 +346,6 @@ void NodeBrushPresetItem::draw()
|
||||
NodeButtonCustom::draw();
|
||||
}
|
||||
|
||||
NodeBrushPresetItem::~NodeBrushPresetItem()
|
||||
{
|
||||
bool u = m_brush.unique();
|
||||
}
|
||||
|
||||
//---
|
||||
|
||||
Node* NodePanelBrushPreset::clone_instantiate() const
|
||||
@@ -361,15 +458,15 @@ void NodePanelBrushPreset::handle_click(Node* target)
|
||||
|
||||
bool NodePanelBrushPreset::save()
|
||||
{
|
||||
auto path = App::I.data_path + "/presets.bin";
|
||||
auto path = App::I.data_path + "/settings/presets.bin";
|
||||
if (FILE* fp = fopen(path.c_str(), "wb"))
|
||||
{
|
||||
header_t h;
|
||||
h.count = m_container->m_children.size();
|
||||
fwrite(&h, sizeof(h), 1, fp);
|
||||
for (const auto& child : m_container->m_children)
|
||||
for (int ci = 0; ci < m_container->m_children.size(); ci++)
|
||||
{
|
||||
auto b = std::static_pointer_cast<NodeBrushPresetItem>(child);
|
||||
auto b = static_cast<NodeBrushPresetItem*>(m_container->get_child_at(ci));
|
||||
item_t i;
|
||||
i.m_name_len = b->m_brush->m_name.size();
|
||||
i.m_brush_path_len = b->m_brush->m_brush_path.size();
|
||||
@@ -409,18 +506,31 @@ bool NodePanelBrushPreset::save()
|
||||
fwrite(b->m_brush->m_stencil_path.c_str(), 1, b->m_brush->m_stencil_path.size(), fp);
|
||||
}
|
||||
fclose(fp);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool NodePanelBrushPreset::restore()
|
||||
{
|
||||
auto path = App::I.data_path + "/presets.bin";
|
||||
auto path = App::I.data_path + "/settings/presets.bin";
|
||||
if (FILE* fp = fopen(path.c_str(), "rb"))
|
||||
{
|
||||
header_t h;
|
||||
fread(&h, sizeof(h), 1, fp);
|
||||
|
||||
if (strcmp(h.magic, "PPPR") != 0)
|
||||
{
|
||||
fclose(fp);
|
||||
LOG("Presets file malformed: %s", path.c_str());
|
||||
return false;
|
||||
}
|
||||
if (h.version < 0 || h.version > 0)
|
||||
{
|
||||
fclose(fp);
|
||||
LOG("Presets file version %d not supported: %s", h.version, path.c_str());
|
||||
return false;
|
||||
}
|
||||
|
||||
for (int k = 0; k < h.count; k++)
|
||||
{
|
||||
item_t i;
|
||||
@@ -462,25 +572,28 @@ bool NodePanelBrushPreset::restore()
|
||||
fread((char*)b->m_brush_thumb_path.c_str(), 1, b->m_brush_thumb_path.size(), fp);
|
||||
fread((char*)b->m_stencil_path.c_str(), 1, b->m_stencil_path.size(), fp);
|
||||
|
||||
b->load_texture(b->m_brush_path, b->m_brush_thumb_path);
|
||||
if (!b->m_stencil_path.empty())
|
||||
b->load_stencil(b->m_stencil_path);
|
||||
if (b->load_texture(b->m_brush_path, b->m_brush_thumb_path))
|
||||
{
|
||||
if (!b->m_stencil_path.empty())
|
||||
b->load_stencil(b->m_stencil_path);
|
||||
|
||||
NodeBrushPresetItem* brush = new NodeBrushPresetItem;
|
||||
m_container->add_child(brush);
|
||||
brush->init();
|
||||
brush->create();
|
||||
brush->loaded();
|
||||
brush->thumb_path = b->m_brush_thumb_path;
|
||||
brush->high_path = b->m_brush_path;
|
||||
brush->m_brush = b;
|
||||
brush->m_brush->m_tip_size = .05f;
|
||||
brush->m_preview->m_brush = b;
|
||||
brush->m_preview->draw_stroke();
|
||||
brush->m_thumb->set_image(brush->m_brush->m_brush_thumb_path);
|
||||
brush->on_click = std::bind(&NodePanelBrushPreset::handle_click, this, std::placeholders::_1);
|
||||
NodeBrushPresetItem* brush = new NodeBrushPresetItem;
|
||||
m_container->add_child(brush);
|
||||
brush->init();
|
||||
brush->create();
|
||||
brush->loaded();
|
||||
brush->thumb_path = b->m_brush_thumb_path;
|
||||
brush->high_path = b->m_brush_path;
|
||||
brush->m_brush = b;
|
||||
brush->m_brush->m_tip_size = .05f;
|
||||
brush->m_preview->m_brush = b;
|
||||
brush->m_preview->draw_stroke();
|
||||
brush->m_thumb->set_image(brush->m_brush->m_brush_thumb_path);
|
||||
brush->on_click = std::bind(&NodePanelBrushPreset::handle_click, this, std::placeholders::_1);
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user