fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings and Style

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2020-10-07 17:54:02 +02:00
1 parent 0ecb2c7ae1
commit d7b9e3e682
6 files changed
+14 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

FloatingSpace/CircularMenu.js
+1 -1
View File
@@ -189,7 +189,7 @@ function newCircularMenu() {
function onFocus() {
for (let i = 0; i < menuItems.length; i++) {
let menuItem = menuItems[i]
menuItem.targetRadius = menuItem.rawRadius * 1.5 * canvas.floatingSpace.settings.node.menuItem.radiusPercentage / 100
menuItem.targetRadius = Math.trunc(menuItem.rawRadius * 1.5)
menuItem.isDeployed = true
}
thisObject.isDeployed = true
FloatingSpace/CircularMenuItem.js
+3 -2
View File
@@ -191,6 +191,7 @@ function newCircularMenuItem() {
} else {
radiusGrowthFactor = 3.2
}
radiusGrowthFactor = radiusGrowthFactor * canvas.floatingSpace.settings.node.menuItem.radiusPercentage / 100
thisObject.container.frame.position.x =
thisObject.payload.floatingObject.targetRadius *
@@ -201,8 +202,8 @@ function newCircularMenuItem() {
thisObject.container.frame.position.y =
thisObject.payload.floatingObject.targetRadius *
radiusGrowthFactor / 7
* Math.sin(toRadians(thisObject.angle)) -
thisObject.container.frame.height / 2
* Math.sin(toRadians(thisObject.angle))
- thisObject.container.frame.height / 2
}
function disablePhysics() {
FloatingSpace/FloatingLayer.js
+9 -3
View File
@@ -274,7 +274,8 @@ function newFloatingLayer() {
makeVisible()
makeInvisible()
visiblePhysics()
applyPhysics()
enginePhysics()
proximityPhysics()
function visiblePhysics() {
for (let i = 0; i < visibleFloatingObjects.length; i++) {
@@ -283,7 +284,13 @@ function newFloatingLayer() {
}
}
function applyPhysics() {
function proximityPhysics(){
for (let i = 0; i < visibleFloatingObjects.length; i++) {
proximityBetweenFloatingObjects(i)
}
}
function enginePhysics() {
/* This function makes all the calculations to apply phisycs on all visible floatingObjects in this layer. */
try {
@@ -378,7 +385,6 @@ function newFloatingLayer() {
gravityForce(floatingObject, payload)
proximityBetweenFloatingObjects(i)
}
} catch (err) {
if (ERROR_LOG === true) { logger.write('[ERROR] physics -> applyPhysics -> err= ' + err.stack) }
FloatingSpace/FloatingObject.js
-24
View File
@@ -56,7 +56,6 @@ function newFloatingObject() {
initializeRadius: initializeRadius,
initializeImageSize: initializeImageSize,
initializeFontSize: initializeFontSize,
initializeHierarchyRing: initializeHierarchyRing,
initializeCurrentPosition: initializeCurrentPosition,
radomizeCurrentSpeed: radomizeCurrentSpeed,
drawBackground: drawBackground,
@@ -567,16 +566,6 @@ function newFloatingObject() {
thisObject.currentFontSize = thisObject.targetFontSize
}
if (Math.abs(thisObject.currentHierarchyRing - thisObject.targetHierarchyRing) >= ANIMATION_STEP) {
if (thisObject.currentHierarchyRing < thisObject.targetHierarchyRing) {
thisObject.currentHierarchyRing = thisObject.currentHierarchyRing + ANIMATION_STEP
} else {
thisObject.currentHierarchyRing = thisObject.currentHierarchyRing - ANIMATION_STEP
}
} else {
thisObject.currentHierarchyRing = thisObject.targetHierarchyRing
}
/* Floating object position in screen coordinates */
thisObject.payload.position.x = thisObject.container.frame.position.x
thisObject.payload.position.y = thisObject.container.frame.position.y
@@ -619,7 +608,6 @@ function newFloatingObject() {
thisObject.currentMass = thisObject.rawMass * canvas.floatingSpace.settings.node.massPercentage / 100
thisObject.targetImageSize = thisObject.rawImageSize * 2.0
thisObject.targetFontSize = thisObject.rawFontSize * 2.0
thisObject.targetHierarchyRing = thisObject.rawHierarchyRing * 8.0
thisObject.payload.uiObject.container.eventHandler.raiseEvent('onFocus', point)
@@ -639,7 +627,6 @@ function newFloatingObject() {
thisObject.currentMass = thisObject.rawMass * canvas.floatingSpace.settings.node.massPercentage / 100
thisObject.targetImageSize = thisObject.rawImageSize * 1
thisObject.targetFontSize = thisObject.rawFontSize * 1
thisObject.targetHierarchyRing = thisObject.rawHierarchyRing * 1
thisObject.payload.uiObject.container.eventHandler.raiseEvent('onNotFocus', thisObject.container)
@@ -749,17 +736,6 @@ function newFloatingObject() {
thisObject.currentFontSize = size / 3
}
function initializeHierarchyRing(suggestedValue) {
let radius = suggestedValue
if (radius < 3) {
radius = 3
}
thisObject.rawHierarchyRing = radius
thisObject.targetHierarchyRing = radius
thisObject.currentHierarchyRing = radius
}
function initializeCurrentPosition(arroundPoint) {
let position = {}
FloatingSpace/UiObject.js
+1 -2
View File
@@ -564,7 +564,6 @@ function newUiObject() {
function chainDetachingPhysics() {
if (isDragging !== true) { return }
if (thisObject.payload.floatingObject.isFrozen === true) { return }
if (rightDragging === false) { return }
let distanceToChainParent = Math.sqrt(Math.pow(thisObject.payload.position.x - thisObject.payload.targetPosition.x, 2) + Math.pow(thisObject.payload.position.y - thisObject.payload.targetPosition.y, 2))
@@ -1977,7 +1976,7 @@ function newUiObject() {
/* Hierarchy Head Ring */
if (nodeDefinition.isHierarchyHead === true) {
VISIBLE_RADIUS = thisObject.payload.floatingObject.currentHierarchyRing * 2.6
VISIBLE_RADIUS = thisObject.payload.floatingObject.container.frame.radius
if (canvas.floatingSpace.inMapMode === true) {
VISIBLE_RADIUS = canvas.floatingSpace.transformRadiusToMap(VISIBLE_RADIUS)
}
FloatingSpace/UiObjectConstructor.js
-8
View File
@@ -490,7 +490,6 @@ function newUiObjectConstructor() {
const INITIAL_FONT_SIZE = 12 * 1.5
const INITIAL_RADIOUS = 70
const INITIAL_IMAGE_SIZE = 80 * 1.2
const INITIAL_HIERARCHY_RING = 20
switch (payload.node.type) {
case 'Workspace': {
@@ -538,7 +537,6 @@ function newUiObjectConstructor() {
floatingObject.initializeMass(500)
floatingObject.initializeRadius(INITIAL_RADIOUS)
floatingObject.initializeHierarchyRing(INITIAL_HIERARCHY_RING)
floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE)
floatingObject.initializeFontSize(INITIAL_FONT_SIZE)
@@ -550,7 +548,6 @@ function newUiObjectConstructor() {
floatingObject.initializeMass(600)
floatingObject.initializeRadius(INITIAL_RADIOUS)
floatingObject.initializeHierarchyRing(INITIAL_HIERARCHY_RING)
floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE)
floatingObject.initializeFontSize(INITIAL_FONT_SIZE)
@@ -566,7 +563,6 @@ function newUiObjectConstructor() {
floatingObject.initializeMass(300)
floatingObject.initializeRadius(INITIAL_RADIOUS - 2)
floatingObject.initializeHierarchyRing(INITIAL_HIERARCHY_RING)
floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 10)
floatingObject.initializeFontSize(INITIAL_FONT_SIZE)
@@ -582,7 +578,6 @@ function newUiObjectConstructor() {
floatingObject.initializeMass(150)
floatingObject.initializeRadius(INITIAL_RADIOUS - 4)
floatingObject.initializeHierarchyRing(INITIAL_HIERARCHY_RING)
floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 20)
floatingObject.initializeFontSize(INITIAL_FONT_SIZE)
@@ -598,7 +593,6 @@ function newUiObjectConstructor() {
floatingObject.initializeMass(75)
floatingObject.initializeRadius(INITIAL_RADIOUS - 6)
floatingObject.initializeHierarchyRing(INITIAL_HIERARCHY_RING)
floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 30)
floatingObject.initializeFontSize(INITIAL_FONT_SIZE)
@@ -614,7 +608,6 @@ function newUiObjectConstructor() {
floatingObject.initializeMass(50)
floatingObject.initializeRadius(INITIAL_RADIOUS - 8)
floatingObject.initializeHierarchyRing(INITIAL_HIERARCHY_RING)
floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 40)
floatingObject.initializeFontSize(INITIAL_FONT_SIZE)
@@ -626,7 +619,6 @@ function newUiObjectConstructor() {
floatingObject.initializeMass(25)
floatingObject.initializeRadius(INITIAL_RADIOUS - 10)
floatingObject.initializeHierarchyRing(INITIAL_HIERARCHY_RING)
floatingObject.initializeImageSize(INITIAL_IMAGE_SIZE - 50)
floatingObject.initializeFontSize(INITIAL_FONT_SIZE)