From 357f37e3d06b1a4a991230b2b5f9fa3a3c1e8774 Mon Sep 17 00:00:00 2001 From: omigamedev Date: Sat, 15 Apr 2017 21:52:18 +0200 Subject: [PATCH] clear new layers --- engine/app.cpp | 2 +- engine/brush.h | 3 +++ engine/canvas.cpp | 2 +- engine/layout.h | 3 --- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/app.cpp b/engine/app.cpp index 32ac0b4..3faa1af 100644 --- a/engine/app.cpp +++ b/engine/app.cpp @@ -641,7 +641,7 @@ bool App::mouse_scroll(float x, float y, float delta) MouseEvent e; e.m_type = kEventType::MouseScroll; e.m_pos = { x / zoom, y / zoom }; - e.m_scroll_delta = delta; + e.m_scroll_delta = delta * 0.1f; auto ret = layout[main_id]->on_event(&e); layout[main_id]->update(); return ret == kEventResult::Consumed; diff --git a/engine/brush.h b/engine/brush.h index 8f24c81..a51950e 100644 --- a/engine/brush.h +++ b/engine/brush.h @@ -81,6 +81,9 @@ public: bool create(int width, int height, std::string name) { m_rtt.create(width, height); + m_rtt.bindFramebuffer(); + m_rtt.clear(); + m_rtt.unbindFramebuffer(); return true; } }; diff --git a/engine/canvas.cpp b/engine/canvas.cpp index 1e58fe9..e45c1d5 100644 --- a/engine/canvas.cpp +++ b/engine/canvas.cpp @@ -229,7 +229,7 @@ void ui::Canvas::resize(int width, int height) m_tex2.create(width, height); for (auto& l : m_layers) { - l.m_rtt.create(width, height); + l.create(width, height, ""); } } bool ui::Canvas::create(int width, int height) diff --git a/engine/layout.h b/engine/layout.h index 7d9c677..2eceffc 100644 --- a/engine/layout.h +++ b/engine/layout.h @@ -1769,9 +1769,6 @@ public: glGetIntegerv(GL_VIEWPORT, vp); glGetFloatv(GL_COLOR_CLEAR_VALUE, cc); - double w = (double)m_rtt.getWidth(); - double h = (double)m_rtt.getHeight(); - glClearColor(1, 1, 1, 1); glClear(GL_COLOR_BUFFER_BIT); glViewport(0, 0, m_rtt.getWidth(), m_rtt.getHeight());