Mercurial > hg > silvet

changeset 299:a4216826f01c livemode

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-normalise
author Chris Cannam
date Fri, 28 Nov 2014 10:31:59 +0000
parents ebe5e0942bb8
children ba5f3b084466
files src/LiveInstruments.cpp
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/LiveInstruments.cpp	Fri Nov 28 10:18:22 2014 +0000
+++ b/src/LiveInstruments.cpp	Fri Nov 28 10:31:59 2014 +0000
@@ -35,10 +35,17 @@
 
 	for (int j = 0; j < int(i->data.size()); ++j) {
 	    t.data[j].resize(SILVET_TEMPLATE_HEIGHT/5);
+            float sum = 0.f;
 	    for (int k = 0; k < SILVET_TEMPLATE_HEIGHT/5; ++k) {
 		t.data[j][k] = i->data[j][k * 5 + 2 - SILVET_TEMPLATE_MAX_SHIFT];
+                sum += t.data[j][k];
 	    }
+	    // re-normalise
+	    for (int k = 0; k < (int)t.data[j].size(); ++k) {
+                t.data[j][k] *= 1.f / sum;
+            }
 	}
+
 	templates.push_back(t);
     }