Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion scripts/smoke-cljs-blink.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ if (!Array.isArray(curve) || curve.length !== 7) {
throw new Error(`Expected AU 43 curve with seven points, received ${curve?.length ?? 'none'}`);
}

if (snippet.snippetCategory !== 'blink' ||
snippet.snippetPriority !== 100 ||
snippet.snippetPlaybackRate !== 1.0 ||
snippet.snippetIntensityScale !== 1.0) {
throw new Error(`Expected blink snippet metadata to stay stable, received ${JSON.stringify(snippet)}`);
}

if (opts?.autoPlay !== true) {
throw new Error('Expected blink snippet to request autoPlay');
}
Expand All @@ -52,10 +59,20 @@ if (state.scheduledBlinkCount !== 1) {
throw new Error(`Expected scheduledBlinkCount to be 1, received ${state.scheduledBlinkCount}`);
}

agency.setRandomness(1);
agency.triggerBlink({ intensity: 0.4, duration: 0.2, randomness: 0 });

const overrideCurve = scheduled[1].snippet.curves?.['43'];
if (scheduled[1].snippet.maxTime !== 0.2 || overrideCurve?.[2]?.intensity !== 0.4) {
throw new Error(`Expected per-trigger blink overrides to ignore configured randomness, received ${JSON.stringify(scheduled[1])}`);
}

const manualScheduledCount = scheduled.length;
agency.setRandomness(0);
agency.enable();
await wait(1100);

if (scheduled.length < 2) {
if (scheduled.length <= manualScheduledCount) {
throw new Error(`Expected automatic blink after enable, received ${scheduled.length} scheduled snippets`);
}

Expand Down
5 changes: 4 additions & 1 deletion src-cljs/latticework/blink.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@
0.05
1.0
(protocol/maybe-number (:duration overrides) (:duration current)))
randomness (:randomness current)
randomness (protocol/clamp
0
1
(protocol/maybe-number (:randomness overrides) (:randomness current)))
name (str "blink_" (.round js/Math (protocol/now-ms)))]
{:name name
:curves (build-blink-curves intensity duration randomness)
Expand Down
1 change: 1 addition & 0 deletions types/cljs.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ export interface BlinkAgencyConfig {
export interface BlinkTriggerOptions {
intensity?: number;
duration?: number;
randomness?: number;
}

export interface BlinkAgency {
Expand Down
Loading