eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 05:29:18 +02:00
Code Issues 121 Wiki Activity

fixes

Browse Source
This commit is contained in:
milek7
2018-08-03 16:28:01 +02:00
parent d7c7305906
commit af0e193bde
5 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
map.cpp
View File

@@ -69,7 +69,10 @@ void map::render(scene::basic_region *Region)
if (!scene_ubo)
if (!init())
{
map_opened = false;
return;
}
ImGui::SetNextWindowSizeConstraints(ImVec2(200, 200), ImVec2(fb_size, fb_size));
if (ImGui::Begin("Map", &map_opened, ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse))
@@ -165,7 +168,8 @@ void map::render(scene::basic_region *Region)
if (Global.iMultisampling)
m_fb->blit_from(*m_msaa_fb, size.x, size.y, GL_COLOR_BUFFER_BIT, GL_COLOR_ATTACHMENT0);
m_fb->unbind();
gl::framebuffer::unbind();
m_shader->unbind();
ImGui::ImageButton(reinterpret_cast<void*>(m_tex->id), size, ImVec2(0, size.y / fb_size), ImVec2(size.x / fb_size, 0), 0);