summaryrefslogtreecommitdiff
path: root/rotord
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2013-12-11 15:02:34 +0000
committerTim Redfern <tim@eclectronics.org>2013-12-11 15:02:34 +0000
commit33ffa11a2661b82b8d300a3df731de812d590153 (patch)
tree3b69dcd922f474f2f3a1348abbb46d995d3699a6 /rotord
parent1bae3f889b11933353d4ef31c692c9b7cb9f5047 (diff)
reverted to old sin & cos method
Diffstat (limited to 'rotord')
-rw-r--r--rotord/src/nodes_maths.h5
-rw-r--r--rotord/src/rotor.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/rotord/src/nodes_maths.h b/rotord/src/nodes_maths.h
index baa26d6..1043599 100644
--- a/rotord/src/nodes_maths.h
+++ b/rotord/src/nodes_maths.h
@@ -128,11 +128,12 @@ namespace Rotor {
case ARITHMETIC_sin:
phase+=in*parameters["value"]->value;
- return sin(phase);
+ //return sin(phase); need to review this
+ return sin(in)*parameters["value"]->value;
break;
case ARITHMETIC_cos:
phase+=in*parameters["value"]->value;
- return cos(phase);
+ return cos(in)*parameters["value"]->value;
break;
case ARITHMETIC_ease:
return ((1.0-parameters["value"]->value)*in)+(parameters["value"]->value*(0.5f+((cos((fmod(in,1.0)+1.0)*M_PI))*0.5f)));
diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h
index 0013313..174a622 100644
--- a/rotord/src/rotor.h
+++ b/rotord/src/rotor.h
@@ -338,7 +338,7 @@ namespace Rotor {
};
class Node{
public:
- Node(){duplicate_inputs=false;UItype="";};
+ Node(){duplicate_inputs=false;UItype="none";};
virtual Node* clone(map<string,string> &_settings)=0; //pure virtual
virtual ~Node(){
for (auto a: attributes) delete a.second;