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

diff --git a/Scripts/main.js b/Scripts/main.js
index a0387ac..c269982 100644
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,33 +1,12 @@
 import { Face, Spring, Cloth } from './cloth.js';
 
 
-class Point {
-  constructor(x, y) {
-    this.x = x;
-    this.y = y;
-  }
-
-  add(that) {
-    return new Point(
-      this.x + that.x,
-      this.y + that.y
-    );
-  }
-
-  sub(that) {
-    return new Point(
-      this.x - that.x,
-      this.y - that.y
-    );
-  }
-
-  dist(that) {
-    let a = this.x - that.x;
-    let b = this.y - that.y;
-    return Math.sqrt(a * a + b * b)
-  }
-}
-
+/**
+ * rendering
+ * Einheiten konsistent
+ * Wind
+ * evtl. an Stoff ziehen
+ */
 
 /**
  * setup THREE JS Scene, Camera and Renderer
@@ -56,40 +35,79 @@ function setup_scene(canvasSpace) {
 document.body.onload = init;
 
 function init() {
-  let mousePos = new Point();
-
+  let mousePos = new THREE.Vector2();
+  let previousClothSimulation;
+  
   /**
    * Space left empty under canvas
    * for UI elements
    */
   const canvasSpace = 200;
 
+  /** Constant Frame Time */
+  const frameTime = 1000.0 / 60.0;
+
   /** Setup scene */
   let [scene, camera, renderer] = setup_scene(canvasSpace);
   
   /** setup cloth and generate debug mesh */
   let cloth = new Cloth();
-  cloth.createBasic(10, 10, 5, 5);
-  cloth.createDebugMesh(scene);
+  cloth.createBasic(10, 10, 10, 10);
+  //cloth.createDebugMesh(scene);
 
-  const material = new THREE.MeshBasicMaterial({ color: 0x0000ff });
+  //const material = new THREE.MeshBasicMaterial({ color: 0x0000ff, side: THREE.DoubleSide });
+  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);
+  //line.material.depthTest = false;
+  //line.material.opacity = 0.25;
+  //line.material.transparent = true;
   scene.add(mesh);
 
+  scene.add( new THREE.AmbientLight( 0x222222 ) );
+
+  const light1 = new THREE.PointLight( 0xffffff, 1, 50 );
+  light1.position.set( 15, 1, 40 );
+  scene.add( light1 );
+  const light2 = new THREE.PointLight( 0xffffff, 1, 50 );
+  light2.position.set( -15, 0, 40 );
+  scene.add( light2 );
+  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
+   * @param {number} dt - time passed since last frame in ms
    */
   function animate(dt) {
-    requestAnimationFrame(animate);
+    cloth.simulate(dt/1000);
+
+    raycaster.setFromCamera( new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera );
+
+    intersects = raycaster.intersectObject( mesh );
+
+    if ( intersects.length > 0 ) {
+      cloth.wind(intersects);
+    }
+    setTimeout(() => {
+      animate(frameTime);
+    }, frameTime);
     renderer.render(scene, camera);
   }
 
+
   /** add callback for window resize */
   let canvas = document.getElementsByTagName("canvas")[0];
+  let w = window.innerWidth;
+  let h = window.innerHeight - canvasSpace;
   let resize = function () {
-    let w = window.innerWidth;
-    let h = window.innerHeight - 200;
+    w = window.innerWidth;
+    h = window.innerHeight - canvasSpace;
     canvas.width = w;
     canvas.height = h;
   }
@@ -104,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