omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change android icon, move code so .cpp and implement stroke preview using Stroke class for accurate preview.

Browse Source
This commit is contained in:
omigamedev
2017-03-29 00:50:51 +01:00
parent 675e0148ec
commit ade95724e8
14 changed files with 421 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
engine/app.cpp
View File

@@ -259,7 +259,8 @@ void App::initLayout()
stroke->create();
stroke->loaded();
canvas->m_brush = stroke->m_canvas->m_brush;
if (canvas)
canvas->m_brush = stroke->m_canvas->m_brush;
brushes->on_brush_changed = [this](Node* target, int index) {
auto tid = brushes->get_texture_id(index);
@@ -273,13 +274,15 @@ void App::initLayout()
color->on_color_changed = [this](Node* target, glm::vec4 color) {
stroke->m_canvas->m_brush.m_tip_color = color;
stroke->m_canvas->draw_stroke();
canvas->m_brush = stroke->m_canvas->m_brush;
if (canvas)
canvas->m_brush = stroke->m_canvas->m_brush;
if (on_color_change)
on_color_change(color);
};
stroke->on_stroke_change = [this](Node*target) {
canvas->m_brush = stroke->m_canvas->m_brush;
if (canvas)
canvas->m_brush = stroke->m_canvas->m_brush;
if (on_stroke_change)
on_stroke_change();
};
@@ -349,16 +352,20 @@ void App::initLayout()
{
button->on_click = [this,button](Node*) {
//exit(0);
canvas->m_canvas->m_use_instanced = !canvas->m_canvas->m_use_instanced;
//button->color_normal = canvas->m_canvas->m_use_instanced ? glm::vec4(1, 0, 0, 1) : glm::vec4(0, 1, 0, 1);
button->m_text->set_text(canvas->m_canvas->m_use_instanced ? "INST" : "NORM");
if (canvas)
{
canvas->m_canvas->m_use_instanced = !canvas->m_canvas->m_use_instanced;
//button->color_normal = canvas->m_canvas->m_use_instanced ? glm::vec4(1, 0, 0, 1) : glm::vec4(0, 1, 0, 1);
button->m_text->set_text(canvas->m_canvas->m_use_instanced ? "INST" : "NORM");
}
};
}
if (auto* button = layout[main_id]->find<NodeButton>("btn-close"))
{
button->on_click = [this](Node*) {
//exit(0);
canvas->m_canvas->clear();
if (canvas)
canvas->m_canvas->clear();
};
}
if (auto* button = layout[main_id]->find<NodeButton>("btn-popup"))
@@ -491,9 +498,9 @@ void App::update(float dt)
if (canvas && canvas->m_canvas)
canvas->m_canvas->stroke_draw();
glClearColor(.1f, .1f, .1f, 1.f);
glViewport(0, 0, (GLsizei)width, (GLsizei)height);
glClear(GL_COLOR_BUFFER_BIT);
//glClearColor(.1f, .1f, .1f, 1.f);
//glViewport(0, 0, (GLsizei)width, (GLsizei)height);
//glClear(GL_COLOR_BUFFER_BIT);
#ifndef __ANDROID__
layout.reload();