Wind Force added, Cloth dragging added, fix vertex normals and change lighting

1 files changed, 63 insertions, 8 deletions

diff --git a/Scripts/cloth.js b/Scripts/cloth.js
index e39b95b..c873a3d 100644
--- a/Scripts/cloth.js
+++ b/Scripts/cloth.js
@@ -98,6 +98,9 @@ export class Cloth {
 

   vertexRigidness = [];

 

+  externalForces = [];

+  windForce = 0;

+

   /**

    * creates a rectangular piece of cloth

    * takes the size of the cloth

@@ -203,6 +206,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 +255,7 @@ export class Cloth {
      */

     this.geometry.computeBoundingSphere();

     this.geometry.computeFaceNormals();

+    this.geometry.computeVertexNormals();

   }

 

   /**

@@ -355,6 +360,7 @@ export class Cloth {
     this.geometry.elementsNeedUpdate = true;

     this.geometry.computeBoundingSphere();

     this.geometry.computeFaceNormals();

+    this.geometry.computeVertexNormals();

 

   }

 

@@ -369,7 +375,8 @@ getAcceleration(vertexIndex, dt) {
   if (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];

@@ -471,10 +478,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 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);

+  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;

+  }

+

+  if(Math.abs(externalForce.x) > threshold){

+    externalForce.x *= forceReduktion;

+  } else {

+    externalForce.x = 0;

+  }

+    

+  

 

   return result;

 }

@@ -492,7 +520,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 +548,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;

 }

 

 }