From 3705f97c61c943bad4a17b7a7b1491811b0eec4a Mon Sep 17 00:00:00 2001
From: Kevin Levron <kevin.levron@gmail.com>
Date: Sun, 2 May 2021 20:51:19 +0200
Subject: [PATCH] improve interfaces

---
 src/core/Object3D.ts      | 2 ++
 src/core/index.ts         | 2 +-
 src/materials/Material.ts | 6 ++++--
 src/materials/index.ts    | 2 +-
 src/meshes/Mesh.ts        | 6 ++++--
 src/meshes/index.ts       | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/core/Object3D.ts b/src/core/Object3D.ts
index 1d274e0..b046b42 100644
--- a/src/core/Object3D.ts
+++ b/src/core/Object3D.ts
@@ -18,6 +18,8 @@ export interface Object3DInterface extends Object3DSetupInterface {
   remove(o: Object3D): void
 }
 
+export interface Object3DPublicInterface extends ComponentPublicInstance, Object3DInterface {}
+
 // export function object3DSetup(): Object3DSetupInterface {
 //   const renderer = inject(RendererInjectionKey)
 //   const scene = inject(SceneInjectionKey)
diff --git a/src/core/index.ts b/src/core/index.ts
index 26fef3c..43300c0 100644
--- a/src/core/index.ts
+++ b/src/core/index.ts
@@ -10,4 +10,4 @@ export { default as Raycaster } from './Raycaster'
 export { default as CubeCamera } from './CubeCamera'
 
 export type { RendererPublicInterface } from './Renderer'
-export type { Object3DInterface } from './Object3D'
+export type { Object3DPublicInterface } from './Object3D'
diff --git a/src/materials/Material.ts b/src/materials/Material.ts
index 3cf8a56..ecbe438 100644
--- a/src/materials/Material.ts
+++ b/src/materials/Material.ts
@@ -1,4 +1,4 @@
-import { defineComponent, InjectionKey, PropType, watch } from 'vue'
+import { ComponentPublicInstance, defineComponent, InjectionKey, PropType, watch } from 'vue'
 import { FrontSide, Material, NormalBlending, Texture } from 'three'
 import { MeshInjectionKey, MeshInterface } from '../meshes/Mesh'
 
@@ -13,7 +13,9 @@ export interface MaterialInterface extends MaterialSetupInterface {
   setTexture(texture: Texture | null, key: string): void
 }
 
-export const MaterialInjectionKey: InjectionKey<MaterialInterface> = Symbol('Material')
+export interface MaterialPublicInterface extends ComponentPublicInstance, MaterialInterface {}
+
+export const MaterialInjectionKey: InjectionKey<MaterialPublicInterface> = Symbol('Material')
 
 export default defineComponent({
   // inject for sub components
diff --git a/src/materials/index.ts b/src/materials/index.ts
index c1b1a5c..dca9f74 100644
--- a/src/materials/index.ts
+++ b/src/materials/index.ts
@@ -14,4 +14,4 @@ export { default as CubeTexture } from './CubeTexture'
 
 export { default as PointsMaterial } from './PointsMaterial'
 
-export type { MaterialInterface } from './Material'
+export type { MaterialPublicInterface } from './Material'
diff --git a/src/meshes/Mesh.ts b/src/meshes/Mesh.ts
index 9d2f84c..426cd69 100644
--- a/src/meshes/Mesh.ts
+++ b/src/meshes/Mesh.ts
@@ -1,4 +1,4 @@
-import { ComponentPropsOptions, defineComponent, InjectionKey, watch } from 'vue'
+import { ComponentPropsOptions, ComponentPublicInstance, defineComponent, InjectionKey, watch } from 'vue'
 import { BufferGeometry, Material, Mesh as TMesh } from 'three'
 import Object3D, { Object3DSetupInterface } from '../core/Object3D'
 import { bindProp } from '../tools'
@@ -25,7 +25,9 @@ export interface MeshInterface extends MeshSetupInterface {
   setMaterial(m: Material): void
 }
 
-export const MeshInjectionKey: InjectionKey<MeshInterface> = Symbol('Mesh')
+export interface MeshPublicInterface extends ComponentPublicInstance, MeshInterface {}
+
+export const MeshInjectionKey: InjectionKey<MeshPublicInterface> = Symbol('Mesh')
 
 const Mesh = defineComponent({
   name: 'Mesh',
diff --git a/src/meshes/index.ts b/src/meshes/index.ts
index 6c20836..a6211b5 100644
--- a/src/meshes/index.ts
+++ b/src/meshes/index.ts
@@ -24,4 +24,4 @@ export { default as Sprite } from './Sprite'
 
 export { default as Points } from './Points'
 
-export type { MeshInterface } from './Mesh'
+export type { MeshPublicInterface } from './Mesh'