X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain_test.cpp;h=8814e1f14144c4dbebd49c3ff1b795ab53058b39;hp=cea22e0a3e03dd5a1b855c46dc3600c3cb925e56;hb=0934db945c8fde98315c6a4099dde2dfa423c0e7;hpb=7af4d1b54ba141fdb74cd13ddc6110708855d157

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index cea22e0..8814e1f 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -3,13 +3,18 @@
 // Note that this also contains the tests for some of the simpler effects.
 
 #include <GL/glew.h>
+#include <assert.h>
 
+#include "effect.h"
 #include "effect_chain.h"
 #include "flat_input.h"
 #include "gtest/gtest.h"
+#include "input.h"
 #include "mirror_effect.h"
+#include "multiply_effect.h"
 #include "resize_effect.h"
 #include "test_util.h"
+#include "util.h"
 
 TEST(EffectChainTest, EmptyChain) {
 	float data[] = {
@@ -634,18 +639,6 @@ TEST(EffectChainTest, ResizeDownByFourThenUpByFour) {
 	expect_equal(expected_data, out_data, 4, 16);
 }
 
-// An effect that multiplies with a constant. Used below.
-class MultiplyEffect : public Effect {
-public:
-	MultiplyEffect() { register_float("factor", &factor); }
-	virtual std::string effect_type_id() const { return "MultiplyEffect"; }
-	std::string output_fragment_shader() { return read_file("multiply.frag"); }
-	virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
-
-private:
-	float factor;
-};
-
 // An effect that adds its two inputs together. Used below.
 class AddEffect : public Effect {
 public:
@@ -676,11 +669,14 @@ TEST(EffectChainTest, DiamondGraph) {
 	};
 	float out_data[2 * 2];
 
+	const float half[] = { 0.5f, 0.5f, 0.5f, 0.5f };
+	const float two[] = { 2.0f, 2.0f, 2.0f, 0.5f };
+
 	MultiplyEffect *mul_half = new MultiplyEffect();
-	ASSERT_TRUE(mul_half->set_float("factor", 0.5f));
+	ASSERT_TRUE(mul_half->set_vec4("factor", half));
 	
 	MultiplyEffect *mul_two = new MultiplyEffect();
-	ASSERT_TRUE(mul_two->set_float("factor", 2.0f));
+	ASSERT_TRUE(mul_two->set_vec4("factor", two));
 
 	EffectChainTester tester(NULL, 2, 2);
 
@@ -722,11 +718,14 @@ TEST(EffectChainTest, DiamondGraphWithOneInputUsedInTwoPhases) {
 	};
 	float out_data[2 * 2];
 
+	const float half[] = { 0.5f, 0.5f, 0.5f, 0.5f };
+	const float two[] = { 2.0f, 2.0f, 2.0f, 0.5f };
+
 	MultiplyEffect *mul_half = new MultiplyEffect();
-	ASSERT_TRUE(mul_half->set_float("factor", 0.5f));
+	ASSERT_TRUE(mul_half->set_vec4("factor", half));
 	
 	MultiplyEffect *mul_two = new MultiplyEffect();
-	ASSERT_TRUE(mul_two->set_float("factor", 2.0f));
+	ASSERT_TRUE(mul_two->set_vec4("factor", two));
 	
 	BouncingIdentityEffect *bounce = new BouncingIdentityEffect();