All scalers: replace 'invert' parameter with `inverseTransform` messages

nix
weefuzzy 4 years ago
parent 4d18d4d103
commit d3f56ab023

@ -2,13 +2,13 @@ FluidNormalize : FluidModelObject {
var <>min, <>max, <>invert; var <>min, <>max, <>invert;
*new {|server, min = 0, max = 1, invert = 0| *new {|server, min = 0, max = 1|
^super.new(server,[min,max,invert]) ^super.new(server,[min,max])
.min_(min).max_(max).invert_(invert); .min_(min).max_(max);
} }
prGetParams{ prGetParams{
^[this.id, this.min,this.max,this.invert,-1,-1]; ^[this.id, this.min,this.max,-1,-1];
} }
@ -52,16 +52,37 @@ FluidNormalize : FluidModelObject {
this.prSendMsg(this.transformPointMsg(sourceBuffer, destBuffer)); this.prSendMsg(this.transformPointMsg(sourceBuffer, destBuffer));
} }
inverseTransformMsg{|sourceDataSet, destDataSet|
^this.prMakeMsg(\inverseTransform,id,sourceDataSet.id,destDataSet.id);
}
inverseTransform{|sourceDataSet, destDataSet, action|
actions[\inverseTransform] = [nil,action];
this.prSendMsg(this.inverseTransformMsg(sourceDataSet, destDataSet));
}
inverseTransformPointMsg{|sourceBuffer, destBuffer|
^this.prMakeMsg(\inverseTransformPoint,id,
this.prEncodeBuffer(sourceBuffer),
this.prEncodeBuffer(destBuffer),
["/b_query",destBuffer.asUGenInput]
);
}
inverseTransformPoint{|sourceBuffer, destBuffer, action|
actions[\inverseTransformPoint] = [nil,{action.value(destBuffer)}];
this.prSendMsg(this.inverseTransformPointMsg(sourceBuffer, destBuffer));
}
kr{|trig, inputBuffer,outputBuffer,min = 0 ,max = 1,invert = 0| kr{|trig, inputBuffer,outputBuffer,min = 0 ,max = 1,invert = 0|
min = min ? this.min; min = min ? this.min;
max = max ? this.max; max = max ? this.max;
invert = invert ? this.invert;
this.min_(min).max_(max).invert_(invert); this.min_(min).max_(max);
^FluidNormalizeQuery.kr(trig, ^FluidNormalizeQuery.kr(trig,
this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), this.min, this.max, this.invert); this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), this.min, this.max, invert);
} }

@ -1,14 +1,14 @@
FluidRobustScale : FluidModelObject { FluidRobustScale : FluidModelObject {
var <>low, <>high, <>invert; var <>low, <>high;
*new {|server, low = 25, high = 75, invert = 0| *new {|server, low = 25, high = 75, invert = 0|
^super.new(server,[low,high,invert]) ^super.new(server,[low,high,invert])
.low_(low).high_(high).invert_(invert); .low_(low).high_(high);
} }
prGetParams{ prGetParams{
^[this.id,this.low,this.high,this.invert]; ^[this.id,this.low,this.high];
} }
@ -52,13 +52,31 @@ FluidRobustScale : FluidModelObject {
this.prSendMsg(this.transformPointMsg(sourceBuffer, destBuffer)); this.prSendMsg(this.transformPointMsg(sourceBuffer, destBuffer));
} }
kr{|trig, inputBuffer,outputBuffer,invert| inverseTransformMsg{|sourceDataSet, destDataSet|
^this.prMakeMsg(\inverseTransform,id,sourceDataSet.id,destDataSet.id);
}
inverseTransform{|sourceDataSet, destDataSet, action|
actions[\inverseTransform] = [nil,action];
this.prSendMsg(this.inverseTransformMsg(sourceDataSet, destDataSet));
}
inverseTransformPointMsg{|sourceBuffer, destBuffer|
^this.prMakeMsg(\inverseTransformPoint,id,
this.prEncodeBuffer(sourceBuffer),
this.prEncodeBuffer(destBuffer),
["/b_query",destBuffer.asUGenInput]
);
}
invert = invert ? this.invert; inverseTransformPoint{|sourceBuffer, destBuffer, action|
actions[\inverseRransformPoint] = [nil,{action.value(destBuffer)}];
this.prSendMsg(this.inverseTransformPointMsg(sourceBuffer, destBuffer));
}
// this.invert_(invert); kr{|trig, inputBuffer,outputBuffer,invert = 0|
^FluidRobustScaleQuery.kr(trig,this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), invert,); ^FluidRobustScaleQuery.kr(trig,this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), invert);
} }

@ -3,11 +3,11 @@ FluidStandardize : FluidModelObject {
var <>invert; var <>invert;
*new {|server, invert = 0| *new {|server, invert = 0|
^super.new(server,[invert]).invert_(invert); ^super.new(server,[]);
} }
prGetParams{ prGetParams{
^[this.id, this.invert]; ^[this.id];
} }
fitMsg{|dataSet| fitMsg{|dataSet|
@ -47,12 +47,31 @@ FluidStandardize : FluidModelObject {
this.prSendMsg(this.transformPointMsg(sourceBuffer,destBuffer)); this.prSendMsg(this.transformPointMsg(sourceBuffer,destBuffer));
} }
kr{|trig, inputBuffer,outputBuffer,invert| inverseTransformMsg{|sourceDataSet, destDataSet|
^this.prMakeMsg(\inverseTransform,id,sourceDataSet.id,destDataSet.id);
}
inverseTransform{|sourceDataSet, destDataSet, action|
actions[\inverseTransform] = [nil,action];
this.prSendMsg(this.inverseTransformMsg(sourceDataSet, destDataSet));
}
inverseTransformPointMsg{|sourceBuffer, destBuffer|
^this.prMakeMsg(\inverseTransformPoint,id,
this.prEncodeBuffer(sourceBuffer),
this.prEncodeBuffer(destBuffer),
["/b_query",destBuffer.asUGenInput]
);
}
inverseTransformPoint{|sourceBuffer, destBuffer, action|
actions[\inverseRransformPoint] = [nil,{action.value(destBuffer)}];
this.prSendMsg(this.inverseTransformPointMsg(sourceBuffer, destBuffer));
}
invert = invert ? this.invert; kr{|trig, inputBuffer,outputBuffer,invert = 0|
this.invert_(invert);
^FluidStandardizeQuery.kr(trig,this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), this.invert); ^FluidStandardizeQuery.kr(trig,this, this.prEncodeBuffer(inputBuffer), this.prEncodeBuffer(outputBuffer), invert);
} }
} }

Loading…
Cancel
Save