Skip to content

Fix fix modding t #1566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 16, 2025
Merged

Fix fix modding t #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d834128
Fix endpoint for sliders
drewyoungren Sep 3, 2025
5bfb9dc
Add play mode
drewyoungren Sep 4, 2025
dbae577
Add bounce/loop/once button
drewyoungren Sep 15, 2025
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
18 changes: 18 additions & 0 deletions media/src/form-components/PlayButtons.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
play = () => {},
pause,
rew,
clicker = () => {},
playMode = 'loop',
// animate,
} = $props();
</script>
Expand Down Expand Up @@ -32,6 +34,15 @@
<button class="btn rewbtn" onclick={rew} aria-label="rewind">
<i class="fa fa-fast-backward"></i>
</button>
<button class="btn modebtn" onclick={clicker} aria-label="play mode">
{#if playMode == 'loop'}
<i class="fa fa-retweet"></i>
{:else if playMode == 'once'}
<i class="fa fa-arrow-right"></i>
{:else}
<i class="fa fa-arrows-alt-h"></i>
{/if}
</button>
</div>

<style>
Expand All @@ -43,4 +54,11 @@
.btn {
color: white;
}
.modebtn {
width: 3em; /* or px if you prefer */
text-align: center;
}
/* .modebtn:hover {
border: 1px solid white;
} */
</style>
38 changes: 34 additions & 4 deletions media/src/objects/Curve.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
camera,
gridStep,
selected = $bindable(false),
playMode = 'loop',
} = $props();

title = title || `Curve ${++titleIndex}`;
Expand Down Expand Up @@ -163,15 +164,42 @@

let last;

function playModeCycle() {
if (playMode == 'once') {
playMode = 'loop';
} else if (playMode == 'loop') {
playMode = 'bounce';
} else {
playMode = 'once';
}
}

let modeSign = 1;

const update = (dt = 0) => {
const { a, b } = params;
// const { a, b } = params;

if (vizOptions.TNB) {
tau += dt / arrows.v.speed / (B - A);
tau += (modeSign * dt) / arrows.v.speed / (B - A);
} else {
tau += dt / (B - A);
tau += (modeSign * dt) / (B - A);
}
tau %= 1;
if (tau > 1) {
if (playMode == 'loop') {
tau %= 1;
} else if (playMode == 'once') {
tau = 1;
animation = false;
} else {
modeSign = -1;
tau = 2 - tau;
}
}
if (tau <= 0) {
modeSign = 1;
tau *= -1;
}

// const T = A + (B - A) * tau;

// uncomment this if we want aVal to be animated:
Expand Down Expand Up @@ -663,6 +691,8 @@
animation = false;
update();
}}
{playMode}
clicker={playModeCycle}
/>

{#if isDynamic}
Expand Down
50 changes: 39 additions & 11 deletions media/src/objects/Function.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
animate,
camera,
onClose = () => {},
playMode = 'loop',
} = $props();

// $inspect(camera);
Expand Down Expand Up @@ -577,6 +578,16 @@
*/
let isDynamic = $derived(dependsOn(params, 't'));

function playModeCycle() {
if (playMode == 'once') {
playMode = 'loop';
} else if (playMode == 'loop') {
playMode = 'bounce';
} else {
playMode = 'once';
}
}

$effect(() => {
[params.z, params.a, params.b, params.c, params.d];
untrack(updateSurface);
Expand Down Expand Up @@ -607,9 +618,25 @@
if (selected) untrack(flash);
});

let modeSign = 1;

const update = function (dt) {
tau += dt / (t1 - t0);
tau %= 1;
tau += (modeSign * dt) / (t1 - t0);
if (tau > 1) {
if (playMode == 'loop') {
tau %= 1;
} else if (playMode == 'once') {
tau = 1;
animation = false;
} else {
modeSign = -1;
tau = 2 - tau;
}
}
if (tau <= 0) {
modeSign = 1;
tau *= -1;
}

evolveSurface(tVal);

Expand Down Expand Up @@ -799,26 +826,25 @@
boxMesh.add(boxMeshEdges);

const updateBoxes = function () {
const { a, b, c, d} = params;
const { a, b, c, d } = params;
try {
[
[
math.evaluate(a),
math.evaluate(b),
math.evaluate(c),
math.evaluate(d),
];
} catch (e) {
console.error("Can't show integral boxes on nonconstant bounds",e);
console.error("Can't show integral boxes on nonconstant bounds", e);
return;
}

const [A, B, C, D] = [
math.evaluate(a),
math.evaluate(b),
math.evaluate(c),
math.evaluate(d),
];

math.evaluate(a),
math.evaluate(b),
math.evaluate(c),
math.evaluate(d),
];

// const t = T0 + tau * (T1 - T0);

Expand Down Expand Up @@ -1181,6 +1207,8 @@
evolveSurface(tVal);
render();
}}
{playMode}
clicker={playModeCycle}
/>
<!-- </div> -->
{/if}
Expand Down
33 changes: 31 additions & 2 deletions media/src/objects/Point.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
selectObject,
animate,
onClose = () => {},
playMode = 'loop',
} = $props();

let tau = $state(0);
Expand Down Expand Up @@ -106,6 +107,16 @@
let isDynamic = $derived(dependsOn(params, 't'));
let isDiscrete = $derived(dependsOn(params, 'n'));

function playModeCycle() {
if (playMode == 'once') {
playMode = 'loop';
} else if (playMode == 'loop') {
playMode = 'bounce';
} else {
playMode = 'once';
}
}

$effect(() => {
params;
updatePoint();
Expand Down Expand Up @@ -213,9 +224,25 @@

// texString1 = `t = ${Math.round(100 * T) / 100}`;

let modeSign = 1;

const update = (dt = 0) => {
tau += dt / (t1 - t0);
tau %= 1;
tau += (modeSign * dt) / (t1 - t0);
if (tau > 1) {
if (playMode == 'loop') {
tau %= 1;
} else if (playMode == 'once') {
tau = 1;
animation = false;
} else {
modeSign = -1;
tau = 2 - tau;
}
}
if (tau <= 0) {
modeSign = 1;
tau *= -1;
}
updatePoint(tVal);
};
// Start animating if animation changes (e.g. animating scene published)
Expand Down Expand Up @@ -308,6 +335,8 @@
tau = 0;
update();
}}
{playMode}
clicker={playModeCycle}
/>
<!-- </div> -->
{/if}
Expand Down
34 changes: 32 additions & 2 deletions media/src/objects/Surface.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
selectObject,
selectPoint,
animate = () => {},
playMode = 'loop',
} = $props();

let rNum = 10;
Expand Down Expand Up @@ -588,9 +589,36 @@
}
};

let modeSign = 1;

function playModeCycle() {
if (playMode == 'once') {
playMode = 'loop';
} else if (playMode == 'loop') {
playMode = 'bounce';
} else {
playMode = 'once';
}
}

const update = function (dt = 0) {
tau += dt / (t1 - t0);
tau %= 1;
tau += (modeSign * dt) / (t1 - t0);

if (tau > 1) {
if (playMode == 'loop') {
tau %= 1;
} else if (playMode == 'once') {
tau = 1;
animation = false;
} else {
modeSign = -1;
tau = 2 - tau;
}
}
if (tau <= 0) {
modeSign = 1;
tau *= -1;
}

if (isDynamic) evolveSurface(tVal);
if (isRhoDynamic) {
Expand Down Expand Up @@ -1062,6 +1090,8 @@
tau = 0;
update();
}}
{playMode}
clicker={playModeCycle}
/>
{/if}

Expand Down
37 changes: 31 additions & 6 deletions media/src/objects/Vector.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
render,
onClose,
gridStep,
playMode = 'loop',
} = $props();

let minimize = $state(false);
Expand Down Expand Up @@ -143,6 +144,16 @@
let isDynamic = $derived(dependsOn(params, 't'));
let isDiscrete = $derived(dependsOn(params, 'n'));

function playModeCycle() {
if (playMode == 'once') {
playMode = 'loop';
} else if (playMode == 'loop') {
playMode = 'bounce';
} else {
playMode = 'once';
}
}

$effect(updateVector);

// recolor on demand
Expand Down Expand Up @@ -250,13 +261,25 @@
return valuation;
};

const update = (dt = 0) => {
const { t0, t1 } = params;
const A = math.parse(t0).evaluate();
const B = math.parse(t1).evaluate();
let modeSign = 1;

tau += dt / (B - A);
tau %= 1;
const update = (dt = 0) => {
tau += (modeSign * dt) / (t1 - t0);
if (tau > 1) {
if (playMode == 'loop') {
tau %= 1;
} else if (playMode == 'once') {
tau = 1;
animation = false;
} else {
modeSign = -1;
tau = 2 - tau;
}
}
if (tau <= 0) {
modeSign = 1;
tau *= -1;
}

updateVector(tVal);
};
Expand Down Expand Up @@ -363,6 +386,8 @@
tau = 0;
update();
}}
{playMode}
clicker={playModeCycle}
/>
<!-- </div> -->
{/if}
Expand Down
2 changes: 1 addition & 1 deletion media/src/stories/FluxIntegral.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
// const currentTime = $tickTock;
last = last || $tickTock;
tau += $tickTock - last;
tau %= 1;
if (tau > 1) tau %= 1;
updateTau(tau);
last = $tickTock;
}
Expand Down