From e77d72f436d05dd3dcd64068463e98cb72151345 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 30 Jan 2019 14:11:45 +1100 Subject: [PATCH] fixed corner pin regression --- effects/internal/cornerpineffect.cpp | 2 +- effects/internal/cornerpineffect.h | 34 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/effects/internal/cornerpineffect.cpp b/effects/internal/cornerpineffect.cpp index 11730619e..d23525e2c 100644 --- a/effects/internal/cornerpineffect.cpp +++ b/effects/internal/cornerpineffect.cpp @@ -61,7 +61,7 @@ void CornerPinEffect::process_coords(double timecode, GLTextureCoords &coords, i coords.vertexBottomRightY += bottom_right_y->get_double_value(timecode); } -void CornerPinEffect::process_shader(double timecode, GLTextureCoords &coords) { +void CornerPinEffect::process_shader(double timecode, GLTextureCoords &coords, int iterations) { glslProgram->setUniformValue("p0", (GLfloat) coords.vertexBottomLeftX, (GLfloat) coords.vertexBottomLeftY); glslProgram->setUniformValue("p1", (GLfloat) coords.vertexBottomRightX, (GLfloat) coords.vertexBottomRightY); glslProgram->setUniformValue("p2", (GLfloat) coords.vertexTopLeftX, (GLfloat) coords.vertexTopLeftY); diff --git a/effects/internal/cornerpineffect.h b/effects/internal/cornerpineffect.h index 2a98e009e..882a19c5c 100644 --- a/effects/internal/cornerpineffect.h +++ b/effects/internal/cornerpineffect.h @@ -4,27 +4,27 @@ #include "project/effect.h" class CornerPinEffect : public Effect { - Q_OBJECT + Q_OBJECT public: - CornerPinEffect(Clip* c, const EffectMeta* em); - void process_coords(double timecode, GLTextureCoords& coords, int data); - void process_shader(double timecode, GLTextureCoords& coords); - void gizmo_draw(double timecode, GLTextureCoords& coords); + CornerPinEffect(Clip* c, const EffectMeta* em); + void process_coords(double timecode, GLTextureCoords& coords, int data); + void process_shader(double timecode, GLTextureCoords& coords, int iterations); + void gizmo_draw(double timecode, GLTextureCoords& coords); private: - EffectField* top_left_x; - EffectField* top_left_y; - EffectField* top_right_x; - EffectField* top_right_y; - EffectField* bottom_left_x; - EffectField* bottom_left_y; - EffectField* bottom_right_x; - EffectField* bottom_right_y; + EffectField* top_left_x; + EffectField* top_left_y; + EffectField* top_right_x; + EffectField* top_right_y; + EffectField* bottom_left_x; + EffectField* bottom_left_y; + EffectField* bottom_right_x; + EffectField* bottom_right_y; EffectField* perspective; - EffectGizmo* top_left_gizmo; - EffectGizmo* top_right_gizmo; - EffectGizmo* bottom_left_gizmo; - EffectGizmo* bottom_right_gizmo; + EffectGizmo* top_left_gizmo; + EffectGizmo* top_right_gizmo; + EffectGizmo* bottom_left_gizmo; + EffectGizmo* bottom_right_gizmo; }; #endif // CORNERPINEFFECT_H