@painekillers/tree-builder-core 1.1.0 → 1.2.0

package/graph.js

@@ -90,7 +90,7 @@ True: Connects back to existing instance of a node when recursing
 /*
 Strategies
 - [X] Current BFS (First) — Layer by shortest distance from root; first discovery determines placement.
-- [X] Undirected BFS (Undirected) — Shortest distance to root; layering is on directional.
+- [X] Undirected BFS (Undirected) — Shortest distance to root; layering is one directional.
 - [X] Directed BFS, outward only (Outwards) — Follow prerequisite-to-dependent edges only.
 - [X] Furthest-parent layering (Furthest) — Place each node one layer below its deepest prerequisite.
 */
@@ -116,13 +116,13 @@ export class LayoutGraph {
         const visited = new Map()
         const connections = new Set()
 
-        const addConnection = (ln, from) => {
+        const addConnection = (ln, from, lnPos) => {
             const fromNode =
                 this.layers.get(from.layer)?.[from.ind]
 
             if(!fromNode) return
 
-            const a = `${ln.layer}:${ln.ind}`
+            const a = `${lnPos.layer}:${lnPos.ind}`
             const b = `${from.layer}:${from.ind}`
 
             const key = [a, b].sort().join("|")
@@ -166,7 +166,7 @@ export class LayoutGraph {
                     //holy crap i cannot think bruh
                     if(((recurse === false) || (recurse === null)) && pos.layer !== layer) { 
                         if (
-                            recurse == null ||
+                            recurse === null ||
                             strategy == "Outwards" &&
                             from !== null &&
                             Math.abs(layer) < Math.abs(from.layer)
@@ -181,12 +181,13 @@ export class LayoutGraph {
                             )
                         ) { continue }
 
+                        //this part makes the fake node btw
                         const fn = new LayoutNode(node, layer, this.layers.get(pos.layer)[pos.ind])
                         this.layers.get(layer).push(fn)
 
-                        addConnection(fn, from)
+                        addConnection(fn, from, pos)
                     } else {
-                        addConnection(ln, from)
+                        addConnection(ln, from, pos)
 
                     }
                 }
@@ -200,14 +201,30 @@ export class LayoutGraph {
                 Math.abs(layer) < Math.abs(from.layer)
             ) { continue }
 
-            if (
-                strategy == "Furthest" &&
-                (
-                    (layer > 0 && !node.parents.every(val => visited.has(val.id)))
-                    ||
-                    (layer < 0 && !node.children.every(val => visited.has(val.id)))
-                )
-            ) { continue }
+            if (strategy == "Furthest") {
+                if (layer > 0 && !node.parents.every(val => visited.has(val.id))) {
+                    for (const parent of node.parents) {
+                        queue.push({
+                            node: parent,
+                            layer: layer - 1,
+                            from: null
+                        })
+                    }
+
+                    continue
+                } else 
+                if (layer < 0 && !node.children.every(val => visited.has(val.id))) {
+                    for (const child of node.children) {
+                        queue.push({
+                            node: child,
+                            layer: layer + 1,
+                            from: null
+                        })
+                    }
+
+                    continue
+                }
+            }
 
             const ln = new LayoutNode(node, layer)
 
@@ -221,7 +238,7 @@ export class LayoutGraph {
             visited.set(key, pos)
 
             if(from) {
-                addConnection(ln, from)
+                addConnection(ln, from, pos)
             }
 
             for (const child of node.children) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@painekillers/tree-builder-core",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "exports": {
     ".": "./index.js",

package/themes/dark.js

@@ -58,6 +58,7 @@ export default {
 
         node(ctx, object) {
             const pos = object.pos
+            const tile = object.tile
             const size = object.size
 
             const width = size.width * object.scale
@@ -104,13 +105,24 @@ export default {
 
             ctx.globalAlpha = object.hovered ? 1 : 0.92
 
-            ctx.drawImage(
-                object.image,
-                x,
-                y,
-                width,
-                height
-            )
+            if (tile) {
+                ctx.drawImage(
+                    object.image,
+                    tile.x, tile.y, tile.width, tile.height,
+                    x,
+                    y,
+                    width,
+                    height,
+                )
+            } else {
+                ctx.drawImage(
+                    object.image,
+                    x,
+                    y,
+                    width,
+                    height,
+                )
+            }
 
             ctx.restore()
 

package/themes/default.js

@@ -140,6 +140,7 @@ export default {
         node(ctx, object) {
             const pos = object.pos
             const size = object.size
+            const tile = object.tile
 
             const width = size.width * object.scale
             const height = size.height * object.scale
@@ -173,13 +174,24 @@ export default {
 
             ctx.globalAlpha = object.hovered ? 1 : 0.92
 
-            ctx.drawImage(
-                object.image,
-                x,
-                y,
-                width,
-                height
-            )
+            if (tile) {
+                ctx.drawImage(
+                    object.image,
+                    tile.x, tile.y, tile.width, tile.height,
+                    x,
+                    y,
+                    width,
+                    height,
+                )
+            } else {
+                ctx.drawImage(
+                    object.image,
+                    x,
+                    y,
+                    width,
+                    height,
+                )
+            }
 
             ctx.restore()
 

package/world/bridge.js

@@ -97,7 +97,8 @@ export default class Bridge {
                 drawNode.height,
                 drawNode.layoutNode.node,
                 drawNode.layoutNode.node.val?.icon,
-                drawNode
+                drawNode,
+                drawNode.layoutNode.node.val?.iconTile
             )
 
             obj.root =

package/world/objects.js

@@ -100,11 +100,13 @@ placeholder.src = "data:image/svg+xml," + encodeURIComponent(`
 
 export class ImageInstance extends PSInstance {
     #image
+    #tile
 
-    constructor(world, x, y, width, height, image) {
+    constructor(world, x, y, width, height, image, tile) {
         super(world, x, y, width, height)
 
         this.image = image
+        this.#tile = tile ?? null
     }
 
     set image(img) {
@@ -116,17 +118,37 @@ export class ImageInstance extends PSInstance {
         return this.#image ?? placeholder
     }
 
+    set tile(t) {
+        this.#tile = t
+        this.world.update()
+    }
+
+    get tile() {
+        return this.#tile
+    }
+
     draw(ctx, p, s) {
         let pos = p || this.pos
         let size = s || this.size
 
-        ctx.drawImage(
-            this.image,
-            pos.x - size.width / 2,
-            pos.y - size.height / 2,
-            size.width,
-            size.height
-        )
+        if (this.#tile) {
+            ctx.drawImage(
+                this.image,
+                this.#tile.x, this.#tile.y, this.#tile.width, this.#tile.height,
+                pos.x - size.width / 2,
+                pos.y - size.height / 2,
+                size.width,
+                size.height,
+            )
+        } else {
+            ctx.drawImage(
+                this.image,
+                pos.x - size.width / 2,
+                pos.y - size.height / 2,
+                size.width,
+                size.height,
+            )
+        }
     }
 }
 
@@ -144,6 +166,7 @@ export class Line extends Object {
     }
 }
 
+// Probably wanna change how this works too !!!!!!!!!!!
 export class NodeInstance extends ImageInstance {
     constructor(world, x, y, width, height, node, image, drawNode) {
         super(world, x, y, width, height, image)