diff --git a/assets/css/base/_fonts.scss b/assets/css/base/_fonts.scss
index 98ad0e4..9f08f20 100644
--- a/assets/css/base/_fonts.scss
+++ b/assets/css/base/_fonts.scss
@@ -1,4 +1,3 @@
-@import '../fonts/libertinus/libertinus.css';
@import '../fonts/notosans/notosans.css';
// @import '../fonts/notosans/notosans-semicondensed.css';
// @import '../fonts/notosans/notosans-condensed.css';
@@ -7,12 +6,9 @@
@mixin fontsans {
font-family: "noto_sans";
}
-@mixin fontserif {
- font-family: 'libertinus_serif';
-}
body{
- @include fontserif;
+ @include fontsans;
font-weight: 400;
// font-family: 'noto_sans';
diff --git a/assets/fonts/libertinus/libertinus.css b/assets/fonts/libertinus/libertinus.css
deleted file mode 100644
index 9266325..0000000
--- a/assets/fonts/libertinus/libertinus.css
+++ /dev/null
@@ -1,98 +0,0 @@
-@font-face {
- font-family: 'libertinus_serif';
- src: url('libertinusserif-regular-webfont.woff2') format('woff2'),
- url('libertinusserif-regular-webfont.woff') format('woff');
- font-weight: 400;
- font-style: normal;
-
-}
-@font-face {
- font-family: 'libertinus_serif';
- src: url('libertinusserif-italic-webfont.woff2') format('woff2'),
- url('libertinusserif-italic-webfont.woff') format('woff');
- font-weight: 400;
- font-style: italic;
-
-}
-@font-face {
- font-family: 'libertinus_serif';
- src: url('libertinusserif-semibold-webfont.woff2') format('woff2'),
- url('libertinusserif-semibold-webfont.woff') format('woff');
- font-weight: 600;
- font-style: normal;
-
-}
-@font-face {
- font-family: 'libertinus_serif';
- src: url('libertinusserif-semibolditalic-webfont.woff2') format('woff2'),
- url('libertinusserif-semibolditalic-webfont.woff') format('woff');
- font-weight: 600;
- font-style: italic;
-
-}
-@font-face {
- font-family: 'libertinus_serif';
- src: url('libertinusserif-bold-webfont.woff2') format('woff2'),
- url('libertinusserif-bold-webfont.woff') format('woff');
- font-weight: 800;
- font-style: normal;
-
-}
-@font-face {
- font-family: 'libertinus_serif';
- src: url('libertinusserif-bolditalic-webfont.woff2') format('woff2'),
- url('libertinusserif-bolditalic-webfont.woff') format('woff');
- font-weight: 800;
- font-style: italic;
-
-}
-@font-face {
- font-family: 'libertinus_serif_initials';
- src: url('libertinusserifinitials-regular-webfont.woff2') format('woff2'),
- url('libertinusserifinitials-regular-webfont.woff') format('woff');
- font-weight: normal;
- font-style: normal;
-
-}
-@font-face {
- font-family: 'libertinus_serif_display';
- src: url('libertinusserifdisplay-regular-webfont.woff2') format('woff2'),
- url('libertinusserifdisplay-regular-webfont.woff') format('woff');
- font-weight: normal;
- font-style: normal;
-
-}
-
-
-@font-face {
- font-family: 'libertinus_sans';
- src: url('libertinussans-regular-webfont.woff2') format('woff2'),
- url('libertinussans-regular-webfont.woff') format('woff');
- font-weight: 400;
- font-style: normal;
-
-}
-@font-face {
- font-family: 'libertinus_sans';
- src: url('libertinussans-italic-webfont.woff2') format('woff2'),
- url('libertinussans-italic-webfont.woff') format('woff');
- font-weight: 400;
- font-style: italic;
-
-}
-@font-face {
- font-family: 'libertinus_sans';
- src: url('libertinussans-bold-webfont.woff2') format('woff2'),
- url('libertinussans-bold-webfont.woff') format('woff');
- font-weight: 800;
- font-style: normal;
-
-}
-@font-face {
- font-family: 'libertinus_mono';
- src: url('libertinusmono-regular-webfont.woff2') format('woff2'),
- url('libertinusmono-regular-webfont.woff') format('woff');
- font-weight: 400;
- font-style: normal;
-
-}
diff --git a/assets/fonts/libertinus/libertinusmono-regular-webfont.woff b/assets/fonts/libertinus/libertinusmono-regular-webfont.woff
deleted file mode 100644
index c0db0de..0000000
Binary files a/assets/fonts/libertinus/libertinusmono-regular-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusmono-regular-webfont.woff2 b/assets/fonts/libertinus/libertinusmono-regular-webfont.woff2
deleted file mode 100644
index 9e0706d..0000000
Binary files a/assets/fonts/libertinus/libertinusmono-regular-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-bold-webfont.ttf b/assets/fonts/libertinus/libertinussans-bold-webfont.ttf
deleted file mode 100644
index da132a4..0000000
Binary files a/assets/fonts/libertinus/libertinussans-bold-webfont.ttf and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-bold-webfont.woff b/assets/fonts/libertinus/libertinussans-bold-webfont.woff
deleted file mode 100644
index cb3d90a..0000000
Binary files a/assets/fonts/libertinus/libertinussans-bold-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-bold-webfont.woff2 b/assets/fonts/libertinus/libertinussans-bold-webfont.woff2
deleted file mode 100644
index e3a0100..0000000
Binary files a/assets/fonts/libertinus/libertinussans-bold-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-italic-webfont.woff b/assets/fonts/libertinus/libertinussans-italic-webfont.woff
deleted file mode 100644
index c58d79a..0000000
Binary files a/assets/fonts/libertinus/libertinussans-italic-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-italic-webfont.woff2 b/assets/fonts/libertinus/libertinussans-italic-webfont.woff2
deleted file mode 100644
index 754ce0d..0000000
Binary files a/assets/fonts/libertinus/libertinussans-italic-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-regular-webfont.ttf b/assets/fonts/libertinus/libertinussans-regular-webfont.ttf
deleted file mode 100644
index e7e611c..0000000
Binary files a/assets/fonts/libertinus/libertinussans-regular-webfont.ttf and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-regular-webfont.woff b/assets/fonts/libertinus/libertinussans-regular-webfont.woff
deleted file mode 100644
index 1d0a4b5..0000000
Binary files a/assets/fonts/libertinus/libertinussans-regular-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinussans-regular-webfont.woff2 b/assets/fonts/libertinus/libertinussans-regular-webfont.woff2
deleted file mode 100644
index 8dd41aa..0000000
Binary files a/assets/fonts/libertinus/libertinussans-regular-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-bold-webfont.woff b/assets/fonts/libertinus/libertinusserif-bold-webfont.woff
deleted file mode 100644
index 5572d08..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-bold-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-bold-webfont.woff2 b/assets/fonts/libertinus/libertinusserif-bold-webfont.woff2
deleted file mode 100644
index 03c4168..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-bold-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-bolditalic-webfont.woff b/assets/fonts/libertinus/libertinusserif-bolditalic-webfont.woff
deleted file mode 100644
index a5330ee..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-bolditalic-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-bolditalic-webfont.woff2 b/assets/fonts/libertinus/libertinusserif-bolditalic-webfont.woff2
deleted file mode 100644
index c869b15..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-bolditalic-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-italic-webfont.ttf b/assets/fonts/libertinus/libertinusserif-italic-webfont.ttf
deleted file mode 100644
index e5a3d13..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-italic-webfont.ttf and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-italic-webfont.woff b/assets/fonts/libertinus/libertinusserif-italic-webfont.woff
deleted file mode 100644
index e3da451..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-italic-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-italic-webfont.woff2 b/assets/fonts/libertinus/libertinusserif-italic-webfont.woff2
deleted file mode 100644
index 2c92f0d..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-italic-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-regular-webfont.ttf b/assets/fonts/libertinus/libertinusserif-regular-webfont.ttf
deleted file mode 100644
index f826444..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-regular-webfont.ttf and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-regular-webfont.woff b/assets/fonts/libertinus/libertinusserif-regular-webfont.woff
deleted file mode 100644
index 26cfc05..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-regular-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-regular-webfont.woff2 b/assets/fonts/libertinus/libertinusserif-regular-webfont.woff2
deleted file mode 100644
index a381c28..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-regular-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-semibold-webfont.ttf b/assets/fonts/libertinus/libertinusserif-semibold-webfont.ttf
deleted file mode 100644
index 872ec6f..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-semibold-webfont.ttf and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-semibold-webfont.woff b/assets/fonts/libertinus/libertinusserif-semibold-webfont.woff
deleted file mode 100644
index 63285bd..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-semibold-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-semibold-webfont.woff2 b/assets/fonts/libertinus/libertinusserif-semibold-webfont.woff2
deleted file mode 100644
index c4e774f..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-semibold-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.ttf b/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.ttf
deleted file mode 100644
index 1eee972..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.ttf and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.woff b/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.woff
deleted file mode 100644
index f8885b1..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.woff2 b/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.woff2
deleted file mode 100644
index 06ec33b..0000000
Binary files a/assets/fonts/libertinus/libertinusserif-semibolditalic-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserifdisplay-regular-webfont.woff b/assets/fonts/libertinus/libertinusserifdisplay-regular-webfont.woff
deleted file mode 100644
index a0ab0b3..0000000
Binary files a/assets/fonts/libertinus/libertinusserifdisplay-regular-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserifdisplay-regular-webfont.woff2 b/assets/fonts/libertinus/libertinusserifdisplay-regular-webfont.woff2
deleted file mode 100644
index 5e28f48..0000000
Binary files a/assets/fonts/libertinus/libertinusserifdisplay-regular-webfont.woff2 and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserifinitials-regular-webfont.woff b/assets/fonts/libertinus/libertinusserifinitials-regular-webfont.woff
deleted file mode 100644
index 0b3be9e..0000000
Binary files a/assets/fonts/libertinus/libertinusserifinitials-regular-webfont.woff and /dev/null differ
diff --git a/assets/fonts/libertinus/libertinusserifinitials-regular-webfont.woff2 b/assets/fonts/libertinus/libertinusserifinitials-regular-webfont.woff2
deleted file mode 100644
index 7a315ff..0000000
Binary files a/assets/fonts/libertinus/libertinusserifinitials-regular-webfont.woff2 and /dev/null differ
diff --git a/src/App.vue b/src/App.vue
index 1ad6f17..a1d4278 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -83,7 +83,8 @@ export default {
myScene: scene,
mouse: new THREE.Vector2(),
camera: null,
- raycaster: new THREE.Raycaster()
+ raycaster: new THREE.Raycaster(),
+ interactive_objects: []
}
},
computed: {
@@ -105,10 +106,13 @@ export default {
mounted () {
console.log('mounted', this)
this.camera = this.$children[0].global.camera
-
+ this.updatedInteractiveObjects()
document.addEventListener('mousemove', this.onMouseMove, false)
document.addEventListener('click', this.onDocumentClick, false)
},
+ updated () {
+ this.updatedInteractiveObjects()
+ },
methods: {
...mapActions({
getProjects: 'Projects/getProjects'
@@ -121,13 +125,22 @@ export default {
this.mouse.x = (e.clientX / window.innerWidth) * 2 - 1
this.mouse.y = -(e.clientY / window.innerHeight) * 2 + 1
},
+ updatedInteractiveObjects () {
+ this.interactive_objects = []
+ for (var i = 0; i < this.myScene.children.length; i++) {
+ if (this.myScene.children[i].name === 'Project') {
+ this.interactive_objects.push(this.myScene.children[i])
+ }
+ }
+ console.log('this.interactive_objects', this.interactive_objects)
+ },
onDocumentClick (e) {
console.log('onDocumentClick', e)
// update the picking ray with the camera and mouse position
this.raycaster.setFromCamera(this.mouse, this.camera)
// calculate objects intersecting the picking ray
- var intersects = this.raycaster.intersectObjects(this.myScene.children)
+ var intersects = this.raycaster.intersectObjects(this.interactive_objects)
for (var i = 0; i < intersects.length; i++) {
intersects[i].object.material.color.set(0xff0000)
diff --git a/src/components/objects/Plan.vue b/src/components/objects/Plan.vue
index 5c12425..ef42b5c 100644
--- a/src/components/objects/Plan.vue
+++ b/src/components/objects/Plan.vue
@@ -1,5 +1,6 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+