Distinguish between right and left mouse click for wind and dragging

diff --git a/Scripts/cloth.js b/Scripts/cloth.js
index c873a3d05cd232d1aa5c361dc336b6e343393ed3..1ec79d5bec9bdff2f11b4bed1b67a5c4417658c3 100644 (file)
--- a/Scripts/cloth.js
+++ b/Scripts/cloth.js
@@ -99,7 +99,7 @@ export class Cloth {
   vertexRigidness = [];\r
 \r
   externalForces = [];\r
   vertexRigidness = [];\r
 \r
   externalForces = [];\r

-  windForce = 0;\r
+  windForce = 100;\r

 \r
   /**\r
    * creates a rectangular piece of cloth\r
 \r
   /**\r
    * creates a rectangular piece of cloth\r

diff --git a/Scripts/main.js b/Scripts/main.js
index c26998279b23b5ccc026d64a4c7ca8c756cee3a2..5f6595ee0510d859b97ff1f313109f0d0536ef25 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -91,7 +91,7 @@ function init() {
 \r
     intersects = raycaster.intersectObject( mesh );\r
 \r
 \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
       cloth.wind(intersects);\r
     }\r
     setTimeout(() => {\r


@@ -149,12 +149,15 @@ function init() {
   };\r
 \r
   canvas.onmousedown = (evt) => {\r
   };\r
 \r
   canvas.onmousedown = (evt) => {\r

-    if(intersects.length > 0){\r
+    rightMousePressed = evt.button == 2;\r
+    \r
+    if(intersects.length > 0 && evt.button == 0){\r

       cloth.mousePress(intersects);\r
       cloth.mousePress(intersects);\r

-    }\r
+    } \r

   }\r
   \r
   canvas.onmouseup = (evt) => {\r
     cloth.mouseRelease();\r
   }\r
   \r
   canvas.onmouseup = (evt) => {\r
     cloth.mouseRelease();\r

+    rightMousePressed = false;\r

   }\r
 }
\ No newline at end of file
   }\r
 }
\ No newline at end of file