X-Git-Url: https://gitweb.ps.run/cloth_sim/blobdiff_plain/8ecb6f064f0708ed010f1239a7bddc283411b6e7..8199b09231f15b0f84480656a0e92827d795fcdc:/Scripts/main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index 588e8f1..6fa9f22 100644
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,7 +1,7 @@
-import { Face, Spring, Cloth } from './cloth.js';
+//import {  } from './cloth.js';
+//import { OrbitControls } from './OrbitControls.js';
 
 function addLights(scene){
-  
   scene.add( new THREE.AmbientLight( 0x222222 ) );
 
   const light1 = new THREE.PointLight( 0xffffff, 1, 50 );
@@ -15,7 +15,6 @@ function addLights(scene){
   const light3 = new THREE.PointLight( 0xffffff, 1, 50 );
   light3.position.set( 0, -1, 40 );
   scene.add( light3 );
-  
 }
 
 /**
@@ -27,16 +26,38 @@ function setup_scene(canvasSpace) {
   const renderer = new THREE.WebGLRenderer();
   /** size canvas to leave some space for UI */
   renderer.setSize(window.innerWidth, window.innerHeight - canvasSpace);
+  renderer.antialias = true;
   /** embed canvas in HTML */
   document.getElementById("threejscontainer").appendChild(renderer.domElement);
 
+  /** add orbit controls */
+  const controls = new THREE.OrbitControls(camera, renderer.domElement);
+  controls.target.set(0, 0, 0);
+  controls.update();
+
+  /** add scene background */
+  const loader = new THREE.TextureLoader();
+  const texture = loader.load(
+    'Textures/tears_of_steel_bridge_2k.jpg',
+    () => {
+      const rt = new THREE.WebGLCubeRenderTarget(texture.image.height);
+      rt.fromEquirectangularTexture(renderer, texture);
+      scene.background = rt;
+    });
+
+  /** add flag pole */
+  const geometry = new THREE.CylinderGeometry( 0.02, 0.02, 5, 32 );
+  const material = new THREE.MeshStandardMaterial( {color: 0xffffff} );
+  const cylinder = new THREE.Mesh( geometry, material );
+  cylinder.position.set(-0.5, -2.25, 0);
+  scene.add( cylinder );
+
   /** add global light */
   const directionalLight = new THREE.DirectionalLight(0xffffff, 1);
   scene.add(directionalLight);
 
   /** position camera */
-  camera.position.y = 3;
-  camera.position.z = 10;
+  camera.position.z = 2;
   addLights(scene);
   return [scene, camera, renderer];
 }
@@ -46,7 +67,6 @@ document.body.onload = init;
 
 function init() {
   let mousePos = new THREE.Vector2();
-  let previousClothSimulation;
   
   /**
    * Space left empty under canvas
@@ -55,24 +75,25 @@ function init() {
   const canvasSpace = 200;
 
   /** Constant Frame Time */
-  const frameTime = 1000.0 / 60.0;
+  const frameTime = 1000.0 / 200.0;
 
   /** Setup scene */
   let [scene, camera, renderer] = setup_scene(canvasSpace);
   
-  /** setup cloth and generate debug mesh */
-  let cloth = new Cloth();
-  cloth.createBasic(10, 10, 20, 20);
-  //cloth.createDebugMesh(scene);
-
-
-  const material = new THREE.MeshStandardMaterial({ color: 0xC70039, side: THREE.DoubleSide, flatShading: false });
-  const mesh = new THREE.Mesh(cloth.geometry, material);
-
-  scene.add(mesh);
-
-
+  //const loader = new THREE.TextureLoader();
+  //Red color: 0xC70039
+
+  const cloth = new Cloth(1, 0.5, 20, 20);
+  const clothGeometry = cloth.generateGeometry();
+  //const clothMaterial = new THREE.MeshStandardMaterial({ map: loader.load('Textures/DeutschlandFlagge.jpg'), color: 0xffffff, side: THREE.DoubleSide, flatShading: false});
+  const clothMaterial = new THREE.MeshStandardMaterial({ color: 0xC70039, side: THREE.DoubleSide, flatShading: false });
+  const clothMesh = new THREE.Mesh(clothGeometry, clothMaterial);
+  scene.add(clothMesh);
   
+  document.getElementById("windToggle").onchange = (e) => {
+    options.wind = e.target.checked;
+  };
+
   let raycaster = new THREE.Raycaster();
   let intersects;
   let rightMousePressed;
@@ -81,15 +102,17 @@ function init() {
    * @param {number} dt - time passed since last frame in ms
    */
   function animate(dt) {
-    cloth.simulate(dt/1000);
+    cloth.simulate(dt / 1000);
 
+    cloth.updateGeometry(clothGeometry);
+    
     raycaster.setFromCamera( new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera );
 
-    intersects = raycaster.intersectObject( mesh );
+    // intersects = raycaster.intersectObject( mesh );
 
-    if ( intersects.length > 0 && rightMousePressed) {
-      cloth.wind(intersects);
-    }
+    // if ( intersects.length > 0 && rightMousePressed) {
+    //   // Cloth mouse interaction
+    // }
     setTimeout(() => {
       animate(frameTime);
     }, frameTime);
@@ -125,7 +148,7 @@ function init() {
     mousePos.x = evt.clientX;
     mousePos.y = evt.clientY;
 
-    cloth.mouseMove(calculateMousePosToWorld(evt));
+    //cloth.mouseMove(calculateMousePosToWorld(evt));
   };
 
   /**
@@ -142,12 +165,12 @@ function init() {
     rightMousePressed = evt.button == 2;
     
     if(intersects.length > 0 && evt.button == 0){
-      cloth.mousePress(intersects);
+      //cloth.mousePress(intersects);
     } 
   }
   
   canvas.onmouseup = (evt) => {
-    cloth.mouseRelease();
+    //cloth.mouseRelease();
     rightMousePressed = false;
   }