Browse Source

projects

master
Cailean Finn 5 months ago
parent
commit
9b8890418d
  1. 2
      public/about.html
  2. 2
      public/articles/(o)machine.html
  3. 2
      public/articles/ai-x-body.html
  4. 2
      public/articles/beauty-and-the-beep.html
  5. 2
      public/articles/data.html
  6. 2
      public/articles/dwelling.html
  7. 2
      public/articles/electronic-image.html
  8. 2
      public/articles/latent-mirror.html
  9. 2
      public/articles/moloch.html
  10. 2
      public/articles/undefined.html
  11. 2
      public/gallery.html
  12. 2
      public/index.html
  13. 42
      public/js/main.js
  14. 2
      public/list.html
  15. 2
      templates/_base.html

2
public/about.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/(o)machine.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/ai-x-body.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/beauty-and-the-beep.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/data.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/dwelling.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/electronic-image.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/latent-mirror.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/moloch.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/articles/undefined.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/gallery.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
public/index.html

@ -36,7 +36,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>
<div id="container"></div>

42
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);
}

2
public/list.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>

2
templates/_base.html

@ -26,7 +26,7 @@
<a href="/"><div class="emoji-flip">​(ง•_•)ง</div></a>
</div>
<div class="nav-about"><a href="/about">​cailean.finn</a></div>
<div class="nav-emoji"><a href="/list">list</a></div>
<div class="nav-emoji"><a href="/list">projects</a></div>
<div class="nav-emoji"><a href='/gallery'>gallery</a></div>
</div>
{% block content %} {% endblock %}

Loading…
Cancel
Save