From f4734ea224c5bc3f990a2c9276588a7c50f4e4a3 Mon Sep 17 00:00:00 2001
From: Kevin Levron <kevin.levron@gmail.com>
Date: Sat, 19 Sep 2020 11:24:03 +0200
Subject: [PATCH] wip

---
 src/core/useThree.js           |  1 +
 src/lights/DirectionalLight.js |  9 +++++++++
 src/lights/index.js            |  1 +
 src/meshes/Image.js            | 25 +++++++++++++++++++++++++
 src/meshes/InstancedMesh.js    |  4 ++--
 src/meshes/Mesh.js             | 24 ++++++++++++++++++++----
 src/meshes/index.js            |  1 +
 src/plugin.js                  |  5 ++++-
 8 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 src/lights/DirectionalLight.js
 create mode 100644 src/meshes/Image.js

diff --git a/src/core/useThree.js b/src/core/useThree.js
index 1b25357..0c70549 100644
--- a/src/core/useThree.js
+++ b/src/core/useThree.js
@@ -166,6 +166,7 @@ export default function useThree() {
       obj.mouse_move_element.removeEventListener('mouseleave', onMouseleave);
     }
     if (obj.orbitCtrl) obj.orbitCtrl.dispose();
+    this.renderer.dispose();
   }
 
   /**
diff --git a/src/lights/DirectionalLight.js b/src/lights/DirectionalLight.js
new file mode 100644
index 0000000..64c92d7
--- /dev/null
+++ b/src/lights/DirectionalLight.js
@@ -0,0 +1,9 @@
+import { DirectionalLight } from 'three';
+import Light from './Light.js';
+
+export default {
+  extends: Light,
+  created() {
+    this.light = new DirectionalLight(this.color, this.intensity);
+  },
+};
diff --git a/src/lights/index.js b/src/lights/index.js
index c92b624..5bc680d 100644
--- a/src/lights/index.js
+++ b/src/lights/index.js
@@ -1,3 +1,4 @@
 export { default as AmbientLight } from './AmbientLight.js';
+export { default as DirectionalLight } from './DirectionalLight.js';
 export { default as PointLight } from './PointLight.js';
 export { default as SpotLight } from './SpotLight.js';
diff --git a/src/meshes/Image.js b/src/meshes/Image.js
new file mode 100644
index 0000000..513f71a
--- /dev/null
+++ b/src/meshes/Image.js
@@ -0,0 +1,25 @@
+import { DoubleSide, MeshBasicMaterial, PlaneBufferGeometry, TextureLoader } from 'three';
+import Mesh from './Mesh.js';
+
+export default {
+  extends: Mesh,
+  props: {
+    src: String,
+    width: {
+      type: Number,
+      default: 1,
+    },
+    height: {
+      type: Number,
+      default: 1,
+    },
+  },
+  created() {
+    this.geometry = new PlaneBufferGeometry(this.width, this.height, 1, 1);
+    this.material = new MeshBasicMaterial({ map: new TextureLoader().load(this.src), side: DoubleSide });
+  },
+  unmounted() {
+    // this material is not mounted, it won't be auto dispose
+    this.material.dispose();
+  },
+};
diff --git a/src/meshes/InstancedMesh.js b/src/meshes/InstancedMesh.js
index 42cbc5e..6b88b0e 100644
--- a/src/meshes/InstancedMesh.js
+++ b/src/meshes/InstancedMesh.js
@@ -4,7 +4,7 @@ import { setFromProp } from '../tools.js';
 export default {
   inject: ['three', 'scene'],
   props: {
-    material: String,
+    materialId: String,
     count: Number,
     position: Object,
     castShadow: {
@@ -32,7 +32,7 @@ export default {
     }
   },
   mounted() {
-    this.mesh = new InstancedMesh(this.conf.geometry, this.three.materials[this.material], this.count);
+    this.mesh = new InstancedMesh(this.conf.geometry, this.three.materials[this.materialId], this.count);
     setFromProp(this.mesh.position, this.position);
     this.mesh.castShadow = this.castShadow;
     this.mesh.receiveShadow = this.receiveShadow;
diff --git a/src/meshes/Mesh.js b/src/meshes/Mesh.js
index edede10..0641e8b 100644
--- a/src/meshes/Mesh.js
+++ b/src/meshes/Mesh.js
@@ -1,3 +1,4 @@
+import { watch } from 'vue';
 import { Mesh } from 'three';
 import { setFromProp } from '../tools.js';
 
@@ -5,7 +6,7 @@ export default {
   inject: ['three', 'scene'],
   emits: ['ready'],
   props: {
-    material: String,
+    materialId: String,
     position: Object,
     rotation: Object,
     scale: Object,
@@ -26,14 +27,29 @@ export default {
   },
   methods: {
     initMesh() {
-      this.mesh = new Mesh(this.geometry, this.three.materials[this.material]);
+      if (!this.material && this.materialId) {
+        this.material = this.three.materials[this.materialId];
+      }
+      this.mesh = new Mesh(this.geometry, this.material);
+      this.updateMesh();
+      this.scene.add(this.mesh);
+
+      this.addWatchers();
+      this.$emit('ready');
+    },
+    addWatchers() {
+      ['position', 'rotation', 'scale'].forEach(p => {
+        watch(() => this[p], () => {
+          setFromProp(this.mesh[p], this[p]);
+        }, { deep: true });
+      });
+    },
+    updateMesh() {
       setFromProp(this.mesh.position, this.position);
       setFromProp(this.mesh.rotation, this.rotation);
       setFromProp(this.mesh.scale, this.scale);
       this.mesh.castShadow = this.castShadow;
       this.mesh.receiveShadow = this.receiveShadow;
-      this.scene.add(this.mesh);
-      this.$emit('ready');
     },
   },
   render() {
diff --git a/src/meshes/index.js b/src/meshes/index.js
index da03915..8f1be7e 100644
--- a/src/meshes/index.js
+++ b/src/meshes/index.js
@@ -1,4 +1,5 @@
 export { default as Box } from './Box.js';
+export { default as Image } from './Image.js';
 export { default as Plane } from './Plane.js';
 export { default as Sphere } from './Sphere.js';
 export { default as Text } from './Text.js';
diff --git a/src/plugin.js b/src/plugin.js
index faa3613..d6f6f4b 100644
--- a/src/plugin.js
+++ b/src/plugin.js
@@ -12,6 +12,7 @@ export const TroisJSVuePlugin = {
       'SphereGeometry',
 
       'AmbientLight',
+      'DirectionalLight',
       'PointLight',
       'SpotLight',
 
@@ -24,11 +25,13 @@ export const TroisJSVuePlugin = {
       'SubSurfaceMaterial',
 
       'Box',
-      'InstancedMesh',
+      'Image',
       'Plane',
       'Sphere',
       'Text',
 
+      'InstancedMesh',
+
       'BokehPass',
       'EffectComposer',
       'RenderPass',