From 5b02a1dc23c07f76eb832960982f42f3fa957f13 Mon Sep 17 00:00:00 2001 From: kallaballa Date: Tue, 7 Mar 2023 16:54:39 +0100 Subject: [PATCH] changed easing --- src/shader/shader-demo.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/shader/shader-demo.cpp b/src/shader/shader-demo.cpp index 3868e9275..ccd6403a8 100644 --- a/src/shader/shader-demo.cpp +++ b/src/shader/shader-demo.cpp @@ -174,12 +174,11 @@ void load_shader(){ #endif const string vert = " #version " + shaderVersion + R"( - precision highp float; in vec4 position; void main() { - gl_Position = vec4(position.x, position.y, position.z, 1.0); + gl_Position = vec4(position.xyz, 1.0); })"; const string frag = " #version " + shaderVersion + R"( @@ -233,7 +232,7 @@ void load_shader(){ return vec4(base_color[0] * iterations * cb, base_color[1] * iterations * cb, base_color[2] * iterations * cb, base_color[3]); } - + void main() { outColor = return_color(); @@ -251,6 +250,9 @@ void load_shader(){ float easeInOutQubic(float x) { return x < 0.5f ? 4.0f * x * x * x : 1.0f - std::pow(-2.0f * x + 2.0f, 3.0f) / 2.0f; } +float easeInOutSine(float x) { + return -(cos(M_PI * x) - 1) / 2; +} void init_scene(const cv::Size& sz) { load_shader(); @@ -283,7 +285,7 @@ void render_scene(const cv::Size& sz) { glUniform1i(max_iterations_hdl, max_iterations); glUniform1f(center_y_hdl, center_y); glUniform1f(center_x_hdl, center_x); - glUniform1f(zoom_hdl, easeInOutQubic(zoom+=zoom_add)); + glUniform1f(zoom_hdl, easeInOutSine(zoom+=zoom_add)); #ifndef __EMSCRIPTEN__ glBindVertexArray(VAO);