correct units, tweak parameters

[cloth_sim] / Scripts / main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index f395b6c19993a1c5821ff1ee5ae8d4164629ab32..8c61f82566a2653bc8f890435f7a41a30f098186 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,68 +1,131 @@
-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
+import { Face, Spring, Cloth } from './cloth.js';\r
+\r
+\r
+/**\r
+ * rendering\r
+ * Einheiten konsistent\r
+ * Wind\r
+ * evtl. an Stoff ziehen\r
+ */\r
+\r
+\r
+class Point {\r
+  constructor(x, y) {\r
+    this.x = x;\r
+    this.y = y;\r

   }\r
 \r
   }\r
 \r

-  let mousePos = new Point();\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
 \r

-  const scene = new THREE.Scene();\r
-  const camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 1000);\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 renderer = new THREE.WebGLRenderer();\r
   const renderer = new THREE.WebGLRenderer();\r

-  renderer.setSize(window.innerWidth, window.innerHeight - 200);\r
+  /** size canvas to leave some space for UI */\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

-  const geometry = new THREE.BoxGeometry();\r
-  const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 });\r
-  const cube = new THREE.Mesh(geometry, material);\r
-  scene.add(cube);\r
+  /** position camera */\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 Point();\r
+  let previousClothSimulation;\r
+  \r
+  /**\r
+   * Space left empty under canvas\r
+   * for UI elements\r
+   */\r
+  const canvasSpace = 200;\r

 \r
 \r

-  camera.position.z = 5;\r
+  /** Constant Frame Time */\r
+  const frameTime = 1000.0 / 60.0;\r

 \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, 10, 10);\r
+  //cloth.createDebugMesh(scene);\r
+\r
+  const material = new THREE.MeshBasicMaterial({ color: 0x0000ff });\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
+  /**\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
+    setTimeout(() => {\r
+      animate(frameTime);\r
+    }, frameTime);\r

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

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

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

-    w = window.innerWidth;\r
-    h = window.innerHeight - 200;\r
+    let w = window.innerWidth;\r
+    let h = window.innerHeight - 200;\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