summaryrefslogtreecommitdiff
path: root/rotord/src/nodes_maths.h
diff options
context:
space:
mode:
authorTim Redfern <tim@herge.(none)>2013-08-07 12:04:47 +0100
committerTim Redfern <tim@herge.(none)>2013-08-07 12:04:47 +0100
commit873286dcb95fffc1a5ba5db78c2a59ca4fcdf952 (patch)
tree1f4afa6235b6ded959f3a05b2aa1ac503e61d8c2 /rotord/src/nodes_maths.h
parent6bab4bd8f1c96512349281ad3671cb3879b3f4e8 (diff)
blur node
Diffstat (limited to 'rotord/src/nodes_maths.h')
-rw-r--r--rotord/src/nodes_maths.h6
1 files changed, 3 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)));