alvarosabu 2 роки тому
батько
коміт
df17b437df

+ 0 - 1
packages/tres/src/components/TresCanvas.ts

@@ -53,7 +53,6 @@ export const TresCanvas = defineComponent({
     })
     })
 
 
     const app = createTres(slots)
     const app = createTres(slots)
-    app.provide('awiwi', 'uwu')
     app.provide('useTres', useTres())
     app.provide('useTres', useTres())
     app.provide('extend', extend)
     app.provide('extend', extend)
     app.mount(scene as unknown as TresObject)
     app.mount(scene as unknown as TresObject)

+ 0 - 1
packages/tres/src/composables/index.ts

@@ -1,7 +1,6 @@
 export * from './useCamera'
 export * from './useCamera'
 export * from './useRenderLoop/'
 export * from './useRenderLoop/'
 export * from './useRenderer/'
 export * from './useRenderer/'
-export * from './useScene/'
 export * from './useLoader'
 export * from './useLoader'
 export * from './useTexture'
 export * from './useTexture'
 export * from './useTres'
 export * from './useTres'

+ 0 - 103
packages/tres/src/composables/useRenderer/component.ts

@@ -1,103 +0,0 @@
-import { RendererPresetsType } from './const'
-import { ShadowMapType, TextureEncoding, ToneMapping } from 'three'
-import { h, defineComponent, ref, provide, onBeforeUnmount, PropType } from 'vue'
-import { useRenderer } from '.'
-import { useLogger } from '/@/composables'
-import { TresVNodeType } from '/@/types'
-
-/**
- * Vue component for rendering a Tres component.
- */
-
-const { logError, logWarning } = useLogger()
-
-export const TresCanvas = defineComponent({
-  name: 'TresCanvas',
-  props: {
-    shadows: Boolean,
-    shadowMapType: Number as PropType<ShadowMapType>,
-    physicallyCorrectLights: {
-      type: Boolean,
-      default: false,
-      validator: (value: boolean) => {
-        if (value) {
-          logWarning('physicallyCorrectLights is deprecated. Use useLegacyLights instead.')
-        }
-        return true
-      },
-    },
-    useLegacyLights: Boolean,
-    outputEncoding: Number as PropType<TextureEncoding>,
-    toneMapping: Number as PropType<ToneMapping>,
-    toneMappingExposure: Number,
-    context: Object as PropType<WebGLRenderingContext>,
-    powerPreference: String as PropType<'high-performance' | 'low-power' | 'default'>,
-    preserveDrawingBuffer: Boolean,
-    clearColor: String,
-    windowSize: { type: Boolean, default: false },
-    preset: String as PropType<RendererPresetsType>,
-  },
-  setup(props, { slots, attrs }) {
-    const canvas = ref<HTMLCanvasElement>()
-    const container = ref<HTMLElement>()
-
-    const { renderer, dispose, aspectRatio } = useRenderer(canvas, container, props)
-
-    provide('aspect-ratio', aspectRatio)
-    provide('renderer', renderer)
-
-    if (slots.default && !slots.default().some(node => (node.type as TresVNodeType).name === 'Scene')) {
-      logError('TresCanvas must contain a Scene component.')
-    }
-    if (slots.default && !slots.default().some(node => (node.type as TresVNodeType).name?.includes('Camera'))) {
-      logError('Scene must contain a Camera component.')
-    }
-
-    onBeforeUnmount(() => dispose())
-
-    return () => {
-      if (slots.default) {
-        return h(
-          'div',
-          {
-            ref: container,
-            style: {
-              position: 'relative',
-              width: '100%',
-              height: '100%',
-              overflow: 'hidden',
-              pointerEvents: 'auto',
-              touchAction: 'none',
-              ...(attrs.style as Record<string, unknown>),
-            },
-          },
-          [
-            h(
-              'div',
-              {
-                style: {
-                  width: '100%',
-                  height: '100%',
-                },
-              },
-              [
-                h('canvas', {
-                  ref: canvas,
-                  style: {
-                    display: 'block',
-                    width: '100%',
-                    height: '100%',
-                    position: props.windowSize ? 'fixed' : 'absolute',
-                    top: 0,
-                    left: 0,
-                  },
-                }),
-                slots.default(),
-              ],
-            ),
-          ],
-        )
-      }
-    }
-  },
-})

+ 0 - 42
packages/tres/src/composables/useScene/component.ts

@@ -1,42 +0,0 @@
-import { defineComponent, inject, provide, Ref } from 'vue'
-import type { Renderer } from 'three'
-import { useCamera, useTres, useRenderLoop, useScene, useRaycaster } from '..'
-
-/**
- * Vue component for rendering a Tres component.
- */
-export const Scene = defineComponent({
-  name: 'Scene',
-  setup(_props, { slots }) {
-    const { setState } = useTres()
-    const { scene } = useScene()
-    const renderer = inject<Ref<Renderer>>('renderer')
-    const { activeCamera } = useCamera()
-    const { raycaster, pointer } = useRaycaster()
-    const { onLoop } = useRenderLoop()
-
-    provide('local-scene', scene)
-    setState('scene', scene.value)
-
-    onLoop(() => {
-      if (!activeCamera.value) return
-      raycaster.value.setFromCamera(pointer.value, activeCamera.value)
-
-      if (renderer?.value && activeCamera && scene?.value) {
-        renderer.value.render(scene?.value, activeCamera.value)
-      }
-    })
-
-    if (import.meta.hot) {
-      import.meta.hot.on('vite:afterUpdate', () => {
-        scene.value.children = []
-      })
-    }
-
-    return () => {
-      if (slots.default) {
-        return slots.default()
-      }
-    }
-  },
-})

+ 0 - 16
packages/tres/src/composables/useScene/index.ts

@@ -1,16 +0,0 @@
-import { Scene } from 'three'
-import { shallowRef } from 'vue'
-
-const scene = shallowRef(new Scene())
-
-/**
- * Composable for accessing the scene.
- *
- * @export
- * @return {*} {ShallowRef<Scene>}
- */
-export function useScene() {
-  return {
-    scene,
-  }
-}

+ 0 - 10
packages/tres/src/composables/useScene/useScene.test.ts

@@ -1,10 +0,0 @@
-import { Scene } from 'three'
-import { describe, test, expect } from 'vitest'
-import { useScene } from './'
-
-describe('useScene()', () => {
-  test('should init a scene', () => {
-    const { scene } = useScene()
-    expect(scene.value).toBeInstanceOf(Scene)
-  })
-})

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

@@ -1,4 +1,4 @@
-import { App, ref } from 'vue'
+import { App } from 'vue'
 import { TresCanvas } from '/@/components/TresCanvas'
 import { TresCanvas } from '/@/components/TresCanvas'
 export * from '/@/composables'
 export * from '/@/composables'
 export * from '/@/core/catalogue'
 export * from '/@/core/catalogue'