X-Git-Url: https://gitweb.ps.run/cloth_sim/blobdiff_plain/c061ca66adc53232724ce9991fbe8d10c041af36..fcfb3d929c2fefdfdcb6cb9351bcdd0d2d14f9f2:/Scripts/main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index 2388293..a0387ac 100644
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,182 +1,110 @@
-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)
-    }
-  }
+import { Face, Spring, Cloth } from './cloth.js';
 
-  class Face {
-    indices = [];
 
-    constructor(a, b, c, d) {
-      this.indices.push(a);
-      this.indices.push(b);
-      this.indices.push(c);
-      this.indices.push(d);
-    }
+class Point {
+  constructor(x, y) {
+    this.x = x;
+    this.y = y;
   }
 
-  class Cloth {
-    VertexWeight = 1;
-
-    geometry = new THREE.Geometry();
-
-    faces = [];
-
-    vertexWeights = [];
-
-    springs = [];
-
-    getSprings(faceIndex) {
-
-    }
-
-    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 Face(
-              getVertexIndex(x, y),
-              getVertexIndex(x, y + 1),
-              getVertexIndex(x + 1, y),
-              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]);
-        result.vertexWeights.push(0);
-      }
-      for (let i in faces) {
-        let face = faces[i];
-
-        result.geometry.faces.push(new THREE.Face3(
-          face.a, face.b, face.c
-        ));
-        result.geometry.faces.push(new THREE.Face3(
-          face.c, face.b, face.d
-        ));
-        
-        let xLength =
-          result.geometry.vertices[face.b]
-          .sub(result.geometry.vertices[face.a])
-          .length();
-        let yLength =
-          result.geometry.vertices[face.c]
-          .sub(result.geometry.vertices[face.a])
-          .length();
-        let weight = xLength * yLength / 2;
-
-        xLength =
-          result.geometry.vertices[face.b]
-          .sub(result.geometry.vertices[face.d])
-          .length();
-        yLength =
-          result.geometry.vertices[face.c]
-          .sub(result.geometry.vertices[face.d])
-          .length();
-
-        weight += xLength * yLength / 2;
-
-        result.vertexWeights[face.a] += weight / 4;
-        result.vertexWeights[face.b] += weight / 4;
-        result.vertexWeights[face.c] += weight / 4;
-        result.vertexWeights[face.d] += weight / 4;
-      }
-
-      result.geometry.computeBoundingSphere();
-
-      return result;
-    }
+  add(that) {
+    return new Point(
+      this.x + that.x,
+      this.y + that.y
+    );
   }
 
-  let mousePos = new Point();
+  sub(that) {
+    return new Point(
+      this.x - that.x,
+      this.y - that.y
+    );
+  }
 
-  const canvasSpace = 200;
+  dist(that) {
+    let a = this.x - that.x;
+    let b = this.y - that.y;
+    return Math.sqrt(a * a + b * b)
+  }
+}
 
+
+/**
+ * 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 Point();
+
+  /**
+   * Space left empty under canvas
+   * for UI elements
+   */
+  const canvasSpace = 200;
+
+  /** 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);
+
+  const material = new THREE.MeshBasicMaterial({ color: 0x0000ff });
+  const mesh = new THREE.Mesh(cloth.geometry, material);
+  scene.add(mesh);
+
+  /**
+   * function called every frame
+   * @param {number} dt - time passed since last frame
+   */
   function animate(dt) {
     requestAnimationFrame(animate);
     renderer.render(scene, camera);
   }
 
+  /** add callback for window resize */
   let canvas = document.getElementsByTagName("canvas")[0];
   let resize = function () {
-    w = window.innerWidth;
-    h = window.innerHeight - 200;
+    let w = window.innerWidth;
+    let h = window.innerHeight - 200;
     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;