linktest.js

@@ -1,10 +1,11 @@
 import * as THREE from 'three';
 
-import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
 import { GUI } from 'lil-gui';
 
 import { TaperedLink } from './taperedLink.js';
 
+
+
 const FACE_OPACITY = 0.3;
 const CAMERA_K = 5;
 
@@ -27,93 +28,61 @@ scene.add(amblight);
 camera.position.set(0, 0, CAMERA_K / 2);
 
 camera.lookAt(0, 0, 0);
-camera.position.z = 8;
+//camera.position.z = 4;
 
 const renderer = new THREE.WebGLRenderer({antialias: true});
 renderer.setSize( window.innerWidth, window.innerHeight );
 
 renderer.localClippingEnabled = true;
 
-const controls = new OrbitControls( camera, renderer.domElement );
-
-
-controls.autoRotate = false;
 
 document.body.appendChild( renderer.domElement );
 
 const NODEC = 0x3293a9;
-const LINKC = 0x00ff88;
 const BACKGROUNDC = 0xd4d4d4;
 	
 scene.background = new THREE.Color(BACKGROUNDC);
-const material = new THREE.MeshStandardMaterial({ color: LINKC });
+const material = new THREE.MeshStandardMaterial({ color: NODEC });
 
-material.transparent = true;
-material.opacity = 0.5;
-
-const node_mat = new THREE.MeshStandardMaterial({ color: NODEC });
-
-node_mat.transparent = true;
-node_mat.opacity = 0.8;
 
 const params = {
     r1: 0.5,
     r2: 0.6,
-    sync: false,
+    l: 3,
-    l: 9,
-    rotx: 1,
-    roty: 0,
-    rotz: 0,
 };
 
 const gui = new GUI();
 
 gui.add(params, "r1", 0.01, 1.5);
 gui.add(params, "r2", 0.01, 1.5);
-gui.add(params, "sync");
+gui.add(params, "l", 0, 4);
-gui.add(params, "l", 0, 10);
-gui.add(params, "rotx", 0, 4);
-gui.add(params, "roty", 0, 4);
-gui.add(params, "rotz", 0, 4);
 
 function makeNode(material, pos, r) {
     const geometry = new THREE.SphereGeometry(1);
     const sphere = new THREE.Mesh(geometry, material);
-    const node = {
+    updateNode(sphere, pos, r);
-        v3: pos,
+    return sphere;
-        object: sphere
-    };
-    updateNode(node, pos, r);
-    return node;
 }
 
 function updateNode(node, pos, r) {
-    node.v3 = pos; 
+    node.scale.copy(new THREE.Vector3(r, r, r));
-    node.object.scale.copy(new THREE.Vector3(r, r, r));
+    node.position.copy(pos);
-    node.object.position.copy(pos);
 }
     
 
-const n1 = makeNode(node_mat, new THREE.Vector3(-params["l"], -1, -1), params["r1"]);
+const n1 = makeNode(material, new THREE.Vector3(-0.5 * params["l"], 0, 0), params["r1"]);
-const n2 = makeNode(node_mat, new THREE.Vector3(params["l"], 1, 1), params["r2"]);
+const n2 = makeNode(material, new THREE.Vector3(0.5 * params["l"], 0, 0), params["r2"])
 
-const tl = new TaperedLink(material, n1, n2, params["r1"], params["r2"]);
+//const tl = new TaperedLink(
 
-scene.add(n1.object);
+scene.add(n1);
-scene.add(n2.object);
+scene.add(n2);
-
-scene.add(tl);
 
 function animate() {
     requestAnimationFrame(animate);
 
-    const r1 = params["r1"];
+    updateNode(n1, new THREE.Vector3(-0.5 * params["l"], 0, 0), params["r1"]);
-    const r2 = params["sync"] ? r1 : params["r2"]
+    updateNode(n2, new THREE.Vector3(0.5 * params["l"], 0, 0), params["r2"]);
-
-    updateNode(n1, new THREE.Vector3(- params["l"], -1, -1), r1);
-    updateNode(n2, new THREE.Vector3(params["l"], 1, 1), r2);
-    tl.update(n1, n2, r1, r2, params["rotx"], params["roty"], params["rotz"]);
-    controls.update();
     renderer.render(scene, camera);
 }
 animate();

taperedLink.js

@@ -1,38 +1,31 @@
-
-
 import * as THREE from 'three';
 
+// really stupid idea: add a cylinder as well!
 
 class TaperedLink extends THREE.Group {
 
   constructor(baseMaterial, n1, n2, r1, r2) {
     super();
-    const geometry = new THREE.ConeGeometry( 1, 1, 16, true );
+    const cone = new THREE.ConeGeometry( 0.75, 1, 32, true );
-    //const geometry = new THREE.CylinderGeometry( 1, 1, 1, 16, 1, true);
     const cplane = new THREE.Plane(new THREE.Vector3(0, -1, 0), 0.5);
     const material = baseMaterial.clone();
     material.clippingPlanes = [ cplane ];
-    this.object = new THREE.Mesh( geometry, material );
+    this.cone = new THREE.Mesh( cone, material );
-    this.add( this.object );
+    this.add( this.cone );
-    this.update(n1, n2, r1, r2, 1, 0, 0);
+    const cylinder = new THREE.CylinderGeometry(1, 1, 1, 16, 1, true);
+    const cyl_material = baseMaterial.clone();
+    cyl_material.color = new THREE.Color(0xff0000); 
+    this.cylinder = new THREE.Mesh(cylinder, cyl_material);
+    this.add( this.cylinder );
+    this.update(n1, n2, r1, r2);
    }
 
-  update_cyl(n1, n2, r1, r2, rotx, roty, rotz) {
+   update(n1, n2, r1, r2) {
-    const length = n1.v3.distanceTo(n2.v3);
+       this.update_cone(n1, n2, r1, r2);
-    const centre = new THREE.Vector3();
-    centre.lerpVectors(n1.v3, n2.v3, 0.5);
-    const link_mean = (r1 + r2) * 0.5;		
-    this.scale.copy(new THREE.Vector3(link_mean, link_mean, length));
-    this.position.copy(centre);
-    this.lookAt(n2.v3);
-    this.children[0].rotation.x = rotx * Math.PI / 2.0;
-    this.children[0].rotation.y = roty * Math.PI / 2.0;
-    this.children[0].rotation.z = rotz * Math.PI / 2.0;
-    this.visible = true;
    }
 
 
-  update(n1, n2, r1, r2, rotx, roty, rotz) {
+  update_cone(n1, n2, r1, r2) {
     const kraw = r1 - r2;
     let k = ( kraw == 0 ) ? 0.001 : kraw;
     let nbase = n1.v3;
@@ -48,33 +41,47 @@ class TaperedLink extends THREE.Group {
     }
 
     const l = nbase.distanceTo(napex);
-    const lapex = l * rapex / k;
+    const h = l * rbase / k;
-    const h = l + lapex;
-    this.scale.copy(new THREE.Vector3(rbase, rbase, h));
     const h_offset = 0.5 * h / l;
     const pos = new THREE.Vector3();
+    if( l > 0 ) {
       pos.lerpVectors(nbase, napex, h_offset);
-
+    }
+    const rmean = 0.5 * (r1 + r2);
+    if( h_offset < 1 ) { 
+      this.cone.scale.copy(new THREE.Vector3(rbase, h, rbase));
+      this.cylinder.scale.copy(new THREE.Vector3(rmean, l, rmean));
+    } else {
+      // you're on the other side of napex so flip the cone
+      this.cone.scale.copy(new THREE.Vector3(rbase, -h, rbase));
+      this.cylinder.scale.copy(new THREE.Vector3(rmean, -l, rmean));
+    }
+    this.lookAt(napex);      // the group, not the cone!!
     this.position.copy(pos); // the group, not the cone!! 
-
+    this.cone.rotation.x = Math.PI / 2.0;
-    this.lookAt(nbase);
+    this.cylinder.rotation.x = Math.PI / 2.0;
-    this.children[0].rotation.x = rotx * Math.PI / 2.0;
-    this.children[0].rotation.y = roty * Math.PI / 2.0;
-    this.children[0].rotation.z = rotz * Math.PI / 2.0;
-    this.visible = true;
     const clipnorm = new THREE.Vector3();
     clipnorm.copy(napex);
     clipnorm.sub(nbase);
     clipnorm.negate();
     clipnorm.normalize();
-    this.object.material.clippingPlanes[0].setFromNormalAndCoplanarPoint(
+    this.cone.material.clippingPlanes[0].setFromNormalAndCoplanarPoint(
       clipnorm, napex
     );
 
     
   }
 
+    update_cylinder_busted(n1, n2, r1, r2) {
+        const length = n1.v3.distanceTo(n2.v3);
+        const centre = new THREE.Vector3();
+        centre.lerpVectors(n1.v3, n2.v3, 0.5);
+        const link_mean = (r1 + r2) * 0.5;		
+        this.cylinder.scale.copy(new THREE.Vector3(link_mean, link_mean, length));
+        this.cylinder.position.copy(centre);
+        //this.cylinder.lookAt(n2.v3);
+        this.cylinder.rotation.x = Math.PI / 2.0;
+    	
+    }
 }
-
-
 export { TaperedLink };