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

add nanort lib and update external git modules

Browse Source
This commit is contained in:
omigamedev
2019-01-08 16:54:05 +01:00
parent 1c8ace73c9
commit 81f51e2be6
10 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/canvas.cpp
View File

@@ -2207,6 +2207,9 @@ void Canvas::draw_objects(std::function<void(const glm::mat4& camera, const glm:
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, 0);
layer.m_rtt[i].unbindFramebuffer();
layer.m_dirty_face[i] = true;
layer.m_dirty_box[i] = { 0, 0, layer.w, layer.h };
}
glDeleteRenderbuffers(1, &rboID);

4
src/node_panel_grid.cpp
View File

@@ -104,7 +104,7 @@ void NodePanelGrid::init_controls()
auto sz = m_hm_preview->tex.size();
m_hm_preview->SetAspectRatio(sz.x / sz.y);
m_hm_plane.create(1, 1, m_hm_image,
m_groud_resolution->get_value() * 5.f, m_hm_height->get_value());
m_groud_resolution->get_value() * 5.f, get_height());
m_hm_preview->SetHeight(100);
}
};
@@ -122,7 +122,7 @@ void NodePanelGrid::init_controls()
float NodePanelGrid::get_height() const
{
return glm::pow(m_hm_height->get_value() - 0.5f, 3.f) * 10.f;
return -glm::pow(m_hm_height->get_value() - 0.5f, 3.f) * 10.f;
}
float NodePanelGrid::get_offset() const