From 7a615e77d695fb96097464ea88b6528d764a84af Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Sun, 8 Dec 2024 11:21:27 +0100 Subject: [PATCH 1/3] Set version to 0.8.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c675f56..124cb5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.14) -project(scratchcpp-render VERSION 0.8.0 LANGUAGES CXX) +project(scratchcpp-render VERSION 0.8.1 LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOUIC ON) From 88304730ae2f956cf0c1df064247605963e57676 Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Sun, 8 Dec 2024 11:17:09 +0100 Subject: [PATCH 2/3] PenLayer: Enable blending in stamp() --- src/penlayer.cpp | 2 ++ test/penlayer/penlayer_test.cpp | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/penlayer.cpp b/src/penlayer.cpp index 0c95759..7333517 100644 --- a/src/penlayer.cpp +++ b/src/penlayer.cpp @@ -273,6 +273,8 @@ void PenLayer::stamp(IRenderedTarget *target) modelMatrix.scale(scaleX / textureScale, aspectRatio * scaleY / textureScale); m_glF->glDisable(GL_SCISSOR_TEST); m_glF->glDisable(GL_DEPTH_TEST); + m_glF->glEnable(GL_BLEND); + m_glF->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Create a FBO for the current texture m_glF->glBindFramebuffer(GL_FRAMEBUFFER, m_stampFbo); diff --git a/test/penlayer/penlayer_test.cpp b/test/penlayer/penlayer_test.cpp index 007ef81..6400b29 100644 --- a/test/penlayer/penlayer_test.cpp +++ b/test/penlayer/penlayer_test.cpp @@ -30,11 +30,6 @@ class PenLayerTest : public testing::Test m_surface.create(); Q_ASSERT(m_surface.isValid()); m_context.makeCurrent(&m_surface); - - QOpenGLFunctions glF(&m_context); - glF.initializeOpenGLFunctions(); - glF.glEnable(GL_BLEND); - glF.glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } void TearDown() override From 1fcfb8db1994ddd42a741931396e4d416c3c44b5 Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:46:58 +0100 Subject: [PATCH 3/3] Update libscratchcpp to v0.12.1 --- libscratchcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libscratchcpp b/libscratchcpp index d9e0e11..70f2c70 160000 --- a/libscratchcpp +++ b/libscratchcpp @@ -1 +1 @@ -Subproject commit d9e0e1124174a23d9f2783e756027da2f57d67b5 +Subproject commit 70f2c7060fb116c8000f712fba1fc661343d7d1d