update theatre
dependencies hashes: openFrameworks d78075f4bca6be2a2533c6e51a75cc1f18404501 ofxMsdfgen e14da13d02c4dff04fb69d7923469f606924e6c3 ofxGPUFont d482bb7cbdf6b296fa4ab5abcf73fb5ff8c8b239 ofxVariableLab 0b5f9bdebc1e5550621957e73c040c258ec6317b ofxProfiler a868e34fa1a79189dd4fbdede2938e308535e5e8 theatre 78a67ee6650d846fe5cc4770770b1511328033e6
This commit is contained in:
parent
18300baf46
commit
8750151b7d
2 changed files with 8 additions and 6 deletions
|
@ -50429,14 +50429,16 @@ ${content}</tr>
|
||||||
max = Math.max(n3, max);
|
max = Math.max(n3, max);
|
||||||
}
|
}
|
||||||
keyframes.forEach((cur, i3) => {
|
keyframes.forEach((cur, i3) => {
|
||||||
const curVal = valueInProp(cur.value, propConfig);
|
const cv = typeof cur.value === "boolean" ? cur.value ? 1 : 0 : cur.value;
|
||||||
|
const curVal = valueInProp(cv, propConfig);
|
||||||
check(curVal);
|
check(curVal);
|
||||||
if (!cur.connectedRight)
|
if (!cur.connectedRight)
|
||||||
return;
|
return;
|
||||||
const next = keyframes[i3 + 1];
|
const next = keyframes[i3 + 1];
|
||||||
if (!next)
|
if (!next)
|
||||||
return;
|
return;
|
||||||
const diff = (typeof next.value === "number" ? next.value : 1) - curVal;
|
const nv = typeof next.value === "boolean" ? next.value ? 1 : 0 : next.value;
|
||||||
|
const diff = (typeof nv === "number" ? nv : 1) - curVal;
|
||||||
check(curVal + cur.handles[3] * diff);
|
check(curVal + cur.handles[3] * diff);
|
||||||
check(curVal + next.handles[1] * diff);
|
check(curVal + next.handles[1] * diff);
|
||||||
});
|
});
|
||||||
|
@ -50492,7 +50494,7 @@ ${content}</tr>
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
const extremumSpace = (0, import_react185.useMemo)(() => {
|
const extremumSpace = (0, import_react185.useMemo)(() => {
|
||||||
const extremums = propConfig.type === "number" ? calculateScalarExtremums(trackData.keyframes, propConfig) : calculateNonScalarExtremums(trackData.keyframes);
|
const extremums = propConfig.type === "number" || propConfig.type === "boolean" ? calculateScalarExtremums(trackData.keyframes, propConfig) : calculateNonScalarExtremums(trackData.keyframes);
|
||||||
const fromValueSpace = (val3) => (val3 - extremums[0]) / (extremums[1] - extremums[0]);
|
const fromValueSpace = (val3) => (val3 - extremums[0]) / (extremums[1] - extremums[0]);
|
||||||
const toValueSpace = (ex) => extremums[0] + deltaToValueSpace(ex);
|
const toValueSpace = (ex) => extremums[0] + deltaToValueSpace(ex);
|
||||||
const deltaToValueSpace = (ex) => ex * (extremums[1] - extremums[0]);
|
const deltaToValueSpace = (ex) => ex * (extremums[1] - extremums[0]);
|
||||||
|
@ -50517,7 +50519,7 @@ ${content}</tr>
|
||||||
layoutP,
|
layoutP,
|
||||||
sheetObject,
|
sheetObject,
|
||||||
trackId,
|
trackId,
|
||||||
isScalar: propConfig.type === "number",
|
isScalar: propConfig.type === "number" || propConfig.type === "boolean",
|
||||||
key: kf.id,
|
key: kf.id,
|
||||||
extremumSpace: cachedExtremumSpace.current,
|
extremumSpace: cachedExtremumSpace.current,
|
||||||
color: color2
|
color: color2
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue