blur node

2 files changed, 5 insertions, 3 deletions

diff --git a/rotord/src/nodes_maths.h b/rotord/src/nodes_maths.h
index 0a10ed0..d7aed56 100644
--- a/rotord/src/nodes_maths.h
+++ b/rotord/src/nodes_maths.h
@@ -70,7 +70,7 @@ namespace Rotor {
 #define ARITHMETIC_sin 7
 #define ARITHMETIC_cos 8
 #define ARITHMETIC_ease 9
-#define ARITHMETIC_jolt 9
+#define ARITHMETIC_jolt 10
 	class Arithmetic: public Signal_node {
 		public:
 			Arithmetic(){};
@@ -127,10 +127,10 @@ namespace Rotor {
 								return pow(in,value);
                         		break;
                         	case ARITHMETIC_sin:
-								return sin(in);
+								return sin(in)*value;
                         		break;
                         	case ARITHMETIC_cos:
-								return cos(in);
+								return cos(in)*value;
                         		break;
                         	case ARITHMETIC_ease:
 								return ((1.0-value)*in)+(value*(0.5f+((cos((fmod(in,1.0f)+1.0f)*M_PI))*0.5f)));
diff --git a/rotord/src/rotor.cpp b/rotord/src/rotor.cpp
index f3449fa..647313f 100755
--- a/rotord/src/rotor.cpp
+++ b/rotord/src/rotor.cpp
@@ -2,6 +2,7 @@
 #include "nodes_audio_analysis.h"
 #include "nodes_drawing.h"
 #include "nodes_maths.h"
+#include "nodes_filters.h"
 
 using namespace Rotor;
 Node_factory::Node_factory(){
@@ -32,6 +33,7 @@ Node_factory::Node_factory(){
 	add_type("transform",new Transform());
 	add_type("alpha_merge",new Alpha_merge());
 	add_type("shape",new Shape());
+	add_type("blur",new Blur());
 }
 
 bool Signal_input::connect(Signal_node* source) {