fix exploding behaviour

[cloth_sim] / Scripts / main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index 588e8f1160c0632a4d61daee836ecbb0c12bc562..51d676254df65d909c4d90deb63df3101a72ddb4 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,21 +1,19 @@
-import { Face, Spring, Cloth } from './cloth.js';\r
+\r

 \r
 function addLights(scene){\r
 \r
 function addLights(scene){\r

-  \r
-  scene.add( new THREE.AmbientLight( 0x222222 ) );\r
+  scene.add(new THREE.AmbientLight(0x222222));\r

 \r
 \r

-  const light1 = new THREE.PointLight( 0xffffff, 1, 50 );\r
-  light1.position.set( 15, 1, 40 );\r
-  scene.add( light1 );\r
+  const light1 = new THREE.PointLight(0xffffff, 1, 50);\r
+  light1.position.set(15, 1, 40);\r
+  scene.add(light1);\r

 \r
 \r

-  const light2 = new THREE.PointLight( 0xffffff, 1, 50 );\r
-  light2.position.set( -15, 0, 40 );\r
-  scene.add( light2 );\r
+  const light2 = new THREE.PointLight(0xffffff, 1, 50);\r
+  light2.position.set(-15, 0, 40);\r
+  scene.add(light2);\r

 \r
 \r

-  const light3 = new THREE.PointLight( 0xffffff, 1, 50 );\r
-  light3.position.set( 0, -1, 40 );\r
-  scene.add( light3 );\r
-  \r
+  const light3 = new THREE.PointLight(0xffffff, 1, 50);\r
+  light3.position.set(0, -1, 40);\r
+  scene.add(light3);\r

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


@@ -27,16 +25,38 @@ function setup_scene(canvasSpace) {
   const renderer = new THREE.WebGLRenderer();\r
   /** size canvas to leave some space for UI */\r
   renderer.setSize(window.innerWidth, window.innerHeight - canvasSpace);\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.antialias = true;\r

   /** embed canvas in HTML */\r
   document.getElementById("threejscontainer").appendChild(renderer.domElement);\r
 \r
   /** embed canvas in HTML */\r
   document.getElementById("threejscontainer").appendChild(renderer.domElement);\r
 \r

+  /** add orbit controls */\r
+  const controls = new THREE.OrbitControls(camera, renderer.domElement);\r
+  controls.target.set(0, 0, 0);\r
+  controls.update();\r
+\r
+  /** add scene background */\r
+  const loader = new THREE.TextureLoader();\r
+  const texture = loader.load(\r
+    'Textures/tears_of_steel_bridge_2k.jpg',\r
+    () => {\r
+      const rt = new THREE.WebGLCubeRenderTarget(texture.image.height);\r
+      rt.fromEquirectangularTexture(renderer, texture);\r
+      scene.background = rt;\r
+    });\r
+\r
+  /** add flag pole */\r
+  const geometry = new THREE.CylinderGeometry(0.02, 0.02, 5, 32);\r
+  const material = new THREE.MeshStandardMaterial({color: 0xffffff});\r
+  const cylinder = new THREE.Mesh(geometry, material);\r
+  cylinder.position.set(-0.5, -2.25, 0);\r
+  scene.add(cylinder);\r
+\r

   /** add global light */\r
   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);\r
   scene.add(directionalLight);\r
 \r
   /** position camera */\r
   /** add global light */\r
   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);\r
   scene.add(directionalLight);\r
 \r
   /** position camera */\r

-  camera.position.y = 3;\r
-  camera.position.z = 10;\r
+  camera.position.z = 2;\r

   addLights(scene);\r
   return [scene, camera, renderer];\r
 }\r
   addLights(scene);\r
   return [scene, camera, renderer];\r
 }\r


@@ -46,7 +66,6 @@ document.body.onload = init;
 \r
 function init() {\r
   let mousePos = new THREE.Vector2();\r
 \r
 function init() {\r
   let mousePos = new THREE.Vector2();\r

-  let previousClothSimulation;\r

   \r
   /**\r
    * Space left empty under canvas\r
   \r
   /**\r
    * Space left empty under canvas\r


@@ -55,41 +74,52 @@ function init() {
   const canvasSpace = 200;\r
 \r
   /** Constant Frame Time */\r
   const canvasSpace = 200;\r
 \r
   /** Constant Frame Time */\r

-  const frameTime = 1000.0 / 60.0;\r
+  const frameTime = 1000.0 / 200.0;\r

 \r
   /** Setup scene */\r
   let [scene, camera, renderer] = setup_scene(canvasSpace);\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, 20, 20);\r
-  //cloth.createDebugMesh(scene);\r
-\r
-\r
-  const material = new THREE.MeshStandardMaterial({ color: 0xC70039, side: THREE.DoubleSide, flatShading: false });\r
-  const mesh = new THREE.Mesh(cloth.geometry, material);\r
-\r
-  scene.add(mesh);\r
-\r
-\r
+  const loader = new THREE.TextureLoader();\r
+  //Red color: 0xC70039\r
+\r
+  const cloth = new Cloth(1, 0.5, 20, 20);\r
+  const clothGeometry = cloth.generateGeometry();\r
+  const clothMaterial = new THREE.MeshStandardMaterial({ map: loader.load('Textures/hsrm2.png'), color: {type: "c", value: new THREE.Color(0xffffff)}, side: THREE.DoubleSide, flatShading: false, transparent: true });\r
+  //const clothMaterial = new THREE.MeshStandardMaterial({ color: 0xC70039, side: THREE.DoubleSide, flatShading: false });\r
+  const clothMesh = new THREE.Mesh(clothGeometry, clothMaterial);\r
+  scene.add(clothMesh);\r

   \r
   \r

+  document.getElementById("windToggle").checked = options.wind;\r
+  document.getElementById("windToggle").onchange = (e) => {\r
+    options.wind = e.target.checked;\r
+  };\r
+\r

   let raycaster = new THREE.Raycaster();\r
   let intersects;\r
   let raycaster = new THREE.Raycaster();\r
   let intersects;\r

-  let rightMousePressed;\r
+  let windKeyDown = false;\r
+  let dragKeyDown = false;\r
+  let draggedIndex = -1;\r

   /**\r
    * function called every frame\r
    * @param {number} dt - time passed since last frame in ms\r
    */\r
   function animate(dt) {\r
   /**\r
    * function called every frame\r
    * @param {number} dt - time passed since last frame in ms\r
    */\r
   function animate(dt) {\r

-    cloth.simulate(dt/1000);\r
+    cloth.simulate(dt / 1000);\r

 \r
 \r

-    raycaster.setFromCamera( new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera );\r
+    cloth.updateGeometry(clothGeometry);\r
+    \r
+    raycaster.setFromCamera(new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera);\r

 \r
 \r

-    intersects = raycaster.intersectObject( mesh );\r
+    intersects = raycaster.intersectObject(clothMesh);\r

 \r
 \r

-    if ( intersects.length > 0 && rightMousePressed) {\r
-      cloth.wind(intersects);\r
+    if (intersects.length > 0) {\r
+      if (windKeyDown)\r
+        cloth.blow(camera.position, intersects);\r
+      if (dragKeyDown && draggedIndex == -1)\r
+        draggedIndex = intersects[0].face.a;\r

     }\r
     }\r

+    if (dragKeyDown && draggedIndex != -1)\r
+      cloth.drag(calculateMousePosToWorld(mousePos), draggedIndex);\r

     setTimeout(() => {\r
       animate(frameTime);\r
     }, frameTime);\r
     setTimeout(() => {\r
       animate(frameTime);\r
     }, frameTime);\r


@@ -115,7 +145,7 @@ function init() {
    * start rendering\r
    */\r
   if (canvas.getContext) {\r
    * start rendering\r
    */\r
   if (canvas.getContext) {\r

-    animate(performance.now());\r
+    animate(frameTime);\r

   }\r
 \r
   \r
   }\r
 \r
   \r


@@ -124,8 +154,6 @@ function init() {
   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

-\r
-    cloth.mouseMove(calculateMousePosToWorld(evt));\r

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


@@ -135,38 +163,38 @@ function init() {
     evt.preventDefault();\r
   }, false);\r
 \r
     evt.preventDefault();\r
   }, false);\r
 \r

+  document.onkeydown = (evt) => {\r
+    if (evt.code === "KeyW")\r
+      windKeyDown = true;\r
+    if (evt.code === "KeyD")\r
+      dragKeyDown = true;\r
+  };\r

 \r
 \r

-  canvas.onmousedown = (evt) => {\r
-\r
-    // Check mouse click\r
-    rightMousePressed = evt.button == 2;\r
-    \r
-    if(intersects.length > 0 && evt.button == 0){\r
-      cloth.mousePress(intersects);\r
-    } \r
-  }\r
-  \r
-  canvas.onmouseup = (evt) => {\r
-    cloth.mouseRelease();\r
-    rightMousePressed = false;\r
-  }\r
+  document.onkeyup = (evt) => {\r
+    if (evt.code === "KeyW")\r
+      windKeyDown = false;\r
+    if (evt.code === "KeyD") {\r
+      dragKeyDown = false;\r
+      draggedIndex = -1;\r
+    }\r
+  };\r

 \r
 \r

-  function calculateMousePosToWorld(evt){\r
+  function calculateMousePosToWorld(mousePos){\r

     var vec = new THREE.Vector3(); // create once and reuse\r
     var pos = new THREE.Vector3(); // create once and reuse\r
 \r
     vec.set(\r
     var vec = new THREE.Vector3(); // create once and reuse\r
     var pos = new THREE.Vector3(); // create once and reuse\r
 \r
     vec.set(\r

-      ( evt.clientX / window.innerWidth ) * 2 - 1,\r
-    - ( evt.clientY / window.innerHeight ) * 2 + 1,\r
-      0.5 );\r
+      (mousePos.x / window.innerWidth) * 2 - 1,\r
+    - (mousePos.y / window.innerHeight) * 2 + 1,\r
+      0.5);\r

 \r
 \r

-    vec.unproject( camera );\r
+    vec.unproject(camera);\r

 \r
 \r

-    vec.sub( camera.position ).normalize();\r
+    vec.sub(camera.position).normalize();\r

 \r
     var distance = - camera.position.z / vec.z;\r
 \r
 \r
     var distance = - camera.position.z / vec.z;\r
 \r

-    pos.copy( camera.position ).add( vec.multiplyScalar( distance ) );\r
+    pos.copy(camera.position).add(vec.multiplyScalar(distance));\r

     return pos;\r
   }\r
 }
\ No newline at end of file
     return pos;\r
   }\r
 }
\ No newline at end of file