variablelab/variabletime
variablelab/variabletime
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: variablelab:f2ed11c206e70b9297cf36e35bd6840957f4a562
Branches Tags
variablelab:main
variablelab:audio
..
compare: variablelab:28fb7e219803537bd4a172a6347dc201e94908ea
Branches Tags
variablelab:audio
variablelab:main

No commits in common. "f2ed11c206e70b9297cf36e35bd6840957f4a562" and "28fb7e219803537bd4a172a6347dc201e94908ea" have entirely different histories.
f2ed11c206 ... 28fb7e2198

2 changed files with 17 additions and 22 deletions
Show stats Expand all files Collapse all files

5
bin/em/variabletime/web/js/audio.js
View file

@ -126,11 +126,6 @@ const Audio = function(tp, record) {
const getAudioMappingOptions = (layer, propTitle) => { const getAudioMappingOptions = (layer, propTitle) => {
if (savedMapping.hasOwnProperty(layer.id()) && savedMapping[layer.id()].hasOwnProperty(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]; return savedMapping[layer.id()][propTitle];
} else if (propTitle === 'color') { } else if (propTitle === 'color') {
const mm = getDefaultRange(layer, 'color'); const mm = getDefaultRange(layer, 'color');

34
bin/em/variabletime/web/js/layer.js
View file

@ -110,23 +110,23 @@ const Layer = function(tp, layerID, fontsAndAxes, autoInit = true) {
variationAxes[axes[a].name] = tp.core.types.number(axes[a].defaultValue, { variationAxes[axes[a].name] = tp.core.types.number(axes[a].defaultValue, {
range: [axes[a].minValue, axes[a].maxValue], range: [axes[a].minValue, axes[a].maxValue],
}); });
//if (typeof audio === 'object' && if (typeof audio === 'object' &&
//typeof audio.getSavedMapping() === 'object' && typeof audio.getSavedMapping() === 'object' &&
//typeof audio.getSavedMapping()[this.id()] === 'object' && typeof audio.getSavedMapping()[this.id()] === 'object' &&
//typeof audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' && typeof audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' &&
//typeof audio.getMapping() === 'object' && typeof audio.getMapping() === 'object' &&
//typeof audio.getMapping()[this.id()] === 'object' && typeof audio.getMapping()[this.id()] === 'object' &&
//typeof audio.getMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' && typeof audio.getMapping()[this.id()][`fontVariationAxes.${axes[a].name}`] === 'object' &&
//tp.getPanel() !== null) { tp.getPanel() !== null) {
////doThese.push(() => { //doThese.push(() => {
////audio.removeAudioOptions(this, `fontVariationAxes.${axes[a].name}`); //audio.removeAudioOptions(this, `fontVariationAxes.${axes[a].name}`);
////audio.removeAudioMapping(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}`].min_out = axes[a].minValue;
////audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`].max_out = axes[a].maxValue; //audio.getSavedMapping()[this.id()][`fontVariationAxes.${axes[a].name}`].max_out = axes[a].maxValue;
////audio.addAudioMapping(this, `fontVariationAxes.${axes[a].name}`); //audio.addAudioMapping(this, `fontVariationAxes.${axes[a].name}`);
////audio.addAudioOptions(this, `fontVariationAxes.${axes[a].name}`); //audio.addAudioOptions(this, `fontVariationAxes.${axes[a].name}`);
////}); //});
//} }
} else { } else {
console.log('js::layer::selectFont', 'this axis is insane, abort', axes[a]); console.log('js::layer::selectFont', 'this axis is insane, abort', axes[a]);
} }