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

fix quick panel color slots, remove RGBA float framebuffers, disable merge framebuffers

Browse Source
This commit is contained in:
omigamedev
2019-05-16 17:02:20 +02:00
parent 4f39dcf61d
commit ab9767556f
5 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/canvas.cpp
View File

@@ -1356,23 +1356,23 @@ void Canvas::resize(int width, int height)
m_size = { width, height };
for (int i = 0; i < 6; i++)
{
#if defined(__IOS__) || defined(__ANDROID__)
//#if defined(__IOS__) || defined(__ANDROID__)
m_tmp[i].create(width, height, -1, GL_RGBA8);
m_tmp_dual[i].create(width, height, -1, GL_RGBA8);
m_tex[i].create(width, height, GL_RGBA8);
#else
m_tmp[i].create(width, height, -1, GL_RGBA32F);
m_tmp_dual[i].create(width, height, -1, GL_RGBA32F);
m_tex[i].create(width, height, GL_RGBA32F);
#endif
//#else
// m_tmp[i].create(width, height, -1, GL_RGBA32F);
// m_tmp_dual[i].create(width, height, -1, GL_RGBA32F);
// m_tex[i].create(width, height, GL_RGBA32F);
//#endif
m_tex2[i].create(width, height, GL_RGBA8);
}
m_layers_merge.resize(width, height);
for (auto& l : m_layers)
l->resize(width, height);
m_smask.create(width, height, "mask");
m_merge_rtt.create(width, height);
m_merge_tex.create(width, height);
//m_merge_rtt.create(width, height);
//m_merge_tex.create(width, height);
m_unsaved = true;
}
@@ -1390,8 +1390,8 @@ void Canvas::destroy()
l->destroy();
m_smask.destroy();
m_mixer.destroy();
m_merge_rtt.destroy();
m_merge_tex.destroy();
//m_merge_rtt.destroy();
//m_merge_tex.destroy();
}
bool Canvas::create(int width, int height)
@@ -1401,15 +1401,15 @@ bool Canvas::create(int width, int height)
m_size = { width, height };
for (int i = 0; i < 6; i++)
{
#if defined(__IOS__) || defined(__ANDROID__)
//#if defined(__IOS__) || defined(__ANDROID__)
m_tmp[i].create(width, height, -1, GL_RGBA8);
m_tmp_dual[i].create(width, height, -1, GL_RGBA8);
m_tex[i].create(width, height, GL_RGBA8);
#else
m_tmp[i].create(width, height, -1, GL_RGBA32F);
m_tmp_dual[i].create(width, height, -1, GL_RGBA32F);
m_tex[i].create(width, height, GL_RGBA32F);
#endif
//#else
// m_tmp[i].create(width, height, -1, GL_RGBA32F);
// m_tmp_dual[i].create(width, height, -1, GL_RGBA32F);
// m_tex[i].create(width, height, GL_RGBA32F);
//#endif
m_tex2[i].create(width, height, GL_RGBA8);
}
#if defined(__IOS__) || defined(__ANDROID__)
@@ -1437,8 +1437,8 @@ bool Canvas::create(int width, int height)
l->create(width, height, "");
m_smask.create(width, height, "mask");
//m_smask.clear({1, 1, 1, 1});
m_merge_rtt.create(width, height);
m_merge_tex.create(width, height);
//m_merge_rtt.create(width, height);
//m_merge_tex.create(width, height);
m_unsaved = true;
draw_merge();
return true;