From 1b43c68210da0e45dce23f37cc2cad9717ca4d75 Mon Sep 17 00:00:00 2001 From: alyx Date: Fri, 4 Feb 2022 21:26:20 +0000 Subject: chips now place at the center of the screen. --- chips.js | 2 ++ dnd.html | 12 ++++++++++++ grapher/index.html | 2 +- grapher/script.js | 15 ++++++++++++++- index.html | 2 ++ script.js | 4 +++- 6 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 dnd.html diff --git a/chips.js b/chips.js index 686dce0..0ba542e 100644 --- a/chips.js +++ b/chips.js @@ -74,8 +74,10 @@ function generateChipHTML(NodeDescs, typeoverride = undefined) { output.append(port, tooltip); } + return root; } + } function ListAllTypes(Nodes) { diff --git a/dnd.html b/dnd.html new file mode 100644 index 0000000..2ac4693 --- /dev/null +++ b/dnd.html @@ -0,0 +1,12 @@ + + + + + + Document + + +
fucking shitting
+
shuttjgirongio
+ + \ No newline at end of file diff --git a/grapher/index.html b/grapher/index.html index e0990b7..6cec1f0 100644 --- a/grapher/index.html +++ b/grapher/index.html @@ -65,7 +65,7 @@

To wire 2 ports to one another, simply click and drag to a port of the same type. All input data ports have a maximum of one connection, as do output execs. - To disconnect a wire, simply click on the end with a maxiumum of one connection. + To disconnect a wire, simply click on the port.

Selecting

diff --git a/grapher/script.js b/grapher/script.js index 807a88d..9b0be9f 100644 --- a/grapher/script.js +++ b/grapher/script.js @@ -120,12 +120,20 @@ window.onload = async function() { chipcontainer.append(generateChipHTML(v2data.Nodes[data.GUID].NodeDescs)); ne.append(chipcontainer); graph.append(ne); + + let newchipx = -graphPos.x + (graph.getClientRects()[0].width / 2) - (ne.getClientRects()[0].width / 2); + let newchipy = -graphPos.y + (graph.getClientRects()[0].height / 2) - (ne.getClientRects()[0].height / 2); + ne.style.setProperty('--chipOffsetX', newchipx); + ne.style.setProperty('--chipOffsetY', newchipy); + + const chip = { el: ne, typeInfo: types, currentOverrides: [], nd: v2data.Nodes[data.GUID].NodeDescs }; + appendTypeUI(chip); chips.push(chip); console.log(types); @@ -133,7 +141,7 @@ window.onload = async function() { } graph.addEventListener('mousedown', function(e) { - if (e.button == 0) { + if (e.buttons & 1) { start = performance.now(); targ = e.target; if (e.target.parentElement.matches('.input')) { @@ -198,6 +206,11 @@ window.onload = async function() { }); rootel.addEventListener("mousemove", e => { + if (e.buttons & 2) { + mode = ''; + let tmp = connections.pop(); + if ((tmp.i instanceof Element) && (tmp.o instanceof Element)) connections.push(tmp); + } if (e.buttons & 4) { graphPos.x += e.clientX - lastmp.x; graphPos.y += e.clientY - lastmp.y; diff --git a/index.html b/index.html index 82fa43f..047da6b 100644 --- a/index.html +++ b/index.html @@ -37,6 +37,7 @@ . +
@@ -106,6 +107,7 @@ To get started, simply type the name of the chip you'd like to know about into the top box. By default, the searcher will automatically refresh the results as you type.

Different types of chips

+