cloth-cloth collision

diff --git a/Scripts/cloth.js b/Scripts/cloth.js
index 1ec79d5bec9bdff2f11b4bed1b67a5c4417658c3..0708d5e0c07b5f0112e6d770fd82079d9991b490 100644 (file)
--- a/Scripts/cloth.js
+++ b/Scripts/cloth.js
@@ -98,8 +98,10 @@ export class Cloth {
 \r
   vertexRigidness = [];\r
 \r
 \r
   vertexRigidness = [];\r
 \r

+  fixedPoints = [];\r
+\r

   externalForces = [];\r
   externalForces = [];\r

-  windForce = 100;\r
+  windForce = 50;\r

 \r
   /**\r
    * creates a rectangular piece of cloth\r
 \r
   /**\r
    * creates a rectangular piece of cloth\r


@@ -133,7 +135,7 @@ export class Cloth {
     for (let y = 0; y < numPointsHeight; y++) {\r
       for (let x = 0; x < numPointsWidth; x++) {\r
         vertices.push(\r
     for (let y = 0; y < numPointsHeight; y++) {\r
       for (let x = 0; x < numPointsWidth; x++) {\r
         vertices.push(\r

-          new THREE.Vector3(x * stepWidth, height - y * stepHeight, 0)\r
+          new THREE.Vector3((x - (numPointsWidth/2)) * stepWidth, height - y * stepHeight, 0)\r

         );\r
       }\r
     }\r
         );\r
       }\r
     }\r


@@ -182,8 +184,10 @@ export class Cloth {
     /**\r
      * hand cloth from left and right upper corners\r
      */\r
     /**\r
      * hand cloth from left and right upper corners\r
      */\r

-    this.vertexRigidness[0] = true;\r
-    this.vertexRigidness[numPointsWidth-1] = true;\r
+    //this.vertexRigidness[0] = true;\r
+    //this.vertexRigidness[numPointsWidth * (numPointsHeight - 1)] = true;\r
+    this.fixedPoints.push(getVertexIndex(8, 10));\r
+    this.fixedPoints.push(getVertexIndex(12, 9));\r

   }\r
 \r
   /**\r
   }\r
 \r
   /**\r


@@ -341,7 +345,8 @@ export class Cloth {
       this.previousPositions[i].copy(this.geometry.vertices[i]);\r
       this.geometry.vertices[i].copy(currentPosition);\r
     }\r
       this.previousPositions[i].copy(this.geometry.vertices[i]);\r
       this.geometry.vertices[i].copy(currentPosition);\r
     }\r

-    //console.log(this.getAcceleration(1, dt));\r
+    \r
+    this.checkIntersect();\r

     \r
     this.time += dt;\r
 \r
     \r
     this.time += dt;\r
 \r


@@ -364,7 +369,31 @@ export class Cloth {
 \r
   }\r
 \r
 \r
   }\r
 \r

-\r
+checkIntersect() {\r
+  let npw = this.numPointsWidth;\r
+  function getX(i, ) { return i % npw; }\r
+  function getY(i) { return Math.floor(i / npw); }\r
+  for (let i in this.geometry.vertices) {\r
+    for (let j in this.geometry.vertices) {\r
+      this.vertexRigidness[i] = false;\r
+      this.vertexRigidness[j] = false;\r
+      if (i == j || (Math.abs(getX(i) - getX(j)) == 1 && Math.abs(getY(i) - getY(j)) == 1))\r
+        continue;\r
+      let posI = this.geometry.vertices[i];\r
+      let posJ = this.geometry.vertices[j];\r
+      let dist = posI.distanceTo(posJ);\r
+      const collisionDistance = 0.5;\r
+      if (dist < collisionDistance) {\r
+        this.vertexRigidness[i] = true;\r
+        this.vertexRigidness[j] = true;\r
+        let diff = this.geometry.vertices[i].clone().sub(this.geometry.vertices[j]).normalize().multiplyScalar((collisionDistance - dist) * 1.001 / 2);\r
+        this.geometry.vertices[i].add(diff);\r
+        this.geometry.vertices[j].sub(diff);\r
+        console.log(this.geometry.vertices[i].distanceTo(this.geometry.vertices[j]));\r
+      }\r
+    }\r
+  }\r
+}\r

 \r
 /**\r
  * Equation of motion for each vertex which represents the acceleration \r
 \r
 /**\r
  * Equation of motion for each vertex which represents the acceleration \r


@@ -372,8 +401,10 @@ export class Cloth {
  *  @param {number} dt The time passed since last frame\r
  */\r
 getAcceleration(vertexIndex, dt) {\r
  *  @param {number} dt The time passed since last frame\r
  */\r
 getAcceleration(vertexIndex, dt) {\r

-  if (this.vertexRigidness[vertexIndex])\r
+  if (this.fixedPoints.includes(parseInt(vertexIndex)) ||\r
+      this.vertexRigidness[vertexIndex]) {\r

     return new THREE.Vector3(0, 0, 0);\r
     return new THREE.Vector3(0, 0, 0);\r

+  }\r

 \r
   let externalForce = this.externalForces[vertexIndex];\r
   let vertex = this.geometry.vertices[vertexIndex];//.add(externalForce);\r
 \r
   let externalForce = this.externalForces[vertexIndex];\r
   let vertex = this.geometry.vertices[vertexIndex];//.add(externalForce);\r


@@ -383,7 +414,7 @@ getAcceleration(vertexIndex, dt) {
   // constant gravity\r
   let g = new THREE.Vector3(0, -9.8, 0);\r
   // stiffness\r
   // constant gravity\r
   let g = new THREE.Vector3(0, -9.8, 0);\r
   // stiffness\r

-  let k = 1000;\r
+  let k = 500;\r

 \r
   // Wind vector\r
   let fWind = new THREE.Vector3(\r
 \r
   // Wind vector\r
   let fWind = new THREE.Vector3(\r

diff --git a/Scripts/main.js b/Scripts/main.js
index 01e3283236abcfab54ad73cb2efd67b162ede951..588e8f1160c0632a4d61daee836ecbb0c12bc562 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -35,7 +35,7 @@ function setup_scene(canvasSpace) {
   scene.add(directionalLight);\r
 \r
   /** position camera */\r
   scene.add(directionalLight);\r
 \r
   /** position camera */\r

-  camera.position.y = 5;\r
+  camera.position.y = 3;\r

   camera.position.z = 10;\r
   addLights(scene);\r
   return [scene, camera, renderer];\r
   camera.position.z = 10;\r
   addLights(scene);\r
   return [scene, camera, renderer];\r


@@ -62,7 +62,7 @@ function init() {
   \r
   /** setup cloth and generate debug mesh */\r
   let cloth = new Cloth();\r
   \r
   /** setup cloth and generate debug mesh */\r
   let cloth = new Cloth();\r

-  cloth.createBasic(10, 10, 10, 10);\r
+  cloth.createBasic(10, 10, 20, 20);\r

   //cloth.createDebugMesh(scene);\r
 \r
 \r
   //cloth.createDebugMesh(scene);\r
 \r
 \r