From a1570e7fc35f677ee7575d046c4d6f6c19d86295 Mon Sep 17 00:00:00 2001 From: themancalledjakob Date: Tue, 19 Mar 2024 15:11:39 +0100 Subject: [PATCH 1/2] ignore letterDelay from savedMapping, if prop is sequenced dependencies hashes: openFrameworks d78075f4bca6be2a2533c6e51a75cc1f18404501 ofxMsdfgen e14da13d02c4dff04fb69d7923469f606924e6c3 ofxGPUFont d482bb7cbdf6b296fa4ab5abcf73fb5ff8c8b239 ofxVariableLab 8df98846248a93aa068989a3ebd0d2f0f16e5e69 ofxProfiler a868e34fa1a79189dd4fbdede2938e308535e5e8 theatre 86d3e07f6f2c75fd6e08fca8c97e3617c9e23b18 --- bin/em/variabletime/web/js/audio.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/em/variabletime/web/js/audio.js b/bin/em/variabletime/web/js/audio.js index 114fe79..dfebbb8 100644 --- a/bin/em/variabletime/web/js/audio.js +++ b/bin/em/variabletime/web/js/audio.js @@ -126,6 +126,11 @@ const Audio = function(tp, record) { const getAudioMappingOptions = (layer, propTitle) => { if (savedMapping.hasOwnProperty(layer.id()) && savedMapping[layer.id()].hasOwnProperty(propTitle)) { + if (tp.isSequenced(propTitle, layer)) { + const m = clone(savedMapping[layer.id()][propTitle]); + delete m.letterDelay; + return m; + } return savedMapping[layer.id()][propTitle]; } else if (propTitle === 'color') { const mm = getDefaultRange(layer, 'color'); From f2ed11c206e70b9297cf36e35bd6840957f4a562 Mon Sep 17 00:00:00 2001 From: themancalledjakob Date: Tue, 19 Mar 2024 15:11:52 +0100 Subject: [PATCH 2/2] comment unnecessary conditional dependencies hashes: openFrameworks d78075f4bca6be2a2533c6e51a75cc1f18404501 ofxMsdfgen e14da13d02c4dff04fb69d7923469f606924e6c3 ofxGPUFont d482bb7cbdf6b296fa4ab5abcf73fb5ff8c8b239 ofxVariableLab 8df98846248a93aa068989a3ebd0d2f0f16e5e69 ofxProfiler a868e34fa1a79189dd4fbdede2938e308535e5e8 theatre 86d3e07f6f2c75fd6e08fca8c97e3617c9e23b18 --- bin/em/variabletime/web/js/layer.js | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/bin/em/variabletime/web/js/layer.js b/bin/em/variabletime/web/js/layer.js index b9c2e5d..5df00d1 100644 --- a/bin/em/variabletime/web/js/layer.js +++ b/bin/em/variabletime/web/js/layer.js @@ -110,23 +110,23 @@ const Layer = function(tp, layerID, fontsAndAxes, autoInit = true) { variationAxes[axes[a].name] = tp.core.types.number(axes[a].defaultValue, { range: [axes[a].minValue, axes[a].maxValue], }); - if (typeof audio === 'object' && - typeof audio.getSavedMapping() === 'object' && - typeof audio.getSavedMapping()[this.id()] === 'object' && - typeof audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' && - typeof audio.getMapping() === 'object' && - typeof audio.getMapping()[this.id()] === 'object' && - typeof audio.getMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' && - tp.getPanel() !== null) { - //doThese.push(() => { - //audio.removeAudioOptions(this, `fontVariationAxes.${axes[a].name}`); - //audio.removeAudioMapping(this, `fontVariationAxes.${axes[a].name}`); - //audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`].min_out = axes[a].minValue; - //audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`].max_out = axes[a].maxValue; - //audio.addAudioMapping(this, `fontVariationAxes.${axes[a].name}`); - //audio.addAudioOptions(this, `fontVariationAxes.${axes[a].name}`); - //}); - } + //if (typeof audio === 'object' && + //typeof audio.getSavedMapping() === 'object' && + //typeof audio.getSavedMapping()[this.id()] === 'object' && + //typeof audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' && + //typeof audio.getMapping() === 'object' && + //typeof audio.getMapping()[this.id()] === 'object' && + //typeof audio.getMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' && + //tp.getPanel() !== null) { + ////doThese.push(() => { + ////audio.removeAudioOptions(this, `fontVariationAxes.${axes[a].name}`); + ////audio.removeAudioMapping(this, `fontVariationAxes.${axes[a].name}`); + ////audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`].min_out = axes[a].minValue; + ////audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`].max_out = axes[a].maxValue; + ////audio.addAudioMapping(this, `fontVariationAxes.${axes[a].name}`); + ////audio.addAudioOptions(this, `fontVariationAxes.${axes[a].name}`); + ////}); + //} } else { console.log('js::layer::selectFont', 'this axis is insane, abort', axes[a]); }