소스 검색

fix: remove initial Orbitcontrol extend from plugin

Alvaro 2 년 전
부모
커밋
171ede4ff6
4개의 변경된 파일4개의 추가작업 그리고 54개의 파일을 삭제
  1. 0 45
      packages/cientos/src/core/OrbitControls.vue
  2. 1 1
      packages/tres/src/App.vue
  3. 2 2
      packages/tres/src/core/useCatalogue/index.ts
  4. 1 6
      packages/tres/src/main.ts

+ 0 - 45
packages/cientos/src/core/OrbitControls.vue

@@ -34,48 +34,3 @@ extend({ OrbitControls })
     :enabling-dampling="enableDamping"
   />
 </template>
-
-<!-- <script setup lang="ts">
-import { useRenderLoop } from '@tresjs/core'
-import { Camera, Vector3, WebGLRenderer } from 'three'
-import { OrbitControls as OrbitControlsImp } from 'three-stdlib'
-import { inject, type Ref, unref, watch } from 'vue'
-
-const props = withDefaults(
-  defineProps<{
-    makeDefault?: boolean
-    camera?: Camera
-    domElement?: HTMLElement
-    target?: Ref<Vector3>
-  }>(),
-  {
-    makeDefault: false,
-  },
-)
-let controls: OrbitControlsImp
-
-const camera = inject<Ref<Camera>>('camera')
-const renderer = inject<Ref<WebGLRenderer>>('renderer')
-watch(
-  [camera, renderer],
-  () => {
-    if (camera?.value && renderer?.value) {
-      if (controls) controls.reset()
-      controls = new OrbitControlsImp(camera.value, unref(renderer).domElement)
-      controls.enableDamping = true
-
-      const { onLoop } = useRenderLoop()
-
-      onLoop(() => {
-        if (controls.enabled) {
-          controls.update()
-        }
-      })
-    }
-  },
-  {
-    deep: true,
-  },
-)
-</script>
- -->

+ 1 - 1
packages/tres/src/App.vue

@@ -25,8 +25,8 @@ useTweakPane()
       physically-correct-lights
     >
       <TresPerspectiveCamera :position="[5, 5, 5]" :fov="45" :near="0.1" :far="1000" :look-at="[-8, 3, -3]" />
-      <OrbitControls />
       <TresScene>
+        <OrbitControls />
         <TresAmbientLight :intensity="0.5" />
         <!--  <TresOrbitControls v-if="state.renderer" :args="[state.camera, state.renderer?.domElement]" /> -->
         <Text3D />

+ 2 - 2
packages/tres/src/core/useCatalogue/index.ts

@@ -10,7 +10,7 @@ delete catalogue.value.Scene
 
 let localApp: App
 export function useCatalogue(app?: App, prefix = 'Tres') {
-  const { logError } = useLogger()
+  const { logMessage, logError } = useLogger()
   if (!localApp && app) {
     localApp = app
   }
@@ -23,7 +23,7 @@ export function useCatalogue(app?: App, prefix = 'Tres') {
       logError('No objects provided to extend catalogue')
       return
     }
-
+    logMessage('Adding objects to catalogue', objects)
     catalogue.value = Object.assign(catalogue.value, objects)
     const components = createComponentInstances(ref(objects))
 

+ 1 - 6
packages/tres/src/main.ts

@@ -1,14 +1,9 @@
 import { createApp } from 'vue'
-import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls'
 import App from './App.vue'
 import plugin from '.'
 import './style.css'
 
 export const app = createApp(App)
 
-app.use(plugin, {
-  extends: {
-    OrbitControls,
-  },
-})
+app.use(plugin)
 app.mount('#app')