fix spring force calculation

[cloth_sim] / Scripts / main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index 843c19a5044a32bc6ee7a24d8d01cdd4ecc50f59..4c57ff972420a68b22f0e7b0d1f3be70a8621939 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,133 +1,127 @@
-function init() {\r
-  class Point {\r
-    constructor(x, y) {\r
-      this.x = x;\r
-      this.y = y;\r
-    }\r
-\r
-    add(that) {\r
-      return new Point(\r
-        this.x + that.x,\r
-        this.y + that.y\r
-      );\r
-    }\r
-\r
-    sub(that) {\r
-      return new Point(\r
-        this.x - that.x,\r
-        this.y - that.y\r
-      );\r
-    }\r
-\r
-    dist(that) {\r
-      let a = this.x - that.x;\r
-      let b = this.y - that.y;\r
-      return Math.sqrt(a * a + b * b)\r
-    }\r
-  }\r
-\r
-  class Cloth {\r
-    geometry = new THREE.Geometry();\r
-\r
-    \r
-\r
-    static CreateBasic(width, height, numPointsWidth, numPointsHeight) {\r
-      let vertices = [];\r
-      let faces = [];\r
-\r
-      let stepWidth = width / (numPointsWidth - 1);\r
-      let stepHeight = height / (numPointsHeight - 1);\r
-\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
-          );\r
-        }\r
-      }\r
-\r
-      function getVertexIndex(x, y) {\r
-        return y * numPointsWidth + x;\r
-      }\r
-      \r
-      for (let y = 0; y < numPointsHeight - 1; y++) {\r
-        for (let x = 0; x < numPointsWidth - 1; x++) {\r
-          faces.push(\r
-            new THREE.Face3(\r
-              getVertexIndex(x, y),\r
-              getVertexIndex(x, y + 1),\r
-              getVertexIndex(x + 1, y),\r
-            )\r
-          );\r
-          faces.push(\r
-            new THREE.Face3(\r
-              getVertexIndex(x + 1, y),\r
-              getVertexIndex(x, y + 1),\r
-              getVertexIndex(x + 1, y + 1),\r
-            )\r
-          );\r
-        }\r
-      }\r
-\r
-      return this.CreateExplicit(vertices, faces);\r
-    }\r
-\r
-    static CreateExplicit(vertices, faces) {\r
-      let result = new Cloth();\r
-\r
-      for (let i in vertices) {\r
-        result.geometry.vertices.push(vertices[i]);\r
-      }\r
-      for (let i in faces) {\r
-        result.geometry.faces.push(faces[i]);\r
-      }\r
-\r
-      result.geometry.computeBoundingSphere();\r
-\r
-      return result;\r
-    }\r
-  }\r
+import { Face, Spring, Cloth } from './cloth.js';\r

 \r
 \r

-  let mousePos = new Point();\r

 \r
 \r

-  const canvasSpace = 200;\r
+/**\r
+ * rendering\r
+ * Einheiten konsistent\r
+ * Wind\r
+ * evtl. an Stoff ziehen\r
+ */\r

 \r
 \r

+/**\r
+ * setup THREE JS Scene, Camera and Renderer\r
+ */\r
+function setup_scene(canvasSpace) {\r

   const scene = new THREE.Scene();\r
   const camera = new THREE.PerspectiveCamera(75, window.innerWidth / (window.innerHeight - canvasSpace), 0.1, 1000);\r
   const scene = new THREE.Scene();\r
   const camera = new THREE.PerspectiveCamera(75, window.innerWidth / (window.innerHeight - canvasSpace), 0.1, 1000);\r

-\r

   const renderer = new THREE.WebGLRenderer();\r
   const renderer = new THREE.WebGLRenderer();\r

+  /** size canvas to leave some space for UI */\r

   renderer.setSize(window.innerWidth, window.innerHeight - canvasSpace);\r
   renderer.setSize(window.innerWidth, window.innerHeight - canvasSpace);\r

+  /** embed canvas in HTML */\r

   document.getElementById("threejscontainer").appendChild(renderer.domElement);\r
 \r
   document.getElementById("threejscontainer").appendChild(renderer.domElement);\r
 \r

+  /** add global light */\r

   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);\r
   scene.add(directionalLight);\r
 \r
   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);\r
   scene.add(directionalLight);\r
 \r

-  let cloth = Cloth.CreateBasic(10, 10, 4, 4);\r
-  const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 });\r
-  const mesh = new THREE.Mesh(cloth.geometry, material);\r
-  scene.add(mesh);\r
-\r
+  /** position camera */\r

   camera.position.y = 5;\r
   camera.position.z = 10;\r
 \r
   camera.position.y = 5;\r
   camera.position.z = 10;\r
 \r

+  return [scene, camera, renderer];\r
+}\r
+\r
+/** call "init" when document is fully loaded */\r
+document.body.onload = init;\r
+\r
+function init() {\r
+  let mousePos = new THREE.Vector2();\r
+  let previousClothSimulation;\r
+  \r
+  /**\r
+   * Space left empty under canvas\r
+   * for UI elements\r
+   */\r
+  const canvasSpace = 200;\r
+\r
+  /** Constant Frame Time */\r
+  const frameTime = 1000.0 / 60.0;\r
+\r
+  /** Setup scene */\r
+  let [scene, camera, renderer] = setup_scene(canvasSpace);\r
+  \r
+  /** setup cloth and generate debug mesh */\r
+  let cloth = new Cloth();\r
+  cloth.createBasic(10, 10, 50, 50);\r
+  //cloth.createDebugMesh(scene);\r
+\r
+  //const material = new THREE.MeshBasicMaterial({ color: 0x0000ff, side: THREE.DoubleSide });\r
+  const material = new THREE.MeshStandardMaterial({ color: 0x0000ff, side: THREE.DoubleSide, flatShading: false });\r
+  const mesh = new THREE.Mesh(cloth.geometry, material);\r
+  //const mesh = new THREE.WireframeGeometry(cloth.geometry);\r
+  //const line = new THREE.LineSegments(mesh);\r
+  //line.material.depthTest = false;\r
+  //line.material.opacity = 0.25;\r
+  //line.material.transparent = true;\r
+  scene.add(mesh);\r
+\r
+  scene.add( new THREE.AmbientLight( 0x222222 ) );\r
+\r
+  const light1 = new THREE.PointLight( 0xffffff, 1, 100 );\r
+  light1.position.set( 2, 1, 80 );\r
+  scene.add( light1 );\r
+  const light2 = new THREE.PointLight( 0xffffff, 1, 100 );\r
+  light2.position.set( -2, 1, 80 );\r
+  scene.add( light2 );\r
+  const light3 = new THREE.PointLight( 0xffffff, 1, 100 );\r
+  light3.position.set( 0, -1, 80 );\r
+  scene.add( light3 );\r
+  \r
+  let raycaster = new THREE.Raycaster();\r
+\r
+  /**\r
+   * function called every frame\r
+   * @param {number} dt - time passed since last frame in ms\r
+   */\r

   function animate(dt) {\r
   function animate(dt) {\r

-    requestAnimationFrame(animate);\r
+    cloth.simulate(dt/1000);\r
+\r
+    raycaster.setFromCamera( new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera );\r
+\r
+    const intersects = raycaster.intersectObject( mesh );\r
+\r
+    if ( intersects.length > 0 ) {\r
+      cloth.wind(intersects);\r
+    }\r
+    setTimeout(() => {\r
+      animate(frameTime);\r
+    }, frameTime);\r

     renderer.render(scene, camera);\r
   }\r
 \r
     renderer.render(scene, camera);\r
   }\r
 \r

+\r
+  /** add callback for window resize */\r

   let canvas = document.getElementsByTagName("canvas")[0];\r
   let canvas = document.getElementsByTagName("canvas")[0];\r

+  let w = window.innerWidth;\r
+  let h = window.innerHeight - canvasSpace;\r

   let resize = function () {\r
     w = window.innerWidth;\r
   let resize = function () {\r
     w = window.innerWidth;\r

-    h = window.innerHeight - 200;\r
+    h = window.innerHeight - canvasSpace;\r

     canvas.width = w;\r
     canvas.height = h;\r
   }\r
   window.onresize = resize;\r
   resize();\r
     canvas.width = w;\r
     canvas.height = h;\r
   }\r
   window.onresize = resize;\r
   resize();\r

+\r
+  /**\r
+   * if canvas has been successfully initialized\r
+   * start rendering\r
+   */\r

   if (canvas.getContext) {\r
   if (canvas.getContext) {\r

-    ctx = canvas.getContext('2d');\r

     animate(performance.now());\r
   }\r
     animate(performance.now());\r
   }\r

+\r
+  /** add mouse move callback */\r

   canvas.onmousemove = (evt) => {\r
     mousePos.x = evt.clientX;\r
     mousePos.y = evt.clientY;\r
   canvas.onmousemove = (evt) => {\r
     mousePos.x = evt.clientX;\r
     mousePos.y = evt.clientY;\r