X-Git-Url: https://gitweb.ps.run/cloth_sim/blobdiff_plain/79bcaf1ac3d8bc90b697c444ff5dfb694acb6962..1e3751f45e04a76ce2b11c67aa70e7c65efaad89:/Scripts/main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index 4c57ff9..c269982 100644
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -52,11 +52,11 @@ function init() {
   
   /** setup cloth and generate debug mesh */
   let cloth = new Cloth();
-  cloth.createBasic(10, 10, 50, 50);
+  cloth.createBasic(10, 10, 10, 10);
   //cloth.createDebugMesh(scene);
 
   //const material = new THREE.MeshBasicMaterial({ color: 0x0000ff, side: THREE.DoubleSide });
-  const material = new THREE.MeshStandardMaterial({ color: 0x0000ff, side: THREE.DoubleSide, flatShading: false });
+  const material = new THREE.MeshStandardMaterial({ color: 0xC70039, side: THREE.DoubleSide, flatShading: false });
   const mesh = new THREE.Mesh(cloth.geometry, material);
   //const mesh = new THREE.WireframeGeometry(cloth.geometry);
   //const line = new THREE.LineSegments(mesh);
@@ -67,18 +67,19 @@ function init() {
 
   scene.add( new THREE.AmbientLight( 0x222222 ) );
 
-  const light1 = new THREE.PointLight( 0xffffff, 1, 100 );
-  light1.position.set( 2, 1, 80 );
+  const light1 = new THREE.PointLight( 0xffffff, 1, 50 );
+  light1.position.set( 15, 1, 40 );
   scene.add( light1 );
-  const light2 = new THREE.PointLight( 0xffffff, 1, 100 );
-  light2.position.set( -2, 1, 80 );
+  const light2 = new THREE.PointLight( 0xffffff, 1, 50 );
+  light2.position.set( -15, 0, 40 );
   scene.add( light2 );
-  const light3 = new THREE.PointLight( 0xffffff, 1, 100 );
-  light3.position.set( 0, -1, 80 );
+  const light3 = new THREE.PointLight( 0xffffff, 1, 50 );
+  light3.position.set( 0, -1, 40 );
   scene.add( light3 );
   
   let raycaster = new THREE.Raycaster();
-
+  let intersects;
+  let rightMousePressed;
   /**
    * function called every frame
    * @param {number} dt - time passed since last frame in ms
@@ -88,7 +89,7 @@ function init() {
 
     raycaster.setFromCamera( new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera );
 
-    const intersects = raycaster.intersectObject( mesh );
+    intersects = raycaster.intersectObject( mesh );
 
     if ( intersects.length > 0 ) {
       cloth.wind(intersects);
@@ -121,9 +122,39 @@ function init() {
     animate(performance.now());
   }
 
+  
+
   /** add mouse move callback */
   canvas.onmousemove = (evt) => {
     mousePos.x = evt.clientX;
     mousePos.y = evt.clientY;
+
+    var vec = new THREE.Vector3(); // create once and reuse
+    var pos = new THREE.Vector3(); // create once and reuse
+
+    vec.set(
+      ( evt.clientX / window.innerWidth ) * 2 - 1,
+    - ( evt.clientY / window.innerHeight ) * 2 + 1,
+      0.5 );
+
+    vec.unproject( camera );
+
+    vec.sub( camera.position ).normalize();
+
+    var distance = - camera.position.z / vec.z;
+
+    pos.copy( camera.position ).add( vec.multiplyScalar( distance ) );
+
+    cloth.mouseMove(pos);
   };
+
+  canvas.onmousedown = (evt) => {
+    if(intersects.length > 0){
+      cloth.mousePress(intersects);
+    }
+  }
+  
+  canvas.onmouseup = (evt) => {
+    cloth.mouseRelease();
+  }
 }
\ No newline at end of file