Merge branch 'master' into vanruesc/postprocessing

src/App.vue

@@ -12,13 +12,13 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { Box, Camera, LambertMaterial, MeshInterface, PointLight, Renderer, RendererInterface, Scene } from './export'
+import { Box, Camera, LambertMaterial, MeshPublicInterface, PointLight, Renderer, RendererPublicInterface, Scene } from './export'
 
 export default defineComponent({
   components: { Box, Camera, LambertMaterial, PointLight, Renderer, Scene },
   mounted() {
-    const renderer = this.$refs.renderer as RendererInterface
-    const mesh = (this.$refs.box as MeshInterface).mesh
+    const renderer = this.$refs.renderer as RendererPublicInterface
+    const mesh = (this.$refs.box as MeshPublicInterface).mesh
     if (renderer && mesh) {
       renderer.onBeforeRender(() => {
         mesh.rotation.x += 0.01

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)

src/core/Renderer.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-use-before-define */
 import { Camera, NoToneMapping, PCFShadowMap, Scene, WebGLRenderer } from 'three'
 import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer'
-import { defineComponent, InjectionKey, PropType } from 'vue'
+import { ComponentPublicInstance, defineComponent, InjectionKey, PropType } from 'vue'
 import { bindProp } from '../tools'
 import { PointerPublicConfigInterface } from './usePointer'
 import useThree, { SizeInterface, ThreeConfigInterface, ThreeInterface } from './useThree'
@@ -93,7 +93,9 @@ export interface RendererInterface extends RendererSetupInterface {
   removeListener<T extends keyof EventCallbackMap>(t: T, cb: EventCallbackMap[T]): void
 }
 
-export const RendererInjectionKey: InjectionKey<RendererInterface> = Symbol('Renderer')
+export interface RendererPublicInterface extends ComponentPublicInstance, RendererInterface {}
+
+export const RendererInjectionKey: InjectionKey<RendererPublicInterface> = Symbol('Renderer')
 
 export default defineComponent({
   name: 'Renderer',

src/core/index.ts

@@ -9,5 +9,5 @@ export { default as Raycaster } from './Raycaster'
 
 export { default as CubeCamera } from './CubeCamera'
 
-export type { RendererInterface } from './Renderer'
-export type { Object3DInterface } from './Object3D'
+export type { RendererPublicInterface } from './Renderer'
+export type { Object3DPublicInterface } from './Object3D'

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

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'

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',

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'