fix spring force calculation

[cloth_sim] / Scripts / main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index 5ed1866027c92343b1cde743c6b527dedbeb2f27..4c57ff972420a68b22f0e7b0d1f3be70a8621939 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,33 +1,12 @@
 import { Face, Spring, Cloth } from './cloth.js';\r
 \r
 \r
 import { Face, Spring, Cloth } from './cloth.js';\r
 \r
 \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
+/**\r
+ * rendering\r
+ * Einheiten konsistent\r
+ * Wind\r
+ * evtl. an Stoff ziehen\r
+ */\r

 \r
 /**\r
  * setup THREE JS Scene, Camera and Renderer\r
 \r
 /**\r
  * setup THREE JS Scene, Camera and Renderer\r


@@ -56,7 +35,7 @@ function setup_scene(canvasSpace) {
 document.body.onload = init;\r
 \r
 function init() {\r
 document.body.onload = init;\r
 \r
 function init() {\r

-  let mousePos = new Point();\r
+  let mousePos = new THREE.Vector2();\r

   let previousClothSimulation;\r
   \r
   /**\r
   let previousClothSimulation;\r
   \r
   /**\r


@@ -65,15 +44,19 @@ function init() {
    */\r
   const canvasSpace = 200;\r
 \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
   /** 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, 5, 5);\r
-  cloth.createDebugMesh(scene);\r
+  cloth.createBasic(10, 10, 50, 50);\r
+  //cloth.createDebugMesh(scene);\r

 \r
 \r

-  const material = new THREE.MeshBasicMaterial({ color: 0x0000ff });\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
   const mesh = new THREE.Mesh(cloth.geometry, material);\r
   //const mesh = new THREE.WireframeGeometry(cloth.geometry);\r
   //const line = new THREE.LineSegments(mesh);\r


@@ -82,25 +65,48 @@ function init() {
   //line.material.transparent = true;\r
   scene.add(mesh);\r
 \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
   /**\r
    * function called every frame\r

-   * @param {number} dt - time passed since last frame\r
+   * @param {number} dt - time passed since last frame in ms\r

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

-    \r
-    cloth.simulate(dt);\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
 \r

+    const intersects = raycaster.intersectObject( mesh );\r
+\r
+    if ( intersects.length > 0 ) {\r
+      cloth.wind(intersects);\r
+    }\r

     setTimeout(() => {\r
     setTimeout(() => {\r

-      animate(2000);\r
-    }, 2000);\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
   /** add callback for window resize */\r
   let canvas = document.getElementsByTagName("canvas")[0];\r

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

   let resize = function () {\r
   let resize = function () {\r

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

     canvas.width = w;\r
     canvas.height = h;\r
   }\r
     canvas.width = w;\r
     canvas.height = h;\r
   }\r