X-Git-Url: https://gitweb.ps.run/cloth_sim/blobdiff_plain/fc396e0a9cd744fa4d2c37f0052f395320580cc5..79bcaf1ac3d8bc90b697c444ff5dfb694acb6962:/Scripts/main.js?ds=sidebyside

diff --git a/Scripts/main.js b/Scripts/main.js
index 843c19a..4c57ff9 100644
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,133 +1,127 @@
-function init() {
-  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)
-    }
-  }
-
-  class Cloth {
-    geometry = new THREE.Geometry();
-
-    
-
-    static CreateBasic(width, height, numPointsWidth, numPointsHeight) {
-      let vertices = [];
-      let faces = [];
-
-      let stepWidth = width / (numPointsWidth - 1);
-      let stepHeight = height / (numPointsHeight - 1);
-
-      for (let y = 0; y < numPointsHeight; y++) {
-        for (let x = 0; x < numPointsWidth; x++) {
-          vertices.push(
-            new THREE.Vector3(x * stepWidth, height - y * stepHeight, 0)
-          );
-        }
-      }
-
-      function getVertexIndex(x, y) {
-        return y * numPointsWidth + x;
-      }
-      
-      for (let y = 0; y < numPointsHeight - 1; y++) {
-        for (let x = 0; x < numPointsWidth - 1; x++) {
-          faces.push(
-            new THREE.Face3(
-              getVertexIndex(x, y),
-              getVertexIndex(x, y + 1),
-              getVertexIndex(x + 1, y),
-            )
-          );
-          faces.push(
-            new THREE.Face3(
-              getVertexIndex(x + 1, y),
-              getVertexIndex(x, y + 1),
-              getVertexIndex(x + 1, y + 1),
-            )
-          );
-        }
-      }
-
-      return this.CreateExplicit(vertices, faces);
-    }
-
-    static CreateExplicit(vertices, faces) {
-      let result = new Cloth();
-
-      for (let i in vertices) {
-        result.geometry.vertices.push(vertices[i]);
-      }
-      for (let i in faces) {
-        result.geometry.faces.push(faces[i]);
-      }
-
-      result.geometry.computeBoundingSphere();
-
-      return result;
-    }
-  }
+import { Face, Spring, Cloth } from './cloth.js';
 
-  let mousePos = new Point();
 
-  const canvasSpace = 200;
+/**
+ * rendering
+ * Einheiten konsistent
+ * Wind
+ * evtl. an Stoff ziehen
+ */
 
+/**
+ * setup THREE JS Scene, Camera and Renderer
+ */
+function setup_scene(canvasSpace) {
   const scene = new THREE.Scene();
   const camera = new THREE.PerspectiveCamera(75, window.innerWidth / (window.innerHeight - canvasSpace), 0.1, 1000);
-
   const renderer = new THREE.WebGLRenderer();
+  /** size canvas to leave some space for UI */
   renderer.setSize(window.innerWidth, window.innerHeight - canvasSpace);
+  /** embed canvas in HTML */
   document.getElementById("threejscontainer").appendChild(renderer.domElement);
 
+  /** add global light */
   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);
   scene.add(directionalLight);
 
-  let cloth = Cloth.CreateBasic(10, 10, 4, 4);
-  const material = new THREE.MeshBasicMaterial({ color: 0x00ff00 });
-  const mesh = new THREE.Mesh(cloth.geometry, material);
-  scene.add(mesh);
-
+  /** position camera */
   camera.position.y = 5;
   camera.position.z = 10;
 
+  return [scene, camera, renderer];
+}
+
+/** call "init" when document is fully loaded */
+document.body.onload = init;
+
+function init() {
+  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, 50, 50);
+  //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 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, 100 );
+  light1.position.set( 2, 1, 80 );
+  scene.add( light1 );
+  const light2 = new THREE.PointLight( 0xffffff, 1, 100 );
+  light2.position.set( -2, 1, 80 );
+  scene.add( light2 );
+  const light3 = new THREE.PointLight( 0xffffff, 1, 100 );
+  light3.position.set( 0, -1, 80 );
+  scene.add( light3 );
+  
+  let raycaster = new THREE.Raycaster();
+
+  /**
+   * function called every 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 );
+
+    const 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 () {
     w = window.innerWidth;
-    h = window.innerHeight - 200;
+    h = window.innerHeight - canvasSpace;
     canvas.width = w;
     canvas.height = h;
   }
   window.onresize = resize;
   resize();
+
+  /**
+   * if canvas has been successfully initialized
+   * start rendering
+   */
   if (canvas.getContext) {
-    ctx = canvas.getContext('2d');
     animate(performance.now());
   }
+
+  /** add mouse move callback */
   canvas.onmousemove = (evt) => {
     mousePos.x = evt.clientX;
     mousePos.y = evt.clientY;