X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.h;h=05ef3656fd94d4dc4f8d6091927200eb7108b082;hp=b66ca6fe4ba30bd2ec817a634b6255bd2e316eee;hb=eb11109d6a074541df9b45be127c70d836bc4872;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/resample_effect.h b/resample_effect.h
index b66ca6f..05ef365 100644
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESAMPLE_EFFECT_H
-#define _RESAMPLE_EFFECT_H 1
+#ifndef _MOVIT_RESAMPLE_EFFECT_H
+#define _MOVIT_RESAMPLE_EFFECT_H 1
 
 // High-quality image resizing, either up or down.
 //
@@ -15,13 +15,15 @@
 // which is what the user is intended to use, instantiates two copies of
 // SingleResamplePassEffect behind the scenes).
 
-#include <GL/glew.h>
+#include <epoxy/gl.h>
 #include <assert.h>
 #include <stddef.h>
 #include <string>
 
 #include "effect.h"
 
+namespace movit {
+
 class EffectChain;
 class Node;
 class SingleResamplePassEffect;
@@ -36,7 +38,6 @@ public:
 	// down quite a lot.
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
-	virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
@@ -52,9 +53,14 @@ public:
 	
 private:
 	void update_size();
+	void update_offset_and_zoom();
 	
 	SingleResamplePassEffect *hpass, *vpass;
 	int input_width, input_height, output_width, output_height;
+
+	float offset_x, offset_y;
+	float zoom_x, zoom_y;
+	float zoom_center_x, zoom_center_y;
 };
 
 class SingleResamplePassEffect : public Effect {
@@ -70,7 +76,9 @@ public:
 
 	virtual bool needs_texture_bounce() const { return true; }
 	virtual bool needs_srgb_primaries() const { return false; }
+	virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
+	virtual void inform_added(EffectChain *chain) { this->chain = chain; }
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
 		if (parent != NULL) {
 			parent->inform_input_size(input_num, width, height);
@@ -91,12 +99,17 @@ private:
 	void update_texture(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
 
 	ResampleEffect *parent;
+	EffectChain *chain;
 	Direction direction;
 	GLuint texnum;
 	int input_width, input_height, output_width, output_height;
+	float offset, zoom;
 	int last_input_width, last_input_height, last_output_width, last_output_height;
+	float last_offset, last_zoom;
 	int src_bilinear_samples, num_loops;
 	float slice_height;
 };
 
-#endif // !defined(_RESAMPLE_EFFECT_H)
+}  // namespace movit
+
+#endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)