Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Prevent overlaps when moving/resizing animations #32

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Prevent overlaps when moving/resizing animations #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
479c69b
Prevent overlaps when moving animations
Bioruebe Jul 31, 2018
9d251ea
Prevent overlaps when resizing animations
Bioruebe Aug 1, 2018
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
Prev Previous commit
Prevent overlaps when resizing animations
  • Loading branch information
@Bioruebe
Bioruebe committed Aug 1, 2018
commit 9d251ea500c0a8bbdcee5f25525eef2cc1ddd297
133 changes: 54 additions & 79 deletions editor/js/Timeline.Animations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,45 +34,40 @@ Timeline.Animations = function ( editor ) {

movementX = event.movementX | event.webkitMovementX | event.mozMovementX | 0;

var start = animation.start + movementX / scale;
var end = animation.end + movementX / scale;
var layer = animation.layer;
if (start < 0) {
var pos = animation.getPosition();
pos.start += movementX / scale;
pos.end += movementX / scale;

if (pos.start < 0) {

var offset = -animation.start;

start += offset;
end += offset;
pos.start += offset;
pos.end += offset;

}

movementY += event.movementY | event.webkitMovementY | event.mozMovementY | 0;

if (movementY >= 30) {

layer += 1;
pos.layer += 1;
movementY = 0;

}

if (movementY <= -30) {

layer = Math.max(0, layer - 1);
pos.layer = Math.max(0, pos.layer - 1);
movementY = 0;

}

if (editor.getOverlappingAnimation({
start: start,
end: end,
layer: layer,
id: animation.id
})) return false;
if (editor.getOverlappingAnimation(pos)) return false;

animation.start = start;
animation.end = end;
animation.layer = layer;
animation.start = pos.start;
animation.end = pos.end;
animation.layer = pos.layer;

signals.animationModified.dispatch( animation );

Expand All @@ -90,44 +85,56 @@ Timeline.Animations = function ( editor ) {

}, false );

var resizeLeft = document.createElement( 'div' );
resizeLeft.style.position = 'absolute';
resizeLeft.style.width = '6px';
resizeLeft.style.height = '30px';
resizeLeft.style.cursor = 'w-resize';
resizeLeft.addEventListener( 'mousedown', function ( event ) {

var resizeOnMouseDown = function (event, left) {

event.stopPropagation();

var movementX = 0;

function onMouseMove( event ) {

function onMouseMove(event) {
movementX = event.movementX | event.webkitMovementX | event.mozMovementX | 0;

animation.start += movementX / scale;

signals.animationModified.dispatch( animation );

}

function onMouseUp( event ) {

if ( Math.abs( movementX ) < 2 ) {

editor.selectAnimation( animation );


let pos = animation.getPosition();

if (left) {
pos.start += movementX / scale;
if (pos.start > pos.end - 0.1) return;
}
else {
pos.end += movementX / scale;
}

// If the animation would overlap any other on the same layer, don't increase the size.
if (editor.getOverlappingAnimation(pos)) return;

if (left) {
animation.start = pos.start;
}
else {
animation.end = pos.end;
}

document.removeEventListener( 'mousemove', onMouseMove );
document.removeEventListener( 'mouseup', onMouseUp );

signals.animationModified.dispatch(animation);
}

function onMouseUp(event) {
if (Math.abs(movementX) < 2) editor.selectAnimation(animation);

document.addEventListener( 'mousemove', onMouseMove, false );
document.addEventListener( 'mouseup', onMouseUp, false );
document.removeEventListener('mousemove', onMouseMove);
document.removeEventListener('mouseup', onMouseUp);
}

}, false );
document.addEventListener('mousemove', onMouseMove, false);
document.addEventListener('mouseup', onMouseUp, false);
}

var resizeLeft = document.createElement( 'div' );
resizeLeft.style.position = 'absolute';
resizeLeft.style.width = '6px';
resizeLeft.style.height = '30px';
resizeLeft.style.cursor = 'w-resize';
resizeLeft.addEventListener( 'mousedown', (event) => resizeOnMouseDown(event, true), false );
dom.appendChild( resizeLeft );

var name = document.createElement( 'div' );
Expand All @@ -141,39 +148,7 @@ Timeline.Animations = function ( editor ) {
resizeRight.style.width = '6px';
resizeRight.style.height = '30px';
resizeRight.style.cursor = 'e-resize';
resizeRight.addEventListener( 'mousedown', function ( event ) {

event.stopPropagation();

var movementX = 0;

function onMouseMove( event ) {

movementX = event.movementX | event.webkitMovementX | event.mozMovementX | 0;

animation.end += movementX / scale;

signals.animationModified.dispatch( animation );

}

function onMouseUp( event ) {

if ( Math.abs( movementX ) < 2 ) {

editor.selectAnimation( animation );

}

document.removeEventListener( 'mousemove', onMouseMove );
document.removeEventListener( 'mouseup', onMouseUp );

}

document.addEventListener( 'mousemove', onMouseMove, false );
document.addEventListener( 'mouseup', onMouseUp, false );

}, false );
resizeRight.addEventListener( 'mousedown', (event) => resizeOnMouseDown(event, false), false );
dom.appendChild( resizeRight );

//
Expand Down
11 changes: 11 additions & 0 deletions src/Frame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,17 @@ var FRAME = {
this.layer = layer;
this.effect = effect;
this.enabled = enabled;

this.getPosition = function() {

return {
start: this.start,
end: this.end,
layer: this.layer,
id: this.id
};

};

};

Expand Down