add flag textures

[cloth_sim] / Scripts / main.js

diff --git a/Scripts/main.js b/Scripts/main.js
index fc797c872ed2503a9808e8a86df0bfa5411e5dab..5e68a4f322020e8baea4bbd6ffdc44b94235f024 100644 (file)
--- a/Scripts/main.js
+++ b/Scripts/main.js
@@ -1,8 +1,6 @@
-import { Face, Spring, Cloth } from './cloth.js';\r
-import { OrbitControls } from './OrbitControls.js';\r
+\r

 \r
 function addLights(scene){\r
 \r
 function addLights(scene){\r

-  \r

   scene.add( new THREE.AmbientLight( 0x222222 ) );\r
 \r
   const light1 = new THREE.PointLight( 0xffffff, 1, 50 );\r
   scene.add( new THREE.AmbientLight( 0x222222 ) );\r
 \r
   const light1 = new THREE.PointLight( 0xffffff, 1, 50 );\r


@@ -16,7 +14,6 @@ function addLights(scene){
   const light3 = new THREE.PointLight( 0xffffff, 1, 50 );\r
   light3.position.set( 0, -1, 40 );\r
   scene.add( light3 );\r
   const light3 = new THREE.PointLight( 0xffffff, 1, 50 );\r
   light3.position.set( 0, -1, 40 );\r
   scene.add( light3 );\r

-  \r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -33,7 +30,7 @@ function setup_scene(canvasSpace) {
   document.getElementById("threejscontainer").appendChild(renderer.domElement);\r
 \r
   /** add orbit controls */\r
   document.getElementById("threejscontainer").appendChild(renderer.domElement);\r
 \r
   /** add orbit controls */\r

-  const controls = new OrbitControls(camera, renderer.domElement);\r
+  const controls = new THREE.OrbitControls(camera, renderer.domElement);\r

   controls.target.set(0, 0, 0);\r
   controls.update();\r
 \r
   controls.target.set(0, 0, 0);\r
   controls.update();\r
 \r


@@ -69,7 +66,6 @@ document.body.onload = init;
 \r
 function init() {\r
   let mousePos = new THREE.Vector2();\r
 \r
 function init() {\r
   let mousePos = new THREE.Vector2();\r

-  let previousClothSimulation;\r

   \r
   /**\r
    * Space left empty under canvas\r
   \r
   /**\r
    * Space left empty under canvas\r


@@ -78,30 +74,26 @@ function init() {
   const canvasSpace = 200;\r
 \r
   /** Constant Frame Time */\r
   const canvasSpace = 200;\r
 \r
   /** Constant Frame Time */\r

-  const frameTime = 1000.0 / 60.0;\r
+  const frameTime = 1000.0 / 200.0;\r

 \r
   /** Setup scene */\r
   let [scene, camera, renderer] = setup_scene(canvasSpace);\r
   \r
 \r
   /** Setup scene */\r
   let [scene, camera, renderer] = setup_scene(canvasSpace);\r
   \r

-  /** setup cloth and generate debug mesh */\r
-  let cloth = new Cloth();\r
-  cloth.createBasic(1, 0.5, 20, 20);\r
+  const loader = new THREE.TextureLoader();\r
+  //Red color: 0xC70039\r
+\r
+  const cloth = new Cloth(1, 0.5, 20, 20);\r
+  const clothGeometry = cloth.generateGeometry();\r
+  const clothMaterial = new THREE.MeshStandardMaterial({ map: loader.load('Textures/hsrm.jpg'), color: 0xffffff, side: THREE.DoubleSide, flatShading: false});\r
+  //const clothMaterial = new THREE.MeshStandardMaterial({ color: 0xC70039, side: THREE.DoubleSide, flatShading: false });\r
+  const clothMesh = new THREE.Mesh(clothGeometry, clothMaterial);\r
+  scene.add(clothMesh);\r
+  \r
+  document.getElementById("windToggle").checked = options.wind;\r

   document.getElementById("windToggle").onchange = (e) => {\r
   document.getElementById("windToggle").onchange = (e) => {\r

-    if (e.target.checked)\r
-      cloth.windFactor.set(0.5, 0.2, 0.2);\r
-    else\r
-      cloth.windFactor.set(0, 0, 0);\r
+    options.wind = e.target.checked;\r

   };\r
   };\r

-  //cloth.createDebugMesh(scene);\r
-\r

 \r
 \r

-  const material = new THREE.MeshStandardMaterial({ color: 0xC70039, side: THREE.DoubleSide, flatShading: false });\r
-  const mesh = new THREE.Mesh(cloth.geometry, material);\r
-\r
-  scene.add(mesh);\r
-\r
-\r
-  \r

   let raycaster = new THREE.Raycaster();\r
   let intersects;\r
   let rightMousePressed;\r
   let raycaster = new THREE.Raycaster();\r
   let intersects;\r
   let rightMousePressed;\r


@@ -110,15 +102,17 @@ function init() {
    * @param {number} dt - time passed since last frame in ms\r
    */\r
   function animate(dt) {\r
    * @param {number} dt - time passed since last frame in ms\r
    */\r
   function animate(dt) {\r

-    cloth.simulate(dt/1000);\r
+    cloth.simulate(dt / 1000);\r

 \r
 \r

+    cloth.updateGeometry(clothGeometry);\r
+    \r

     raycaster.setFromCamera( new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera );\r
 \r
     raycaster.setFromCamera( new THREE.Vector2((mousePos.x / w) * 2 - 1, ((h - mousePos.y) / h) * 2 - 1), camera );\r
 \r

-    intersects = raycaster.intersectObject( mesh );\r
+    // intersects = raycaster.intersectObject( mesh );\r

 \r
 \r

-    if ( intersects.length > 0 && rightMousePressed) {\r
-      cloth.wind(intersects);\r
-    }\r
+    // if ( intersects.length > 0 && rightMousePressed) {\r
+    //   // Cloth mouse interaction\r
+    // }\r

     setTimeout(() => {\r
       animate(frameTime);\r
     }, frameTime);\r
     setTimeout(() => {\r
       animate(frameTime);\r
     }, frameTime);\r


@@ -154,7 +148,7 @@ function init() {
     mousePos.x = evt.clientX;\r
     mousePos.y = evt.clientY;\r
 \r
     mousePos.x = evt.clientX;\r
     mousePos.y = evt.clientY;\r
 \r

-    cloth.mouseMove(calculateMousePosToWorld(evt));\r
+    //cloth.mouseMove(calculateMousePosToWorld(evt));\r

   };\r
 \r
   /**\r
   };\r
 \r
   /**\r


@@ -171,12 +165,12 @@ function init() {
     rightMousePressed = evt.button == 2;\r
     \r
     if(intersects.length > 0 && evt.button == 0){\r
     rightMousePressed = evt.button == 2;\r
     \r
     if(intersects.length > 0 && evt.button == 0){\r

-      cloth.mousePress(intersects);\r
+      //cloth.mousePress(intersects);\r

     } \r
   }\r
   \r
   canvas.onmouseup = (evt) => {\r
     } \r
   }\r
   \r
   canvas.onmouseup = (evt) => {\r

-    cloth.mouseRelease();\r
+    //cloth.mouseRelease();\r

     rightMousePressed = false;\r
   }\r
 \r
     rightMousePressed = false;\r
   }\r
 \r