]> gitweb.ps.run Git - cloth_sim/commitdiff
projects / cloth_sim / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: f97f4ee)
restructure main
authorpatrick-scho <patrick.schoenberger@posteo.de>
Thu, 17 Apr 2025 20:22:14 +0000 (22:22 +0200)
committerpatrick-scho <patrick.schoenberger@posteo.de>
Thu, 17 Apr 2025 20:22:14 +0000 (22:22 +0200)
16 files changed:
3D-Models/3D-Models.txt [deleted file] patch | blob | history
Paper and Presentation/Cloth_simulation_Paper.pdf [deleted file] patch | blob | history
img/hsrm.jpg [moved from Textures/hsrm.jpg with 100% similarity] patch | blob | history
img/hsrm.png [moved from Textures/hsrm.png with 100% similarity] patch | blob | history
img/hsrm2.png [moved from Textures/hsrm2.png with 100% similarity] patch | blob | history
img/tears_of_steel_bridge_2k.jpg [moved from Textures/tears_of_steel_bridge_2k.jpg with 100% similarity] patch | blob | history
index.html patch | blob | history
js/OrbitControls.js [moved from Scripts/OrbitControls.js with 100% similarity] patch | blob | history
js/Script.txt [moved from Scripts/Script.txt with 100% similarity] patch | blob | history
js/_cloth.js [moved from Scripts/_cloth.js with 100% similarity] patch | blob | history
js/_main.js [moved from Scripts/_main.js with 100% similarity] patch | blob | history
js/cloth.js [moved from Scripts/cloth.js with 96% similarity] patch | blob | history
js/main.js [moved from Scripts/main.js with 93% similarity] patch | blob | history
js/three.js [moved from Scripts/three.js with 100% similarity] patch | blob | history
js/three.module.js [moved from Scripts/three.module.js with 100% similarity] patch | blob | history
pdf/Cloth_simulation_Presentation.pdf [moved from Paper and Presentation/Cloth_simulation_Presentation.pdf with 100% similarity] patch | blob | history

diff --git a/3D-Models/3D-Models.txt b/3D-Models/3D-Models.txt
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/Paper and Presentation/Cloth_simulation_Paper.pdf b/Paper and Presentation/Cloth_simulation_Paper.pdf
deleted file mode 100644 (file)
index 84dc1b9..0000000
Binary files a/Paper and Presentation/Cloth_simulation_Paper.pdf and /dev/null differ
diff --git a/Textures/hsrm.jpg b/img/hsrm.jpg
similarity index 100%
rename from Textures/hsrm.jpg
rename to img/hsrm.jpg
diff --git a/Textures/hsrm.png b/img/hsrm.png
similarity index 100%
rename from Textures/hsrm.png
rename to img/hsrm.png
diff --git a/Textures/hsrm2.png b/img/hsrm2.png
similarity index 100%
rename from Textures/hsrm2.png
rename to img/hsrm2.png
diff --git a/index.html b/index.html
index de3e51b6e17ceb93cc46793a4f9f49337e4f8b82..a1d596263ffe8c6a7894c83c1baa12b135d5ef7f 100644 (file)
--- a/index.html
+++ b/index.html
@@ -9,14 +9,14 @@
                        margin: 0;\r
                }\r
        </style>\r
                        margin: 0;\r
                }\r
        </style>\r
-       <script src="./Scripts/three.js"></script>\r
-       <script src="./Scripts/OrbitControls.js"></script>\r
+       <script src="/projects/cloth/js/three.js"></script>\r
+       <script src="/projects/cloth/js/OrbitControls.js"></script>\r
        </script>\r
 </head>\r
 \r
 <body>\r
        </script>\r
 </head>\r
 \r
 <body>\r
-       <script src="./Scripts/cloth.js"></script>\r
-       <script src="./Scripts/main.js"></script>\r
+       <script src="/projects/cloth/js/cloth.js"></script>\r
+       <script src="/projects/cloth/js/main.js"></script>\r
 \r
        <div id="threejscontainer"></div>\r
        <div id="Output"></div>\r
 \r
        <div id="threejscontainer"></div>\r
        <div id="Output"></div>\r
diff --git a/Scripts/OrbitControls.js b/js/OrbitControls.js
similarity index 100%
rename from Scripts/OrbitControls.js
rename to js/OrbitControls.js
diff --git a/Scripts/Script.txt b/js/Script.txt
similarity index 100%
rename from Scripts/Script.txt
rename to js/Script.txt
diff --git a/Scripts/_cloth.js b/js/_cloth.js
similarity index 100%
rename from Scripts/_cloth.js
rename to js/_cloth.js
diff --git a/Scripts/_main.js b/js/_main.js
similarity index 100%
rename from Scripts/_main.js
rename to js/_main.js
diff --git a/Scripts/cloth.js b/js/cloth.js
similarity index 96%
rename from Scripts/cloth.js
rename to js/cloth.js
index 712ed63a7250971788ab0424bba30bd9a0490003..bd13951e4c8b940d28ea70b4c194dcd290eb92d8 100644 (file)
--- a/Scripts/cloth.js
+++ b/js/cloth.js
@@ -289,7 +289,7 @@ class Cloth {
   blow(camPos, intersects) {\r
     let face = intersects[0].face;\r
     /** vector from cam to intersection (wind) */\r
   blow(camPos, intersects) {\r
     let face = intersects[0].face;\r
     /** vector from cam to intersection (wind) */\r
-    let dir = intersects[0].point.clone().sub(camPos).multiplyScalar(100);\r
+    let dir = intersects[0].point.clone().sub(camPos).multiplyScalar(50);\r
     /** apply to all vertices of affected face */\r
     this.masses[face.a].addForce(dir);\r
     this.masses[face.b].addForce(dir);\r
     /** apply to all vertices of affected face */\r
     this.masses[face.a].addForce(dir);\r
     this.masses[face.b].addForce(dir);\r
diff --git a/Scripts/main.js b/js/main.js
similarity index 93%
rename from Scripts/main.js
rename to js/main.js
index 1a30f7a9db2cc3c240631e90e03d8505e0a00c15..64900d3c9002e37e9a09bd02586e2ea683c3a1ab 100644 (file)
--- a/Scripts/main.js
+++ b/js/main.js
@@ -37,7 +37,7 @@ function setup_scene(canvasSpace) {
   /** add scene background */\r
   const loader = new THREE.TextureLoader();\r
   const texture = loader.load(\r
   /** add scene background */\r
   const loader = new THREE.TextureLoader();\r
   const texture = loader.load(\r
-    'Textures/tears_of_steel_bridge_2k.jpg',\r
+    '/projects/cloth/img/tears_of_steel_bridge_2k.jpg',\r
     () => {\r
       const rt = new THREE.WebGLCubeRenderTarget(texture.image.height);\r
       rt.fromEquirectangularTexture(renderer, texture);\r
     () => {\r
       const rt = new THREE.WebGLCubeRenderTarget(texture.image.height);\r
       rt.fromEquirectangularTexture(renderer, texture);\r
@@ -85,7 +85,7 @@ function init() {
   /** Create cloth and generate mesh */\r
   const cloth = new Cloth(1, 0.5, 20, 20);\r
   const clothGeometry = cloth.generateGeometry();\r
   /** Create cloth and generate mesh */\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/hsrm2.png'), color: 0xffffff, side: THREE.DoubleSide, flatShading: false });\r
+  const clothMaterial = new THREE.MeshStandardMaterial({ map: loader.load('/projects/cloth/img/hsrm2.png'), 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
   //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
diff --git a/Scripts/three.js b/js/three.js
similarity index 100%
rename from Scripts/three.js
rename to js/three.js
diff --git a/Scripts/three.module.js b/js/three.module.js
similarity index 100%
rename from Scripts/three.module.js
rename to js/three.module.js
Clothing simulation written in JavaScript and using Three.js for a graphics course