From bf19c3b5935beb1b62fc44c299c5ccbda7aee7ad Mon Sep 17 00:00:00 2001 From: tremblap Date: Tue, 21 Feb 2023 14:17:07 +0000 Subject: [PATCH] KDTree KR supports the same behaviour than the NRT query --- release-packaging/Classes/FluidKDTree.sc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/release-packaging/Classes/FluidKDTree.sc b/release-packaging/Classes/FluidKDTree.sc index f850d7f..53b4fb6 100644 --- a/release-packaging/Classes/FluidKDTree.sc +++ b/release-packaging/Classes/FluidKDTree.sc @@ -48,13 +48,9 @@ FluidKDTree : FluidModelObject this.prSendMsg(this.kNearestDistMsg(buffer,k)); } - kr{|trig, inputBuffer,outputBuffer, numNeighbours = 1, lookupDataSet| - /* this.numNeighbours_(numNeighbours); - lookupDataSet = lookupDataSet ? -1; - this.lookupDataSet_(lookupDataSet);*/ - + kr{|trig, inputBuffer, outputBuffer, numNeighbours, radius, lookupDataSet| ^FluidKDTreeQuery.kr(trig, - this, numNeighbours, this.radius,lookupDataSet.asUGenInput, + this, numNeighbours??{this.numNeighbours}, radius??{this.radius}, lookupDataSet.asUGenInput, inputBuffer,outputBuffer); } @@ -62,8 +58,8 @@ FluidKDTree : FluidModelObject FluidKDTreeQuery : FluidRTMultiOutUGen { - *kr{ |trig, tree, numNeighbours, radius,lookupDataSet, inputBuffer, outputBuffer | - ^this.multiNew('control',trig, tree.asUGenInput, numNeighbours, radius,lookupDataSet!?(_.asUGenInput)??{-1}, inputBuffer.asUGenInput, outputBuffer.asUGenInput) + *kr{ |trig, tree, numNeighbours, radius, lookupDataSet, inputBuffer, outputBuffer | + ^this.multiNew('control', trig, tree.asUGenInput, numNeighbours, radius, lookupDataSet!?(_.asUGenInput)??{-1}, inputBuffer.asUGenInput, outputBuffer.asUGenInput) } init { arg ... theInputs;