X-Git-Url: https://gitweb.ps.run/cloth_sim/blobdiff_plain/c061ca66adc53232724ce9991fbe8d10c041af36..dcdf429d920b067cf18d50ef9f12032a0cf2dcc2:/Scripts/main.js?ds=sidebyside

diff --git a/Scripts/main.js b/Scripts/main.js
index 2388293..fb7a8b2 100644
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -26,14 +26,44 @@ function init() {
     }
   }
 
+  function vectorLength(a, b) {
+    let v1 = new THREE.Vector3();
+    v1.set(a.x, a.y, a.z);
+    let v2 = new THREE.Vector3();
+    v2.set(b.x, b.y, b.z);
+
+    return v1.sub(v2).length();
+  }
+
   class Face {
-    indices = [];
+    a;
+    b;
+    c;
+    d;
+
+    springs = [];
 
     constructor(a, b, c, d) {
-      this.indices.push(a);
-      this.indices.push(b);
-      this.indices.push(c);
-      this.indices.push(d);
+      this.a = a;
+      this.b = b;
+      this.c = c;
+      this.d = d;
+    }
+  }
+
+  class Spring {
+    restLength;
+    currentLength;
+    index1;
+    index2;
+
+    constructor(vertices, index1, index2) {
+      this.index1 = index1;
+      this.index2 = index2;
+
+      let length = vectorLength(vertices[index1], vertices[index2]);
+      this.restLength = length;
+      this.currentLength = length;
     }
   }
 
@@ -46,13 +76,7 @@ function init() {
 
     vertexWeights = [];
 
-    springs = [];
-
-    getSprings(faceIndex) {
-
-    }
-
-    static CreateBasic(width, height, numPointsWidth, numPointsHeight) {
+    createBasic(width, height, numPointsWidth, numPointsHeight) {
       let vertices = [];
       let faces = [];
 
@@ -73,67 +97,96 @@ function init() {
       
       for (let y = 0; y < numPointsHeight - 1; y++) {
         for (let x = 0; x < numPointsWidth - 1; x++) {
-          faces.push(
-            new Face(
-              getVertexIndex(x, y),
-              getVertexIndex(x, y + 1),
-              getVertexIndex(x + 1, y),
-              getVertexIndex(x + 1, y + 1),
-            )
+          let newFace = new Face(
+            getVertexIndex(x, y),
+            getVertexIndex(x, y + 1),
+            getVertexIndex(x + 1, y),
+            getVertexIndex(x + 1, y + 1),
           );
+
+          newFace.springs.push(new Spring(vertices, getVertexIndex(x, y), getVertexIndex(x + 1, y)));
+          newFace.springs.push(new Spring(vertices, getVertexIndex(x, y), getVertexIndex(x, y + 1)));
+          newFace.springs.push(new Spring(vertices, getVertexIndex(x, y), getVertexIndex(x + 1, y + 1)));
+          newFace.springs.push(new Spring(vertices, getVertexIndex(x + 1, y), getVertexIndex(x, y + 1)));
+          newFace.springs.push(new Spring(vertices, getVertexIndex(x + 1, y), getVertexIndex(x + 1, y + 1)));
+          newFace.springs.push(new Spring(vertices, getVertexIndex(x, y + 1), getVertexIndex(x + 1, y + 1)));
+          
+          faces.push(newFace);
         }
       }
 
-      return this.CreateExplicit(vertices, faces);
+      this.createExplicit(vertices, faces);
     }
 
-    static CreateExplicit(vertices, faces) {
-      let result = new Cloth();
-
+    createExplicit(vertices, faces) {
       for (let i in vertices) {
-        result.geometry.vertices.push(vertices[i]);
-        result.vertexWeights.push(0);
+        this.geometry.vertices.push(vertices[i]);
+        this.vertexWeights.push(0);
       }
       for (let i in faces) {
         let face = faces[i];
 
-        result.geometry.faces.push(new THREE.Face3(
+        this.faces.push(face);
+
+        this.geometry.faces.push(new THREE.Face3(
           face.a, face.b, face.c
         ));
-        result.geometry.faces.push(new THREE.Face3(
+        this.geometry.faces.push(new THREE.Face3(
           face.c, face.b, face.d
         ));
         
-        let xLength =
-          result.geometry.vertices[face.b]
-          .sub(result.geometry.vertices[face.a])
-          .length();
-        let yLength =
-          result.geometry.vertices[face.c]
-          .sub(result.geometry.vertices[face.a])
-          .length();
+        let xLength = vectorLength(this.geometry.vertices[face.b], this.geometry.vertices[face.a]);
+        let yLength = vectorLength(this.geometry.vertices[face.c], this.geometry.vertices[face.a]);
         let weight = xLength * yLength / 2;
 
-        xLength =
-          result.geometry.vertices[face.b]
-          .sub(result.geometry.vertices[face.d])
-          .length();
-        yLength =
-          result.geometry.vertices[face.c]
-          .sub(result.geometry.vertices[face.d])
-          .length();
-
+        xLength = vectorLength(this.geometry.vertices[face.b], this.geometry.vertices[face.d]);
+        yLength = vectorLength(this.geometry.vertices[face.c], this.geometry.vertices[face.d]);
         weight += xLength * yLength / 2;
 
-        result.vertexWeights[face.a] += weight / 4;
-        result.vertexWeights[face.b] += weight / 4;
-        result.vertexWeights[face.c] += weight / 4;
-        result.vertexWeights[face.d] += weight / 4;
+        this.vertexWeights[face.a] += weight / 4;
+        this.vertexWeights[face.b] += weight / 4;
+        this.vertexWeights[face.c] += weight / 4;
+        this.vertexWeights[face.d] += weight / 4;
       }
 
-      result.geometry.computeBoundingSphere();
+      this.geometry.computeBoundingSphere();
+    }
+
+    createDebugMesh(scene) {
+      function addLine(from, to, color) {
+        let geometry = new THREE.Geometry();
+        geometry.vertices.push(from);
+        geometry.vertices.push(to);
+        let material = new THREE.LineBasicMaterial( { color: color, linewidth: 10 } );
+        let line = new THREE.Line(geometry, material);
+        line.renderOrder = 1;
+        scene.add(line);
+      }
+      function addPoint(point, color) {
+        const geometry = new THREE.SphereGeometry( 0.05, 32, 32 );
+        const material = new THREE.MeshBasicMaterial( { color: color } );
+        const sphere = new THREE.Mesh( geometry, material );
+        sphere.position.set(point.x, point.y, point.z);
+        scene.add( sphere );
+      }
 
-      return result;
+      let lineColor = 0x000000;
+      let pointColor = 0xff00000;
+
+      for (let i in this.faces) {
+        let face = this.faces[i];
+        addLine(this.geometry.vertices[face.a], this.geometry.vertices[face.b], lineColor);
+        addLine(this.geometry.vertices[face.a], this.geometry.vertices[face.c], lineColor);
+        addLine(this.geometry.vertices[face.a], this.geometry.vertices[face.d], lineColor);
+        addLine(this.geometry.vertices[face.b], this.geometry.vertices[face.c], lineColor);
+        addLine(this.geometry.vertices[face.b], this.geometry.vertices[face.d], lineColor);
+        addLine(this.geometry.vertices[face.c], this.geometry.vertices[face.d], lineColor);
+
+        addPoint(this.geometry.vertices[face.a], pointColor);
+        addPoint(this.geometry.vertices[face.b], pointColor);
+        addPoint(this.geometry.vertices[face.c], pointColor);
+        addPoint(this.geometry.vertices[face.d], pointColor);
+      }
     }
   }
 
@@ -151,13 +204,17 @@ function init() {
   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);
   scene.add(directionalLight);
 
-  let cloth = Cloth.CreateBasic(10, 10, 4, 4);
-  const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 });
+  let cloth = new Cloth();
+  cloth.createBasic(10, 10, 5, 5);
+  cloth.createDebugMesh(scene);
+
+  const material = new THREE.MeshBasicMaterial({ color: 0x0000ff });
   const mesh = new THREE.Mesh(cloth.geometry, material);
   scene.add(mesh);
 
   camera.position.y = 5;
   camera.position.z = 10;
+  //camera.lookAt(new THREE.Vector3(1, 0, 0));
 
   function animate(dt) {
     requestAnimationFrame(animate);
@@ -174,7 +231,6 @@ function init() {
   window.onresize = resize;
   resize();
   if (canvas.getContext) {
-    ctx = canvas.getContext('2d');
     animate(performance.now());
   }
   canvas.onmousemove = (evt) => {