X-Git-Url: https://gitweb.ps.run/cloth_sim/blobdiff_plain/79bcaf1ac3d8bc90b697c444ff5dfb694acb6962..8ecb6f064f0708ed010f1239a7bddc283411b6e7:/Scripts/cloth.js

diff --git a/Scripts/cloth.js b/Scripts/cloth.js
index e39b95b..0708d5e 100644
--- a/Scripts/cloth.js
+++ b/Scripts/cloth.js
@@ -98,6 +98,11 @@ export class Cloth {
 
   vertexRigidness = [];
 
+  fixedPoints = [];
+
+  externalForces = [];
+  windForce = 50;
+
   /**
    * creates a rectangular piece of cloth
    * takes the size of the cloth
@@ -130,7 +135,7 @@ export class Cloth {
     for (let y = 0; y < numPointsHeight; y++) {
       for (let x = 0; x < numPointsWidth; x++) {
         vertices.push(
-          new THREE.Vector3(x * stepWidth, height - y * stepHeight, 0)
+          new THREE.Vector3((x - (numPointsWidth/2)) * stepWidth, height - y * stepHeight, 0)
         );
       }
     }
@@ -179,8 +184,10 @@ export class Cloth {
     /**
      * hand cloth from left and right upper corners
      */
-    this.vertexRigidness[0] = true;
-    this.vertexRigidness[numPointsWidth-1] = true;
+    //this.vertexRigidness[0] = true;
+    //this.vertexRigidness[numPointsWidth * (numPointsHeight - 1)] = true;
+    this.fixedPoints.push(getVertexIndex(8, 10));
+    this.fixedPoints.push(getVertexIndex(12, 9));
   }
 
   /**
@@ -203,6 +210,7 @@ export class Cloth {
       // this.previousPositions.push(vertices[i]);
       this.vertexWeights.push(0);
       this.vertexRigidness.push(false);
+      this.externalForces.push(new THREE.Vector3(0,0,0));
     }
     /**
      * copy faces,
@@ -251,6 +259,7 @@ export class Cloth {
      */
     this.geometry.computeBoundingSphere();
     this.geometry.computeFaceNormals();
+    this.geometry.computeVertexNormals();
   }
 
   /**
@@ -336,7 +345,8 @@ export class Cloth {
       this.previousPositions[i].copy(this.geometry.vertices[i]);
       this.geometry.vertices[i].copy(currentPosition);
     }
-    //console.log(this.getAcceleration(1, dt));
+    
+    this.checkIntersect();
     
     this.time += dt;
 
@@ -355,10 +365,35 @@ export class Cloth {
     this.geometry.elementsNeedUpdate = true;
     this.geometry.computeBoundingSphere();
     this.geometry.computeFaceNormals();
+    this.geometry.computeVertexNormals();
 
   }
 
-
+checkIntersect() {
+  let npw = this.numPointsWidth;
+  function getX(i, ) { return i % npw; }
+  function getY(i) { return Math.floor(i / npw); }
+  for (let i in this.geometry.vertices) {
+    for (let j in this.geometry.vertices) {
+      this.vertexRigidness[i] = false;
+      this.vertexRigidness[j] = false;
+      if (i == j || (Math.abs(getX(i) - getX(j)) == 1 && Math.abs(getY(i) - getY(j)) == 1))
+        continue;
+      let posI = this.geometry.vertices[i];
+      let posJ = this.geometry.vertices[j];
+      let dist = posI.distanceTo(posJ);
+      const collisionDistance = 0.5;
+      if (dist < collisionDistance) {
+        this.vertexRigidness[i] = true;
+        this.vertexRigidness[j] = true;
+        let diff = this.geometry.vertices[i].clone().sub(this.geometry.vertices[j]).normalize().multiplyScalar((collisionDistance - dist) * 1.001 / 2);
+        this.geometry.vertices[i].add(diff);
+        this.geometry.vertices[j].sub(diff);
+        console.log(this.geometry.vertices[i].distanceTo(this.geometry.vertices[j]));
+      }
+    }
+  }
+}
 
 /**
  * Equation of motion for each vertex which represents the acceleration 
@@ -366,17 +401,20 @@ export class Cloth {
  *  @param {number} dt The time passed since last frame
  */
 getAcceleration(vertexIndex, dt) {
-  if (this.vertexRigidness[vertexIndex])
+  if (this.fixedPoints.includes(parseInt(vertexIndex)) ||
+      this.vertexRigidness[vertexIndex]) {
     return new THREE.Vector3(0, 0, 0);
+  }
 
-  let vertex = this.geometry.vertices[vertexIndex];
+  let externalForce = this.externalForces[vertexIndex];
+  let vertex = this.geometry.vertices[vertexIndex];//.add(externalForce);
 
   // Mass of vertex
   let M = this.vertexWeights[vertexIndex];
   // constant gravity
   let g = new THREE.Vector3(0, -9.8, 0);
   // stiffness
-  let k = 1000;
+  let k = 500;
 
   // Wind vector
   let fWind = new THREE.Vector3(
@@ -471,10 +509,31 @@ getAcceleration(vertexIndex, dt) {
   }
   
   let result = new THREE.Vector3(1, 1, 1);
+  result.multiplyScalar(M).multiply(g).add(fWind).add(externalForce).add(fAirResistance).sub(springSum);
+
+  document.getElementById("Output").innerText = "SpringSum: " + Math.floor(springSum.y);
+
+  let threshold = 1;
+  let forceReduktion = 0.8;
+  if(Math.abs(externalForce.z) > threshold){
+    externalForce.z *= forceReduktion;
+  } else {
+    externalForce.z = 0;
+  }
+
+  if(Math.abs(externalForce.y) > threshold){
+    externalForce.y *= forceReduktion;
+  } else {
+    externalForce.y = 0;
+  }
 
-  let temp = result.multiplyScalar(M).multiply(g).add(fWind).add(fAirResistance).clone();
-  result.sub(springSum);
-  document.getElementById("Output").innerText = "SpringSum: " + Math.floor(springSum.y) + "\nTemp: " + Math.floor(temp.y);
+  if(Math.abs(externalForce.x) > threshold){
+    externalForce.x *= forceReduktion;
+  } else {
+    externalForce.x = 0;
+  }
+    
+  
 
   return result;
 }
@@ -492,7 +551,7 @@ verlet(currentPosition, previousPosition, acceleration, passedTime) {
   // next position = 2 * current Position - previous position + acceleration * (passed time)^2
   // acceleration (dv/dt) = F(net)
   // Dependency for one vertex: gravity, fluids/air, springs
-  const DRAG = 0.97;
+  const DRAG = 0.96;
   let nextPosition = new THREE.Vector3(
     (currentPosition.x - previousPosition.x) * DRAG + currentPosition.x + acceleration.x * (passedTime * passedTime),
     (currentPosition.y - previousPosition.y) * DRAG + currentPosition.y + acceleration.y * (passedTime * passedTime),
@@ -520,9 +579,36 @@ euler(currentPosition, acceleration, passedTime) {
 
 wind(intersects) {
   let intersect = intersects[0];
-  this.geometry.vertices[intersect.face.a].z -= 0.05;
-  this.geometry.vertices[intersect.face.b].z -= 0.05;
-  this.geometry.vertices[intersect.face.c].z -= 0.05;
+  this.externalForces[intersect.face.a].z -= this.windForce;
+  this.externalForces[intersect.face.b].z -= this.windForce;
+  this.externalForces[intersect.face.c].z -= this.windForce;
+}
+
+mousePressed = false;
+mouseMoved = false;
+intersects;
+
+mousePress(intersects){
+  this.mousePressed = true;
+  this.intersects = intersects;
+
+}
+
+mouseMove(mousePos){
+  this.mouseMoved = true;
+  if(this.mousePressed){
+    let intersect = this.intersects[0];
+    this.externalForces[intersect.face.a].add(mousePos.clone().sub(this.geometry.vertices[intersect.face.a]).multiplyScalar(90));
+    /*
+    this.geometry.vertices[intersect.face.a].x = mousePos.x;
+    this.geometry.vertices[intersect.face.a].y = mousePos.y;
+    this.geometry.vertices[intersect.face.a].z = mousePos.z;
+  */  
+  }
+}
+
+mouseRelease(){
+  this.mousePressed = false;
 }
 
 }