Edit objects
This commit is contained in:
parent
4ce9ace70a
commit
b78362243a
43
src/main.js
43
src/main.js
|
|
@ -1761,6 +1761,7 @@ class GraphicsObject {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (let child of layer.children) {
|
for (let child of layer.children) {
|
||||||
|
if (child==context.activeObject) continue;
|
||||||
let idx = child.idx
|
let idx = child.idx
|
||||||
if (idx in frame.keys) {
|
if (idx in frame.keys) {
|
||||||
child.x = frame.keys[idx].x;
|
child.x = frame.keys[idx].x;
|
||||||
|
|
@ -1885,6 +1886,7 @@ class GraphicsObject {
|
||||||
}
|
}
|
||||||
addObject(object, x=0, y=0) {
|
addObject(object, x=0, y=0) {
|
||||||
this.children.push(object)
|
this.children.push(object)
|
||||||
|
object.parent = this
|
||||||
let idx = object.idx
|
let idx = object.idx
|
||||||
this.currentFrame.keys[idx] = {
|
this.currentFrame.keys[idx] = {
|
||||||
x: x,
|
x: x,
|
||||||
|
|
@ -2867,6 +2869,42 @@ function stage() {
|
||||||
}
|
}
|
||||||
updateUI()
|
updateUI()
|
||||||
})
|
})
|
||||||
|
stage.addEventListener("dblclick", (e) => {
|
||||||
|
context.mouseDown = false
|
||||||
|
context.dragging = false
|
||||||
|
context.dragDirection = undefined
|
||||||
|
context.selectionRect = undefined
|
||||||
|
let mouse = getMousePos(stage, e)
|
||||||
|
modeswitcher:
|
||||||
|
switch(mode) {
|
||||||
|
case "select":
|
||||||
|
for (let i=context.activeObject.children.length-1; i>=0; i--) {
|
||||||
|
let child = context.activeObject.children[i]
|
||||||
|
if (!(child.idx in context.activeObject.currentFrame.keys)) continue;
|
||||||
|
if (hitTest(mouse, child)) {
|
||||||
|
context.activeObject = child;
|
||||||
|
context.selection = [];
|
||||||
|
context.shapeselection = [];
|
||||||
|
updateUI()
|
||||||
|
updateLayers()
|
||||||
|
updateMenu()
|
||||||
|
break modeswitcher;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// we didn't click on a child, go up a level
|
||||||
|
if (context.activeObject.parent) {
|
||||||
|
context.selection = [context.activeObject]
|
||||||
|
context.shapeselection = []
|
||||||
|
context.activeObject = context.activeObject.parent
|
||||||
|
updateUI()
|
||||||
|
updateLayers()
|
||||||
|
updateMenu()
|
||||||
|
}
|
||||||
|
break
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
})
|
||||||
return scroller
|
return scroller
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3153,6 +3191,11 @@ function updateUI() {
|
||||||
|
|
||||||
context.ctx = ctx;
|
context.ctx = ctx;
|
||||||
root.draw(context)
|
root.draw(context)
|
||||||
|
if (context.activeObject != root) {
|
||||||
|
ctx.fillStyle = "rgba(255,255,255,0.5)"
|
||||||
|
ctx.fillRect(0,0,fileWidth,fileHeight)
|
||||||
|
context.activeObject.draw(context)
|
||||||
|
}
|
||||||
if (context.activeShape) {
|
if (context.activeShape) {
|
||||||
context.activeShape.draw(context)
|
context.activeShape.draw(context)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue