Skip to content

Make tweening extension use project clock #191

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

Open
cicerorph wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Make tweening extension use project clock #191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7af7a5
fix: use project clock
cicerorph Jun 9, 2026
2ffcd01
do not let copilot add comments
cicerorph Jun 9, 2026
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
99 changes: 54 additions & 45 deletions src/extensions/jg_tween/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ const quint = (x, dir) => {
case "in": return x * x * x * x * x;
case "out": return 1 - Math.pow(1 - x, 5);
case "in out": return x < 0.5 ? 16 * x * x * x * x * x : 1 - Math.pow(-2 * x + 2, 5) / 2;
default:
return 0;
default: return 0;
}
};

Expand Down Expand Up @@ -137,6 +136,7 @@ class Tween {
*/
this.runtime = runtime;
}

getInfo() {
return {
id: "jgTween",
Expand Down Expand Up @@ -310,7 +310,7 @@ class Tween {
SEC: {
type: ArgumentType.NUMBER,
defaultValue: 1,
},
},
}
},
{
Expand Down Expand Up @@ -379,32 +379,34 @@ class Tween {
// First run, need to start timer
util.yield();

if (util.stackTimerNeedsInit()) {
const durationMS = Math.max(0, 1000 * Cast.toNumber(args.SEC));
util.startStackTimer(durationMS);
}
const easeMethod = Cast.toString(args.MODE);
const easeDirection = Cast.toString(args.DIRECTION);
const start = currentValue;
const end = Cast.toNumber(args[valueArgName]);
const durationSecs = Math.max(0, Cast.toNumber(args.SEC));

let easingFunction;
if (Object.prototype.hasOwnProperty.call(EasingMethods, easeMethod)) easingFunction = EasingMethods[easeMethod];
else easingFunction = EasingMethods.linear;

util.stackFrame[id] = {
easingFunction, easeDirection,
start, end, propertyName
start, end, propertyName,
startTime: this.runtime.ioDevices.clock.projectTimer(),
durationSecs
};
return start;
} else if (util.stackTimerFinished()) {
// Done
return util.stackFrame[id].end;
}
// Still running
}

const elapsed = this.runtime.ioDevices.clock.projectTimer() - state.startTime;

if (elapsed >= state.durationSecs) {
return state.end;
}

util.yield();

const progress = util.stackFrame.timer.timeElapsed() / util.stackFrame.duration;
const progress = elapsed / state.durationSecs;
const tweened = state.easingFunction(progress, state.easeDirection);
return interpolate(tweened, state.start, state.end);
}
Expand Down Expand Up @@ -454,6 +456,7 @@ class Tween {
PROPERTY: property
}, util);
}

tweenPropertyCancel(args, util) {
const property = args.PROPERTY;
const id = util.target.id;
Expand All @@ -478,40 +481,46 @@ class Tween {
}

tweenC(args, util) {
const id = "loopedVal";
const state = util.stackFrame[id];
if (!state) {
if (util.stackTimerNeedsInit()) {
const durationMS = Math.max(0, 1000 * Cast.toNumber(args.SEC));
util.startStackTimer(durationMS);
const id = "loopedVal";
const state = util.stackFrame[id];

if (!state) {
const easeMethod = Cast.toString(args.MODE);
const easeDirection = Cast.toString(args.DIRECTION);
const start = Cast.toNumber(args.START);
const end = Cast.toNumber(args.END);
const durationSecs = Math.max(0, Cast.toNumber(args.SEC));
const params = util.thread.tweenValue;
if (typeof params === "undefined") util.thread.stackFrames[0].tweenValue = start;
let easingFunction;
if (Object.prototype.hasOwnProperty.call(EasingMethods, easeMethod)) easingFunction = EasingMethods[easeMethod];
else easingFunction = EasingMethods.linear;

util.stackFrame[id] = {
easingFunction, easeDirection,
start, end,
startTime: this.runtime.ioDevices.clock.projectTimer(),
durationSecs
};
util.startBranch(1, true);
return;
}
const easeMethod = Cast.toString(args.MODE);
const easeDirection = Cast.toString(args.DIRECTION);
const start = Cast.toNumber(args.START);
const end = Cast.toNumber(args.END);
const params = util.thread.tweenValue;
if (typeof params === "undefined") util.thread.stackFrames[0].tweenValue = start;
let easingFunction;
if (Object.prototype.hasOwnProperty.call(EasingMethods, easeMethod)) easingFunction = EasingMethods[easeMethod];
else easingFunction = EasingMethods.linear;

util.stackFrame[id] = {
easingFunction, easeDirection,
start, end,
};
util.startBranch(1, true);
} else if (util.stackTimerFinished()) {
util.thread.stackFrames[0].tweenValue = util.stackFrame[id].end;
if (util.stackFrame[id].canContinue !== "stop") {
util.stackFrame[id].canContinue = "stop";
util.startBranch(1, true);

const elapsed = this.runtime.ioDevices.clock.projectTimer() - state.startTime;

if (elapsed >= state.durationSecs) {
util.thread.stackFrames[0].tweenValue = state.end;
if (state.canContinue !== "stop") {
state.canContinue = "stop";
util.startBranch(1, true);
}
return;
}
} else {
const progress = util.stackFrame.timer.timeElapsed() / util.stackFrame.duration;

const progress = elapsed / state.durationSecs;
const tweened = state.easingFunction(progress, state.easeDirection);
util.thread.stackFrames[0].tweenValue = interpolate(tweened, state.start, state.end);
if (util.stackFrame[id].canContinue !== "stop") util.startBranch(1, true);
}
util.thread.stackFrames[0].tweenValue = interpolate(tweened, state.start, state.end);
if (state.canContinue !== "stop") util.startBranch(1, true);
}

tweenVal(_, util) {
Expand Down