From 2e69a1ad3566bf9dccf9a6eb743d76dbc2e7c3f4 Mon Sep 17 00:00:00 2001
From: alvarosabu <alvaro.saburido@gmail.com>
Date: Thu, 17 Aug 2023 19:32:38 +0200
Subject: [PATCH 1/2] fix: useGLTF return types

---
 playground/components.d.ts             |  2 ++
 playground/src/components/AkuAku.vue   | 14 ++++++++++++++
 playground/src/pages/UseGLTFDemo.vue   | 26 ++++++++++++++++++++++++++
 playground/src/router.ts               |  5 +++++
 src/core/loaders/useGLTF/component.vue |  6 ++++--
 src/core/loaders/useGLTF/index.ts      |  6 +++---
 6 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 playground/src/components/AkuAku.vue
 create mode 100644 playground/src/pages/UseGLTFDemo.vue

diff --git a/playground/components.d.ts b/playground/components.d.ts
index 45ebd25d..c1cd4fbe 100644
--- a/playground/components.d.ts
+++ b/playground/components.d.ts
@@ -7,9 +7,11 @@ export {}
 
 declare module 'vue' {
   export interface GlobalComponents {
+    AkuAku: typeof import('./src/components/AkuAku.vue')['default']
     BackdropDemo: typeof import('./src/components/BackdropDemo.vue')['default']
     ContactShadowsDemo: typeof import('./src/components/ContactShadowsDemo.vue')['default']
     EnvironmentDemo: typeof import('./src/components/EnvironmentDemo.vue')['default']
+    GlassMaterialDemo: typeof import('./src/components/GlassMaterialDemo.vue')['default']
     Gltf: typeof import('./src/components/gltf/index.vue')['default']
     LeviosoDemo: typeof import('./src/components/LeviosoDemo.vue')['default']
     MapControlsDemo: typeof import('./src/components/MapControlsDemo.vue')['default']
diff --git a/playground/src/components/AkuAku.vue b/playground/src/components/AkuAku.vue
new file mode 100644
index 00000000..26583332
--- /dev/null
+++ b/playground/src/components/AkuAku.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { useGLTF } from '@tresjs/cientos'
+
+const { nodes } = await useGLTF(
+  'https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/aku-aku/AkuAku.gltf',
+  { draco: true },
+)
+
+const model = nodes.AkuAku
+</script>
+
+<template>
+  <primitive :object="model" />
+</template>
diff --git a/playground/src/pages/UseGLTFDemo.vue b/playground/src/pages/UseGLTFDemo.vue
new file mode 100644
index 00000000..a4e4232b
--- /dev/null
+++ b/playground/src/pages/UseGLTFDemo.vue
@@ -0,0 +1,26 @@
+<script setup lang="ts">
+import { TresCanvas } from '@tresjs/core'
+import { BasicShadowMap, SRGBColorSpace, NoToneMapping } from 'three'
+
+import { OrbitControls } from '@tresjs/cientos'
+
+const gl = {
+  clearColor: '#82DBC5',
+  shadows: true,
+  alpha: false,
+  shadowMapType: BasicShadowMap,
+  outputColorSpace: SRGBColorSpace,
+  toneMapping: NoToneMapping,
+}
+</script>
+
+<template>
+  <TresCanvas v-bind="gl">
+    <TresPerspectiveCamera :position="[3, 3, 3]" />
+    <OrbitControls />
+    <Suspense>
+      <AkuAku />
+    </Suspense>
+    <TresAmbientLight :intensity="1" />
+  </TresCanvas>
+</template>
diff --git a/playground/src/router.ts b/playground/src/router.ts
index 748261dc..07a16908 100644
--- a/playground/src/router.ts
+++ b/playground/src/router.ts
@@ -76,6 +76,11 @@ const routes = [
     name: 'MouseParallax',
     component: () => import('./pages/MouseParallaxDemo.vue'),
   },
+  {
+    path: '/loaders/use-gltf',
+    name: 'useGLTF',
+    component: () => import('./pages/UseGLTFDemo.vue'),
+  }
 ]
 
 export const router = createRouter({
diff --git a/src/core/loaders/useGLTF/component.vue b/src/core/loaders/useGLTF/component.vue
index f60cd530..4479e2f5 100644
--- a/src/core/loaders/useGLTF/component.vue
+++ b/src/core/loaders/useGLTF/component.vue
@@ -52,8 +52,10 @@ defineExpose({
   value: modelRef,
 })
 
-const { scene:model } = await useGLTF(props.path as string, { draco: props.draco, decoderPath: props.decoderPath })
-
+const { scene: model } = await useGLTF(props.path as string, {
+  draco: props.draco,
+  decoderPath: props.decoderPath,
+})
 </script>
 <template>
   <primitive ref="modelRef" :object="model" v-bind="$attrs" />
diff --git a/src/core/loaders/useGLTF/index.ts b/src/core/loaders/useGLTF/index.ts
index 3d1d50e1..6224593b 100644
--- a/src/core/loaders/useGLTF/index.ts
+++ b/src/core/loaders/useGLTF/index.ts
@@ -1,5 +1,5 @@
 import { GLTFLoader, DRACOLoader } from 'three-stdlib'
-import { useLoader } from '@tresjs/core'
+import { TresObject, TresObject3D, useLoader } from '@tresjs/core'
 import { Object3D } from 'three'
 
 export interface GLTFLoaderOptions {
@@ -21,8 +21,8 @@ export interface GLTFLoaderOptions {
 
 export interface GLTFResult {
   animations: Array<THREE.AnimationClip>
-  nodes: Array<Object3D>
-  materials: Array<THREE.Material>
+  nodes: Record<string, TresObject3D>
+  materials: Record<string, THREE.Material>
   scene: THREE.Scene
 }
 

From e6b35975d25a796713df1b113e67ec6e2b539d40 Mon Sep 17 00:00:00 2001
From: alvarosabu <alvaro.saburido@gmail.com>
Date: Thu, 17 Aug 2023 19:33:59 +0200
Subject: [PATCH 2/2] chore: remove unused imports

---
 src/core/loaders/useGLTF/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/loaders/useGLTF/index.ts b/src/core/loaders/useGLTF/index.ts
index 6224593b..f328e8dc 100644
--- a/src/core/loaders/useGLTF/index.ts
+++ b/src/core/loaders/useGLTF/index.ts
@@ -1,6 +1,5 @@
 import { GLTFLoader, DRACOLoader } from 'three-stdlib'
-import { TresObject, TresObject3D, useLoader } from '@tresjs/core'
-import { Object3D } from 'three'
+import { TresObject3D, useLoader } from '@tresjs/core'
 
 export interface GLTFLoaderOptions {
   /**