Add Spring Property

1 files changed, 57 insertions, 36 deletions

diff --git a/Scripts/main.js b/Scripts/main.js
index 2388293..1f26606 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,12 +76,6 @@ function init() {
 

     vertexWeights = [];

 

-    springs = [];

-

-    getSprings(faceIndex) {

-

-    }

-

     static CreateBasic(width, height, numPointsWidth, numPointsHeight) {

       let vertices = [];

       let faces = [];

@@ -73,14 +97,21 @@ 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);

         }

       }

 

@@ -94,6 +125,7 @@ function init() {
         result.geometry.vertices.push(vertices[i]);

         result.vertexWeights.push(0);

       }

+      console.log(vertices);

       for (let i in faces) {

         let face = faces[i];

 

@@ -103,26 +135,15 @@ function init() {
         result.geometry.faces.push(new THREE.Face3(

           face.c, face.b, face.d

         ));

+

+        console.log(face);

         

-        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(result.geometry.vertices[face.b], result.geometry.vertices[face.a]);

+        let yLength = vectorLength(result.geometry.vertices[face.c], result.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(result.geometry.vertices[face.b], result.geometry.vertices[face.d]);

+        yLength = vectorLength(result.geometry.vertices[face.c], result.geometry.vertices[face.d]);

         weight += xLength * yLength / 2;

 

         result.vertexWeights[face.a] += weight / 4;

@@ -151,7 +172,7 @@ function init() {
   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);

   scene.add(directionalLight);

 

-  let cloth = Cloth.CreateBasic(10, 10, 4, 4);

+  let cloth = Cloth.CreateBasic(10, 10, 5, 5);

   const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 });

   const mesh = new THREE.Mesh(cloth.geometry, material);

   scene.add(mesh);