Browse Source

fix(core): solved annoying warning messages about inject [Vue warn]: injection "local-scene" not found. #107

alvarosabu 2 years ago
parent
commit
f31ae49d28

+ 1 - 1
packages/tres/src/core/useCamera/index.ts

@@ -44,7 +44,7 @@ const VERTICAL_FIELD_OF_VIEW = 45
 let camera: Camera
 let camera: Camera
 
 
 export function useCamera(): UseCameraReturn {
 export function useCamera(): UseCameraReturn {
-  const aspectRatio = inject<ComputedRef<number>>('aspect-ratio')
+  const aspectRatio = inject('aspect-ratio', () => 1)
 
 
   const { setState } = useTres()
   const { setState } = useTres()
 
 

+ 4 - 3
packages/tres/src/core/useInstanceCreator/index.ts

@@ -9,6 +9,7 @@ import { normalizeVectorFlexibleParam } from '/@/utils/normalize'
 import { useCamera, useCatalogue, useRenderLoop, useScene } from '/@/core/'
 import { useCamera, useCatalogue, useRenderLoop, useScene } from '/@/core/'
 import { useLogger } from '/@/composables'
 import { useLogger } from '/@/composables'
 import { TresAttributes, TresCatalogue, TresInstance, TresVNode, TresVNodeType, TresEvent } from '/@/types'
 import { TresAttributes, TresCatalogue, TresInstance, TresVNode, TresVNodeType, TresEvent } from '/@/types'
+import { useRaycaster } from '../useRaycaster'
 
 
 const VECTOR3_PROPS = ['rotation', 'scale', 'position']
 const VECTOR3_PROPS = ['rotation', 'scale', 'position']
 
 
@@ -161,9 +162,9 @@ export function useInstanceCreator(prefix: string) {
             setup(_props, { slots, attrs, ...ctx }) {
             setup(_props, { slots, attrs, ...ctx }) {
               const { scene: fallback } = useScene()
               const { scene: fallback } = useScene()
               const { onLoop } = useRenderLoop()
               const { onLoop } = useRenderLoop()
-              const scene = inject<Ref<Scene>>('local-scene') || fallback
-              /* const { raycaster } = useRaycaster() */
-              const raycaster = inject<Ref<Raycaster>>('raycaster') /* 
+              const scene = inject('local-scene', fallback)
+              const { raycaster: raycasterFallback } = useRaycaster()
+              const raycaster = inject('raycaster', raycasterFallback) /* 
               const currentInstance = inject<Ref>('currentInstance') */
               const currentInstance = inject<Ref>('currentInstance') */
               const { pushCamera } = useCamera()
               const { pushCamera } = useCamera()