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

added Canvas, Brush, Stroke and CanvasNode classes

Browse Source
This commit is contained in:
omigamedev
2017-03-26 00:26:46 +00:00
parent a1e3fd4ecf
commit 744cd8bfb5
8 changed files with 256 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/layout.xml
View File

@@ -106,7 +106,7 @@
<text text="Stroke" font-face="arial" font-size="11" color="1 1 1 1"/>
</border>
<border color=".3" pad="5" dir="col" width="100%">
<border color=".2" pad="3" margin="0 0 10 0"> <canvas2D id="canvas" width="100%" height="100"/> </border>
<border color=".2" pad="3" margin="0 0 10 0"> <stroke-preview id="canvas" width="100%" height="100"/> </border>
<border color=".2" height="20" justify="center" align="center"><text text="Tip Settings" font-face="arial" font-size="11"/></border>
<node dir="row">
@@ -394,7 +394,7 @@
</node>
<!-- content panel -->
<node grow="1" color=".1" pad="10">
<!--<viewport grow="1"></viewport>-->
<canvas grow="1"/>
</node>
</node>
<!-- status bar -->

3
engine.vcxproj
View File

@@ -153,6 +153,7 @@
<ClCompile Include="engine\app.cpp" />
<ClCompile Include="engine\asset.cpp" />
<ClCompile Include="engine\bezier.cpp" />
<ClCompile Include="engine\canvas.cpp" />
<ClCompile Include="engine\font.cpp" />
<ClCompile Include="engine\image.cpp" />
<ClCompile Include="engine\layout.cpp" />
@@ -191,6 +192,7 @@
<ClInclude Include="engine\app.h" />
<ClInclude Include="engine\asset.h" />
<ClInclude Include="engine\bezier.h" />
<ClInclude Include="engine\canvas.h" />
<ClInclude Include="engine\font.h" />
<ClInclude Include="engine\image.h" />
<ClInclude Include="engine\layout.h" />
@@ -203,6 +205,7 @@
</ItemGroup>
<ItemGroup>
<None Include="engine\bezier" />
<None Include="engine\canvas" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

7
engine.vcxproj.filters
View File

@@ -63,6 +63,9 @@
<ClCompile Include="engine\bezier.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="engine\canvas.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="engine\app.h">
@@ -101,8 +104,12 @@
<ClInclude Include="engine\bezier.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="engine\canvas.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="engine\bezier" />
<None Include="engine\canvas" />
</ItemGroup>
</Project>

5
engine/canvas.cpp Normal file
View File

@@ -0,0 +1,5 @@
#include "pch.h"
#include "canvas.h"

147
engine/canvas.h Normal file
View File

@@ -0,0 +1,147 @@
#pragma once
#include "rtt.h"
#include "texture.h"
#include "shader.h"
#include "shape.h"
NS_START
class Brush
{
public:
std::string m_name;
int id;
uint16_t m_texture_id;
};
class Stroke
{
public:
struct Keypoint
{
glm::vec2 pos;
float pressure;
};
int m_layer;
float m_dist;
std::shared_ptr<Brush> m_brush;
std::vector<Keypoint> m_keypoints;
void add_point(glm::vec2 pos, float pressure)
{
m_keypoints.emplace_back();
m_keypoints.back().pos = pos;
m_keypoints.back().pressure = pressure;
}
};
class Layer
{
public:
RTT m_rtt;
bool m_visible = true;
bool m_locked = false;
float m_alpha = 1.f;
std::string m_name;
bool create(int width, int height, std::string name)
{
m_rtt.create(width, height);
return true;
}
};
class Canvas
{
public:
int m_width;
int m_height;
std::vector<Layer> m_layers;
std::vector<Stroke> m_strokes;
std::unique_ptr<Layer> m_tmp;
Stroke* m_current_stroke = nullptr;
int m_current_layer_idx = 0;
RTT m_fb;
Sampler m_sampler;
Plane m_plane;
bool create(int width, int height)
{
m_width = width;
m_height = height;
m_tmp = std::make_unique<Layer>();
m_tmp->create(width, height, "tmp");
m_fb.create(width, height);
m_sampler.create();
m_plane.create<1>(1, 1);
return true;
}
void layer_add(std::string name)
{
m_layers.emplace_back();
m_layers.back().create(m_width, m_height, name);
}
void stroke_start(glm::vec2 point, float pressure, std::shared_ptr<Brush> brush)
{
m_strokes.emplace_back();
m_strokes.back().m_brush = brush;
m_strokes.back().add_point(point, pressure);
m_current_stroke = &m_strokes.back();
}
void stroke_update(glm::vec2 point, float pressure)
{
m_current_stroke->add_point(point, pressure);
m_fb.bindFramebuffer();
GLint vp[4];
GLfloat cc[4];
glGetIntegerv(GL_VIEWPORT, vp);
glGetFloatv(GL_COLOR_CLEAR_VALUE, cc);
glViewport(0, 0, m_width, m_height);
auto mvp = glm::ortho(0.f, (float)m_width, (float)m_height, 0.f, -1.f, 1.f) *
glm::translate(glm::vec3(point, 0)) *
glm::scale(glm::vec3(30, 30, 1));
auto& tex = TextureManager::get(m_current_stroke->m_brush->m_texture_id);
tex.bind();
m_sampler.bind(0);
ui::ShaderManager::use(kShader::Texture);
ui::ShaderManager::u_int(kShaderUniform::Tex, 0);
ui::ShaderManager::u_mat4(kShaderUniform::MVP, mvp);
m_plane.draw_fill();
m_sampler.unbind();
tex.unbind();
glViewport(vp[0], vp[1], vp[2], vp[3]);
glClearColor(cc[0], cc[1], cc[2], cc[3]);
m_fb.unbindFramebuffer();
}
void stroke_end()
{
m_current_stroke = nullptr;
}
void clear()
{
m_fb.bindFramebuffer();
GLint vp[4];
GLfloat cc[4];
glGetIntegerv(GL_VIEWPORT, vp);
glGetFloatv(GL_COLOR_CLEAR_VALUE, cc);
glClearColor(1, 1, 1, 1);
glClear(GL_COLOR_BUFFER_BIT);
glViewport(0, 0, m_width, m_height);
//
glViewport(vp[0], vp[1], vp[2], vp[3]);
glClearColor(cc[0], cc[1], cc[2], cc[3]);
m_fb.unbindFramebuffer();
}
};
NS_END

3
engine/layout.cpp
View File

@@ -463,7 +463,8 @@ void Node::load_internal(const tinyxml2::XMLElement* x_node)
CASE(kWidget::PanelColor, NodePanelColor);
CASE(kWidget::PanelStroke, NodePanelStroke);
CASE(kWidget::ColorQuad, NodeColorQuad);
CASE(kWidget::Canvas2D, NodeStrokePreview);
CASE(kWidget::StrokePreview, NodeStrokePreview);
CASE(kWidget::Canvas, NodeCanvas);
#undef CASE
case kWidget::Ref:
{

93
engine/layout.h
View File

@@ -6,6 +6,7 @@
#include "asset.h"
#include "rtt.h"
#include "bezier.h"
#include "canvas.h"
#include <tinyxml2.h>
#include <yoga/Yoga.h>
@@ -72,7 +73,8 @@ enum class kWidget : uint16_t
PanelColor = const_hash("panel-color"),
PanelStroke = const_hash("panel-stroke"),
ColorQuad = const_hash("color-quad"),
Canvas2D = const_hash("canvas2D"),
StrokePreview = const_hash("stroke-preview"),
Canvas = const_hash("canvas"),
};
enum class kShapeType : uint16_t
@@ -733,15 +735,15 @@ public:
key_capture();
break;
case kEventType::KeyDown:
switch (ke->m_key)
{
// switch (ke->m_key)
// {
// case VK_BACK:
// m_string.erase(m_string.end() - 1);
// m_text->set_text(m_string.c_str());
// break;
default:
break;
}
// default:
// break;
// }
break;
case kEventType::KeyChar:
if (ke->m_key >= 32 && ke->m_key < 32+96)
@@ -1852,4 +1854,83 @@ public:
}
};
class NodeCanvas : public Node
{
bool m_dragging = false;
public:
std::unique_ptr<ui::Canvas> m_canvas;
virtual Node* clone_instantiate() const override { return new NodeCanvas(); }
virtual void init() override
{
m_mouse_ignore = false;
m_canvas = std::make_unique<ui::Canvas>();
m_canvas->create(512, 512);
m_canvas->clear();
}
virtual void draw() override
{
using namespace ui;
//glm::mat4 cam = glm::lookAt(glm::vec3(sinf(angle) * 10, 0, -10), glm::vec3(0, 0, 0), glm::vec3(0, -1, 0));
//glm::mat4 proj = glm::perspective<float>(glm::radians(45.f), m_clip.z / m_clip.w, .1f, 100);
GLint vp[4];
GLfloat cc[4];
glGetIntegerv(GL_VIEWPORT, vp);
glGetFloatv(GL_COLOR_CLEAR_VALUE, cc);
glClearColor(1, 0, 0, 1);
glClear(GL_COLOR_BUFFER_BIT);
auto box = m_clip * root()->m_zoom;
glm::ivec4 c = (glm::ivec4)glm::vec4(box.x, (int)(vp[3] - box.y - box.w), box.z, box.w);
glViewport(c.x, c.y, c.z, c.w);
glm::vec2 sz = { m_canvas->m_width, m_canvas->m_height };
auto mvp = glm::ortho(0.f, box.z, box.w, 0.f, -1.f, 1.f) *
glm::translate(glm::vec3((m_size - sz) * 0.5f, 0)) *
glm::scale(glm::vec3(sz, 1)) *
glm::translate(glm::vec3(.5f, .5f, 0.f)); // pivot
m_canvas->m_fb.bindTexture();
m_canvas->m_sampler.bind(0);
ui::ShaderManager::use(kShader::Texture);
ui::ShaderManager::u_int(kShaderUniform::Tex, 0);
ui::ShaderManager::u_mat4(kShaderUniform::MVP, mvp);
NodeBorder::m_plane.draw_fill();
m_canvas->m_sampler.unbind();
m_canvas->m_fb.unbindTexture();
glViewport(vp[0], vp[1], vp[2], vp[3]);
glClearColor(cc[0], cc[1], cc[2], cc[3]);
}
virtual void handle_resize(glm::vec2 old_size, glm::vec2 new_size) override
{
}
virtual kEventResult handle_event(Event* e) override
{
MouseEvent* me = static_cast<MouseEvent*>(e);
Node::handle_event(e);
switch (e->m_type)
{
case kEventType::MouseDownL:
{
auto b = std::make_shared<ui::Brush>();
b->m_texture_id = const_hash("data/Icons/Round-Brush.png");
m_canvas->stroke_start(me->m_pos, 1.f, b);
m_dragging = true;
break;
}
case kEventType::MouseUpL:
m_canvas->stroke_end();
m_dragging = false;
break;
case kEventType::MouseMove:
if (m_dragging)
m_canvas->stroke_update(me->m_pos, 1.f);
break;
default:
break;
}
return kEventResult::Consumed;
}
};

3
engine/pch.h
View File

@@ -33,6 +33,9 @@
#define SHADER_VERSION "#version 150\n"
#endif
#define NS_START namespace ui {
#define NS_END }
#ifdef __cplusplus
#include <map>
#include <cmath>