Distinguish between right and left mouse click for wind and dragging

[cloth_sim] / Scripts / main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index 20a6e923be73f7f3c03f1a0d6a03d9d6237e6a91..5f6595ee0510d859b97ff1f313109f0d0536ef25 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -56,7 +56,7 @@ function init() {
   //cloth.createDebugMesh(scene);\r
 \r
   //const material = new THREE.MeshBasicMaterial({ color: 0x0000ff, side: THREE.DoubleSide });\r
-  const material = new THREE.MeshPhongMaterial({ color: 0x0000ff, side: THREE.DoubleSide });\r
+  const material = new THREE.MeshStandardMaterial({ color: 0xC70039, 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
@@ -65,14 +65,21 @@ function init() {
   //line.material.transparent = true;\r
   scene.add(mesh);\r
 \r
-  scene.add( new THREE.AmbientLight( 0x666666 ) );\r
-\r
-  const light = new THREE.DirectionalLight( 0xffffff, 0.5 );\r
-  light.position.set( 0, 1, 0.5 );\r
-  scene.add( light );\r
+  scene.add( new THREE.AmbientLight( 0x222222 ) );\r
+\r
+  const light1 = new THREE.PointLight( 0xffffff, 1, 50 );\r
+  light1.position.set( 15, 1, 40 );\r
+  scene.add( light1 );\r
+  const light2 = new THREE.PointLight( 0xffffff, 1, 50 );\r
+  light2.position.set( -15, 0, 40 );\r
+  scene.add( light2 );\r
+  const light3 = new THREE.PointLight( 0xffffff, 1, 50 );\r
+  light3.position.set( 0, -1, 40 );\r
+  scene.add( light3 );\r
   \r
   let raycaster = new THREE.Raycaster();\r
-\r
+  let intersects;\r
+  let rightMousePressed;\r
   /**\r
    * function called every frame\r
    * @param {number} dt - time passed since last frame in ms\r
@@ -82,9 +89,9 @@ function init() {
 \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
+    intersects = raycaster.intersectObject( mesh );\r
 \r
-    if ( intersects.length > 0 ) {\r
+    if ( intersects.length > 0 && rightMousePressed) {\r
       cloth.wind(intersects);\r
     }\r
     setTimeout(() => {\r
@@ -115,9 +122,42 @@ function init() {
     animate(performance.now());\r
   }\r
 \r
+  \r
+\r
   /** add mouse move callback */\r
   canvas.onmousemove = (evt) => {\r
     mousePos.x = evt.clientX;\r
     mousePos.y = evt.clientY;\r
+\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
+\r
+    vec.unproject( camera );\r
+\r
+    vec.sub( camera.position ).normalize();\r
+\r
+    var distance = - camera.position.z / vec.z;\r
+\r
+    pos.copy( camera.position ).add( vec.multiplyScalar( distance ) );\r
+\r
+    cloth.mouseMove(pos);\r
   };\r
+\r
+  canvas.onmousedown = (evt) => {\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
 }
\ No newline at end of file