From 60afe249b8e21e9882ccfc6ec85404be4f6441f5 Mon Sep 17 00:00:00 2001
From: Michael Mainguy <mike.mainguy@gmail.com>
Date: Thu, 14 Sep 2023 09:50:56 -0500
Subject: [PATCH] Changed connector tool to use cylinder instead of
 greasedline.

---
 index.html                       |  3 +--
 src/app.ts                       |  4 +--
 src/diagram/diagramConnection.ts | 43 +++++++++++++++++---------------
 src/toolbox/toolbox.ts           | 13 +++++++---
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/index.html b/index.html
index 0848d87..8f639a1 100644
--- a/index.html
+++ b/index.html
@@ -5,8 +5,7 @@
   <title>Deep Diagram</title>
   <style>
     body {
-      margin: 0;
-      overflow: clip;
+
     }
 
     .loader {
diff --git a/src/app.ts b/src/app.ts
index 5429952..07d1c10 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -34,8 +34,8 @@ export class App {
         log.getLogger('DiagramManager').setLevel('debug');
         log.getLogger('PeerjsNetworkConnection').setLevel('debug');
         const canvas = document.createElement("canvas");
-        canvas.style.width = "100vw";
-        canvas.style.height = "100vh";
+        canvas.style.width = "100%";
+        canvas.style.height = "100%";
         canvas.id = "gameCanvas";
         document.body.appendChild(canvas);
         this.logger.debug('App', 'gameCanvas created');
diff --git a/src/diagram/diagramConnection.ts b/src/diagram/diagramConnection.ts
index 14f0f8d..4c75bf0 100644
--- a/src/diagram/diagramConnection.ts
+++ b/src/diagram/diagramConnection.ts
@@ -1,11 +1,10 @@
 import {
     AbstractMesh,
     Color3,
-    CreateGreasedLine,
-    GreasedLineMesh,
-    GreasedLineTools,
+    MeshBuilder,
     PointerInfo,
     Scene,
+    StandardMaterial,
     TransformNode,
     Vector3
 } from "@babylonjs/core";
@@ -47,11 +46,12 @@ export class DiagramConnection {
     private scene: Scene;
     private toAnchor: TransformNode;
     private fromAnchor: TransformNode;
+    private transformNode: TransformNode;
     private points: Vector3[] = [];
 
-    private _mesh: GreasedLineMesh;
+    private _mesh: AbstractMesh;
 
-    public get mesh(): GreasedLineMesh {
+    public get mesh(): AbstractMesh {
         return this._mesh;
     }
 
@@ -84,40 +84,43 @@ export class DiagramConnection {
     }
 
     public get id(): string {
-        return "connection_" + this?.fromAnchor?.id + "_" + this?.toAnchor?.id;
+        return "connection_" + this._from + "_" + this._to;
     }
     private tick: number = 0;
     private recalculate() {
+        const start = this.fromAnchor?.absolutePosition;
+        const end = this.toAnchor?.absolutePosition;
+        if (start && end) {
+            this.transformNode.position = start.add(end).scale(.5);
+            this.transformNode.lookAt(end);
+            this._mesh.rotation.x = Math.PI / 2;
+            this._mesh.scaling.y = Math.abs(start.subtract(end).length());
+        }
 
-
-        if (this.fromAnchor && this.toAnchor) {
+        /*if (this.fromAnchor && this.toAnchor) {
             this.points = [this.fromAnchor.absolutePosition, this.toAnchor.absolutePosition];
         } else {
             this.points = [Vector3.Zero(), Vector3.Zero()];
-        }
+        }*/
 
     }
 
     private setPoints() {
         if (this.points.length > 1) {
-            this._mesh.setPoints([GreasedLineTools.ToNumberArray(this.points)]);
+            //this._mesh.setPoints([GreasedLineTools.ToNumberArray(this.points)]);
         }
 
     }
 
     private buildConnection() {
         this.logger.debug(`buildConnection from ${this._from} to ${this._to}`);
-
+        this._mesh = MeshBuilder.CreateCylinder(this.id + "_cylinder", {diameter: .02, height: 1}, this.scene);
+        const material = new StandardMaterial(this.id + "_material", this.scene);
+        material.diffuseColor = new Color3(0, 0, 0);
+        this._mesh.material = material;
+        this.transformNode = new TransformNode(this.id + "_transform", this.scene);
+        this._mesh.setParent(this.transformNode);
         this.recalculate();
-        this._mesh = CreateGreasedLine(this.id,
-            {
-                points: (GreasedLineTools.ToNumberArray(this.points) as number[]),
-                updatable: true
-            }, {color: Color3.Black()}, this.scene);
-        this._mesh.intersectionThreshold = 10;
-        this.logger.debug(this._mesh.widths);
-        this._mesh.widths = [0.1, 0.1, .1, .1];
-
         this._mesh.id = this.id;
         if (!this._mesh.metadata) {
             this._mesh.metadata = {template: "#connection-template", from: this._from};
diff --git a/src/toolbox/toolbox.ts b/src/toolbox/toolbox.ts
index 1238216..03e51e3 100644
--- a/src/toolbox/toolbox.ts
+++ b/src/toolbox/toolbox.ts
@@ -5,8 +5,10 @@ import {ControllerEventType, Controllers} from "../controllers/controllers";
 import {setMenuPosition} from "../util/functions/setMenuPosition";
 import {buildColor} from "./functions/buildColor";
 import {MenuHandle} from "../menus/menuHandle";
+import log from "loglevel";
 
 export class Toolbox {
+    private readonly logger = log.getLogger('Toolbox');
     private index = 0;
     private readonly scene: Scene;
     public readonly node: TransformNode;
@@ -44,11 +46,16 @@ export class Toolbox {
     }
 
     public updateToolbox(color: string) {
-        if (this.scene.getMeshById("toolbox-color-" + color)) {
-            return;
+        if (color) {
+            if (this.scene.getMeshById("toolbox-color-" + color)) {
+                return;
+            } else {
+                buildColor(Color3.FromHexString(color), this.scene, this.node, this.index++, this.colorChangeObservable);
+            }
         } else {
-            buildColor(Color3.FromHexString(color), this.scene, this.node, this.index++, this.colorChangeObservable);
+            this.logger.warn("updateToolbox called with no color");
         }
+
     }
 
     private buildToolbox() {