From 8981b414ae41b3e94e831447ac4ade85784bb1ed Mon Sep 17 00:00:00 2001 From: zelunwu Date: Fri, 22 Aug 2025 03:55:05 +0000 Subject: [PATCH 1/3] update test/unittest/ge_particle_circular_halo_shader_test.cpp. Signed-off-by: zelunwu --- .../ge_particle_circular_halo_shader_test.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/unittest/ge_particle_circular_halo_shader_test.cpp b/test/unittest/ge_particle_circular_halo_shader_test.cpp index fc721f2..a2b7603 100644 --- a/test/unittest/ge_particle_circular_halo_shader_test.cpp +++ b/test/unittest/ge_particle_circular_halo_shader_test.cpp @@ -33,7 +33,7 @@ public: void TearDown() override; std::shared_ptr MakeImage(Drawing::Canvas& canvas); - static inline Drawing::Canvas canvas_; + Drawing::Canvas canvas_; std::shared_ptr image_ { nullptr }; // 1.0f, 1.0f, 2.0f, 2.0f is left top right bottom @@ -65,6 +65,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest001, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -86,6 +87,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest002, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -107,6 +109,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest003, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -128,6 +131,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest004, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -149,6 +153,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest005, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -170,6 +175,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest006, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -191,6 +197,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest007, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -212,6 +219,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest008, params.noise_ = -2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -233,6 +241,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest009, params.noise_ = -2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -253,6 +262,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest010, params.noise_ = 2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -274,6 +284,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest011, params.noise_ = 2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); + void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { -- Gitee From 965543f545a3bd50c7419864a88a11d9f4a0b013 Mon Sep 17 00:00:00 2001 From: zelunwu Date: Fri, 22 Aug 2025 06:22:26 +0000 Subject: [PATCH 2/3] update test/unittest/ge_particle_circular_halo_shader_test.cpp. Signed-off-by: zelunwu --- .../ge_particle_circular_halo_shader_test.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/unittest/ge_particle_circular_halo_shader_test.cpp b/test/unittest/ge_particle_circular_halo_shader_test.cpp index a2b7603..f393db5 100644 --- a/test/unittest/ge_particle_circular_halo_shader_test.cpp +++ b/test/unittest/ge_particle_circular_halo_shader_test.cpp @@ -65,7 +65,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest001, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -87,7 +87,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest002, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -109,7 +109,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest003, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -131,7 +131,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest004, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -153,7 +153,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest005, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -175,7 +175,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest006, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -197,7 +197,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest007, params.noise_ = 4.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -219,7 +219,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest008, params.noise_ = -2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -241,7 +241,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest009, params.noise_ = -2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -262,7 +262,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest010, params.noise_ = 2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { @@ -284,7 +284,7 @@ HWTEST_F(GEParticleCircularHaloShaderTest, GEParticleCircularHaloShaderTest011, params.noise_ = 2.0f; auto shader = GEParticleCircularHaloShader::CreateParticleCircularHaloShader(params); - void GEParticleCircularHaloShader::Preprocess(canvas_, rect_); + shader->GEParticleCircularHaloShader::Preprocess(canvas_, rect_); auto shaderEffect = shader->MakeParticleCircularHaloShader(rect_); if (shaderEffect) { -- Gitee From 0e91166e0a7ffea6aadd226a72a659a0373d42b5 Mon Sep 17 00:00:00 2001 From: zelunwu Date: Fri, 22 Aug 2025 06:24:08 +0000 Subject: [PATCH 3/3] update test/unittest/ge_particle_circular_halo_shader_test.cpp. Signed-off-by: zelunwu --- test/unittest/ge_particle_circular_halo_shader_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/ge_particle_circular_halo_shader_test.cpp b/test/unittest/ge_particle_circular_halo_shader_test.cpp index f393db5..67324d2 100644 --- a/test/unittest/ge_particle_circular_halo_shader_test.cpp +++ b/test/unittest/ge_particle_circular_halo_shader_test.cpp @@ -37,7 +37,7 @@ public: std::shared_ptr image_ { nullptr }; // 1.0f, 1.0f, 2.0f, 2.0f is left top right bottom - Drawing::Rect rect_ { 1.0f, 1.0f, 2.0f, 2.0f }; + Drawing::Rect rect_ { 0.0f, 0.0f, 100.0f, 100.0f }; }; void GEParticleCircularHaloShaderTest::SetUpTestCase(void) {} -- Gitee