diff --git a/public/about.html b/public/about.html index d38bdf9..154ced3 100644 --- a/public/about.html +++ b/public/about.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/(o)machine.html b/public/articles/(o)machine.html index d6d30fa..1308944 100644 --- a/public/articles/(o)machine.html +++ b/public/articles/(o)machine.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/ai-x-body.html b/public/articles/ai-x-body.html index ceee523..71bf3d4 100644 --- a/public/articles/ai-x-body.html +++ b/public/articles/ai-x-body.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/beauty-and-the-beep.html b/public/articles/beauty-and-the-beep.html index e09a6de..b2e8bdb 100644 --- a/public/articles/beauty-and-the-beep.html +++ b/public/articles/beauty-and-the-beep.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/data.html b/public/articles/data.html index ca24cad..578211c 100644 --- a/public/articles/data.html +++ b/public/articles/data.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/dwelling.html b/public/articles/dwelling.html index c10602b..f15e1ce 100644 --- a/public/articles/dwelling.html +++ b/public/articles/dwelling.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/electronic-image.html b/public/articles/electronic-image.html index 4b360dd..4879ee4 100644 --- a/public/articles/electronic-image.html +++ b/public/articles/electronic-image.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/latent-mirror.html b/public/articles/latent-mirror.html index 65e6365..e20f8d8 100644 --- a/public/articles/latent-mirror.html +++ b/public/articles/latent-mirror.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/moloch.html b/public/articles/moloch.html index 3f9a6c6..8a89103 100644 --- a/public/articles/moloch.html +++ b/public/articles/moloch.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/articles/undefined.html b/public/articles/undefined.html index cb1a360..9df45d3 100644 --- a/public/articles/undefined.html +++ b/public/articles/undefined.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/gallery.html b/public/gallery.html index 00ee91b..c706f11 100644 --- a/public/gallery.html +++ b/public/gallery.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/public/index.html b/public/index.html index 3f42bb6..139c3a6 100644 --- a/public/index.html +++ b/public/index.html @@ -36,7 +36,7 @@
​(ง•_•)ง
- +
diff --git a/public/js/main.js b/public/js/main.js index 93a0bd6..56362b5 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -177,21 +177,21 @@ function init() { camera.position.z = 20; // Fetch JSON data - fetch('../json/articles.json') - .then(response => response.json()) - .then(jsonData => { - for (let i = 0; i < jsonData.length; i++) { - let temp_txt = loader.load('../images/' + jsonData[i]['image']); - temp_txt.minFilter = THREE.NearestFilter; - temp_txt.magFilter = THREE.NearestFilter; - temp_txt.colorSpace = THREE.SRGBColorSpace; - let title = jsonData[i]['name'] - let filename = jsonData[i]['filename'] - let article = new Article(temp_txt, title, filename.replace(/\.[^/.]+$/, ""), i); - article.AddToScene(scene, aspect); - object_list.push(article); - } - }) +// fetch('../json/articles.json') +// .then(response => response.json()) +// .then(jsonData => { +// for (let i = 0; i < jsonData.length; i++) { +// let temp_txt = loader.load('../images/' + jsonData[i]['image']); +// temp_txt.minFilter = THREE.NearestFilter; +// temp_txt.magFilter = THREE.NearestFilter; +// temp_txt.colorSpace = THREE.SRGBColorSpace; +// let title = jsonData[i]['name'] +// let filename = jsonData[i]['filename'] +// let article = new Article(temp_txt, title, filename.replace(/\.[^/.]+$/, ""), i); +// article.AddToScene(scene, aspect); +// object_list.push(article); +// } +// }) @@ -246,19 +246,19 @@ function animate(time) { const deltaTime = (time - lastTime) / 1000; // Convert time to seconds lastTime = time; - pickHelper.pick(pickPosition, scene, camera, time); + // pickHelper.pick(pickPosition, scene, camera, time); - for (let i = 0; i < object_list.length; i++){ - object_list[i].UpdateRotation(deltaTime); - object_list[i].UpdatePosition(deltaTime, pickHelper); - } + // for (let i = 0; i < object_list.length; i++){ + // object_list[i].UpdateRotation(deltaTime); + // object_list[i].UpdatePosition(deltaTime, pickHelper); + // } // Update the plane texture offset const scrollSpeed = 0.2; planeMat.map.offset.y += scrollSpeed * deltaTime; planeMat.map.offset.x += scrollSpeed / 0.75 * deltaTime; - ChangeCursor(); + // ChangeCursor(); // Render the scene from the perspective of the camera renderer.render(scene, camera); } diff --git a/public/list.html b/public/list.html index 355ecf1..3761a7c 100644 --- a/public/list.html +++ b/public/list.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + diff --git a/templates/_base.html b/templates/_base.html index eece5e4..1cb8043 100644 --- a/templates/_base.html +++ b/templates/_base.html @@ -26,7 +26,7 @@
​(ง•_•)ง
- + {% block content %} {% endblock %}