diff options
Diffstat (limited to 'rotord/src')
| -rw-r--r-- | rotord/src/nodes_maths.h | 5 | ||||
| -rw-r--r-- | rotord/src/rotor.h | 2 |
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; |