Skip to content
Open
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
18 changes: 15 additions & 3 deletions src/kiri/mode/cam/app/anim-2d.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ export function animate(api, delay) {
speed: anim.speed,
trans: anim.trans,
model: anim.model,
shade: anim.shade
shade: anim.shade,
speedup: anim.speedup,
speeddn: anim.speeddn,
});
Object.assign(label, {
progress: anim.progress,
Expand All @@ -76,6 +78,8 @@ export function animate(api, delay) {
button.trans.onclick = toggleTrans;
button.model.onclick = toggleModel;
button.shade.onclick = toggleStock;
button.speedup.onclick = increaseSpeed;
button.speeddn.onclick = decreaseSpeed;
button.play.style.display = '';
button.pause.style.display = 'none';

Expand Down Expand Up @@ -175,6 +179,14 @@ function toggleStock(ev,bool,set) {
return api.event.emit('cam.stock.toggle', bool ?? undefined);
}

function increaseSpeed() {
updateSpeed(1);
}

function decreaseSpeed() {
updateSpeed(-1);
}

function toggleTrans(ev,bool) {
bool = api.local.toggle('cam.anim.trans', bool);
material.transparent = bool;
Expand Down Expand Up @@ -228,8 +240,8 @@ function handleGridUpdate(data) {
function updateSpeed(inc = 0) {
if (inc === Infinity) {
speedIndex = speedMax;
} else if (inc > 0) {
speedIndex = (speedIndex + inc) % speedValues.length;
} else if (inc !== 0) {
speedIndex = Math.min(Math.max(speedIndex + inc, 0), speedValues.length - 1);
}
api.local.set('cam.anim.speed', speedIndex);
speed = speedValues[speedIndex];
Expand Down
4 changes: 4 additions & 0 deletions src/kiri/mode/cam/app/init-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ export function menu() {
anim.step = newButton(null,"anim.step",{icon:'<i class="fas fa-step-forward"></i>',title:"single step"}),
anim.speed = newButton(null,"anim.fast",{icon:'<i class="fas fa-forward"></i>',title:"toggle speed"}),
anim.labspd = newValue(3, {class:"center padleft"}),
newRow([
anim.speedup = newButton(null,'anim.speedup',{icon:'<i class="fa-solid fa-arrow-up"></i>',title:"increase speed"}),
anim.speeddn = newButton(null,'anim.speeddn',{icon:'<i class="fa-solid fa-arrow-down"></i>',title:"decrease speed"})
], {class: 'speed-controls padleft'}),
anim.labx = newLabel("X", {class:"padleft"}),
anim.valx = newValue(7, {class:"center"}),
anim.laby = newLabel("Y", {class:"padleft"}),
Expand Down
11 changes: 11 additions & 0 deletions web/kiri/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2153,6 +2153,17 @@ details[open] summary::after {
color: #333;
font-size: 30px;
}
#layer-animate .speed-controls {
flex-direction: column;
justify-content: space-between;
}
#layer-animate .speed-controls button {
width: auto;
padding: 0 4px;
}
#layer-animate .speed-controls svg {
font-size: 15px;
}
#layer-animate .padleft {
margin-left: 8px !important;
}
Expand Down