Collapsing Functionality Fully Implemented

This commit is contained in:
Luis Fernando Molina committed 2019-07-13 15:57:50 +02:00
1 parent d7e31b4d8e
commit 656dc3be4a
3 files changed
+14 -7

No files matched your search

+10 -7
View File
@@ -24,6 +24,7 @@ function newFloatingObject () {
isFrozen: false,
isTensed: false,
isCollapsed: false,
isParentCollapsed: false,
frozenManually: false,
collapsedManually: false,
getPinStatus: getPinStatus,
@@ -102,7 +103,7 @@ function newFloatingObject () {
}
function getContainer (point) {
if (thisObject.isCollapsed === true && thisObject.collapsedManually === false) { return }
if ((thisObject.isCollapsed === true && thisObject.collapsedManually === false) || thisObject.isParentCollapsed === true) { return }
let container
container = thisObject.payload.uiObject.getContainer(point)
@@ -192,9 +193,10 @@ function newFloatingObject () {
}
function collapsePhysics () {
if (thisObject.collapsedManually === false) {
let parent = thisObject.payload.chainParent
if (parent !== undefined) {
let parent = thisObject.payload.chainParent
if (parent !== undefined) {
thisObject.isParentCollapsed = parent.payload.floatingObject.isCollapsed
if (thisObject.collapsedManually === false) {
thisObject.isCollapsed = parent.payload.floatingObject.isCollapsed
}
}
@@ -337,17 +339,17 @@ function newFloatingObject () {
}
function drawBackground () {
if (thisObject.isCollapsed === true && thisObject.collapsedManually === false) { return }
if ((thisObject.isCollapsed === true && thisObject.collapsedManually === false) || thisObject.isParentCollapsed === true) { return }
thisObject.payload.uiObject.drawBackground()
}
function drawMiddleground () {
if (thisObject.isCollapsed === true && thisObject.collapsedManually === false) { return }
if ((thisObject.isCollapsed === true && thisObject.collapsedManually === false) || thisObject.isParentCollapsed === true) { return }
thisObject.payload.uiObject.drawMiddleground()
}
function drawForeground () {
if (thisObject.isCollapsed === true && thisObject.collapsedManually === false) { return }
if ((thisObject.isCollapsed === true && thisObject.collapsedManually === false) || thisObject.isParentCollapsed === true) { return }
thisObject.payload.uiObject.drawForeground()
}
@@ -459,3 +461,4 @@ function newFloatingObject () {
function updateRadius () {
}
}
+3
View File
@@ -51,6 +51,9 @@ function newStrategyPartConstructor () {
if (payload.node.savedPayload.floatingObject.isFrozen === true) {
floatingObject.freezeToggle()
}
if (payload.node.savedPayload.floatingObject.isCollapsed === true) {
floatingObject.collapseToggle()
}
if (payload.node.savedPayload.floatingObject.isTensed === true) {
floatingObject.tensionToggle()
}
@@ -323,6 +323,7 @@ function newStringifyNode () {
floatingObject: {
isPinned: node.payload.floatingObject.isPinned,
isFrozen: (node.payload.floatingObject.isFrozen && node.payload.floatingObject.frozenManually),
isCollapsed: (node.payload.floatingObject.isCollapsed && node.payload.floatingObject.collapsedManually),
isTensed: (node.payload.floatingObject.isTensed && node.payload.floatingObject.tensedManually)
},
uiObject: {