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

refactor layout.h into single file per Node* classes

Browse Source
This commit is contained in:
omigamedev
2017-05-13 21:58:04 +01:00
parent 51e355d039
commit 1f6c688258
55 changed files with 3600 additions and 2675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/canvas.h
View File

@@ -154,7 +154,7 @@ public:
m_canvas->m_layers[m_layer_idx].m_rtt[i].bindTexture();
glm::vec2 box_sz = m_box[i].zw() - m_box[i].xy();
glTexSubImage2D(GL_TEXTURE_2D, 0, m_box[i].x, m_box[i].y, box_sz.x, box_sz.y, GL_RGBA, GL_UNSIGNED_BYTE, m_image[i].get());
glTexSubImage2D(GL_TEXTURE_2D, 0, (int)m_box[i].x, (int)m_box[i].y, (int)box_sz.x, (int)box_sz.y, GL_RGBA, GL_UNSIGNED_BYTE, m_image[i].get());
m_canvas->m_layers[m_layer_idx].m_rtt[i].unbindTexture();
}
}
@@ -163,7 +163,7 @@ public:
size_t mem = 0;
for (int i = 0; i < 6; i++)
{
glm::vec2 sz = m_box[i].zw() - m_box[i].xy();
glm::ivec2 sz = m_box[i].zw() - m_box[i].xy();
mem += sz.x * sz.y * 4 + sizeof(*this);
}
return mem;