skyler
/
Lightningbeam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix positions of grouped objects

This commit is contained in:
Skyler Lehmkuhl 2025-01-03 17:58:14 -05:00
parent 59c7cedb4d
commit 7d9b326f66
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main.js
View File

@ -684,8 +684,6 @@ let actions = {
} else if (item.type == "GraphicsObject") { } else if (item.type == "GraphicsObject") {
const newObj = GraphicsObject.fromJSON(item); const newObj = GraphicsObject.fromJSON(item);
object.addObject(newObj); object.addObject(newObj);
console.log(newObj.idx);
console.log(frame.keys);
} }
} }
// newObj.idx = action.uuid // newObj.idx = action.uuid
@ -1371,6 +1369,9 @@ let actions = {
let serializableShapes = []; let serializableShapes = [];
let serializableObjects = []; let serializableObjects = [];
let bbox; let bbox;
console.log("&&&&&&&");
console.log(context.shapeselection);
console.log(context.selection);
for (let shape of context.shapeselection) { for (let shape of context.shapeselection) {
serializableShapes.push(shape.idx); serializableShapes.push(shape.idx);
if (bbox == undefined) { if (bbox == undefined) {
@ -1407,6 +1408,7 @@ let actions = {
}, },
execute: (action) => { execute: (action) => {
// your code here // your code here
console.log(action);
let group = new GraphicsObject(action.groupUuid); let group = new GraphicsObject(action.groupUuid);
let parent = pointerList[action.parent]; let parent = pointerList[action.parent];
let frame = action.frame let frame = action.frame
@ -1420,17 +1422,16 @@ let actions = {
} }
for (let objectIdx of action.objects) { for (let objectIdx of action.objects) {
let object = pointerList[objectIdx]; let object = pointerList[objectIdx];
group.addObject(object, object.x - position.x, object.y - position.y); console.log(object.name, object.x, action.position.x);
group.addObject(
object,
frame.keys[objectIdx].x - action.position.x,
frame.keys[objectIdx].y - action.position.y,
);
parent.removeChild(object); parent.removeChild(object);
} }
parent.addObject(group, action.position.x, action.position.y); parent.addObject(group, action.position.x, action.position.y, frame);
if ( context.selection = [group];
context.activeObject == parent &&
context.selection.length == 0 &&
context.shapeselection.length == 0
) {
context.selection.push(group);
}
updateUI(); updateUI();
updateInfopanel(); updateInfopanel();
}, },
@ -1677,8 +1678,6 @@ let actions = {
select: { select: {
create: () => { create: () => {
redoStack.length = 0; redoStack.length = 0;
console.log(context.oldshapeselection);
console.log(context.shapeselection);
if ( if (
arraysAreEqual(context.oldselection, context.selection) && arraysAreEqual(context.oldselection, context.selection) &&
arraysAreEqual(context.oldshapeselection, context.shapeselection) arraysAreEqual(context.oldshapeselection, context.shapeselection)
@ -3372,11 +3371,17 @@ class GraphicsObject {
mouse.y -= this.y; mouse.y -= this.y;
return mouse; return mouse;
} }
addObject(object, x = 0, y = 0) { addObject(object, x = 0, y = 0, frame = undefined) {
console.log(x, y);
if (frame == undefined) {
frame = this.currentFrame;
}
this.children.push(object); this.children.push(object);
object.parent = this; object.parent = this;
object.x = x;
object.y = y;
let idx = object.idx; let idx = object.idx;
this.currentFrame.keys[idx] = { frame.keys[idx] = {
x: x, x: x,
y: y, y: y,
rotation: 0, rotation: 0,
@ -3637,6 +3642,8 @@ function decrementFrame() {
function _newFile(width, height, fps) { function _newFile(width, height, fps) {
root = new GraphicsObject("root"); root = new GraphicsObject("root");
context.objectStack = [root]; context.objectStack = [root];
context.selection = [];
context.shapeselection = [];
config.fileWidth = width; config.fileWidth = width;
config.fileHeight = height; config.fileHeight = height;
config.framerate = fps; config.framerate = fps;
@ -5458,7 +5465,6 @@ function timeline() {
mouse.y -= gutterHeight; mouse.y -= gutterHeight;
timeline_cvs.clicked_frame = Math.floor(mouse.x / frameWidth); timeline_cvs.clicked_frame = Math.floor(mouse.x / frameWidth);
context.activeObject.setFrameNum(timeline_cvs.clicked_frame); context.activeObject.setFrameNum(timeline_cvs.clicked_frame);
console.log(context.activeObject.currentFrame.shapes[0].idx);
const layerIdx = Math.floor(mouse.y / layerHeight); const layerIdx = Math.floor(mouse.y / layerHeight);
if (layerIdx < context.activeObject.layers.length && layerIdx >= 0) { if (layerIdx < context.activeObject.layers.length && layerIdx >= 0) {
const layer = const layer =