@threlte/gltf 1.0.0-next.10 → 1.0.0-next.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @threlte/gltf
 
+## 1.0.0-next.12
+
+### Patch Changes
+
+- 6d56d11c: Added proper types for new slots error & fallback
+
+## 1.0.0-next.11
+
+### Minor Changes
+
+- e91cc094: await instead of if clause for less if-blocks (helps with transitions)
+
 ## 1.0.0-next.10
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/gltf",
-  "version": "1.0.0-next.10",
+  "version": "1.0.0-next.12",
   "description": "GLTF to Threlte converter",
   "type": "module",
   "keywords": [

package/src/utils/parser.js

@@ -149,24 +149,24 @@ function parse(fileName, gltf, options = {}) {
 
       // Write out geometry first
       if (obj.geometry) {
-        result += `geometry={$gltf.${node}.geometry} `
+        result += `geometry={gltf.${node}.geometry} `
       }
 
       // Write out materials
       if (obj.material) {
         if (obj.material.name)
-          result += `material={$gltf.materials${sanitizeName(obj.material.name)}} `
-        else result += `material={$gltf.${node}.material} `
+          result += `material={gltf.materials${sanitizeName(obj.material.name)}} `
+        else result += `material={gltf.${node}.material} `
       }
 
-      if (obj.skeleton) result += `skeleton={$gltf.${node}.skeleton} `
+      if (obj.skeleton) result += `skeleton={gltf.${node}.skeleton} `
       if (obj.visible === false) result += `visible={false} `
       if (obj.castShadow === true) result += `castShadow `
       if (obj.receiveShadow === true) result += `receiveShadow `
       if (obj.morphTargetDictionary)
-        result += `morphTargetDictionary={$gltf.${node}.morphTargetDictionary} `
+        result += `morphTargetDictionary={gltf.${node}.morphTargetDictionary} `
       if (obj.morphTargetInfluences)
-        result += `morphTargetInfluences={$gltf.${node}.morphTargetInfluences} `
+        result += `morphTargetInfluences={gltf.${node}.morphTargetInfluences} `
       if (obj.intensity && rNbr(obj.intensity)) result += `intensity={${rNbr(obj.intensity)}} `
       //if (obj.power && obj.power !== 4 * Math.PI) result += `power={${rNbr(obj.power)}} `
       if (obj.angle && obj.angle !== Math.PI / 3) result += `angle={${rDeg(obj.angle)}} `
@@ -378,7 +378,7 @@ function parse(fileName, gltf, options = {}) {
 
     // Bail out on lights and bones
     if (type === 'bone') {
-      return `<T is={$gltf.${node}} />\n`
+      return `<T is={gltf.${node}} />\n`
     }
 
     // Collect children
@@ -535,7 +535,11 @@ ${
 
         ${options.types && !options.isolated ? 'type $$Props = Props<THREE.Group>' : ''}
         ${options.types && !options.isolated ? 'type $$Events = Events<THREE.Group>' : ''}
-        ${options.types && !options.isolated ? 'type $$Slots = Slots<THREE.Group>' : ''}
+        ${
+          options.types && !options.isolated
+            ? 'type $$Slots = Slots<THREE.Group> & { fallback: {}; error: { error: any } }'
+            : ''
+        }
 
         export const ref = new Group()
 
@@ -556,9 +560,13 @@ ${
     </script>
 
 		<T is={ref} dispose={false} ${!options.isolated ? '{...$$restProps} bind:this={$component}' : ''}>
-    	{#if $gltf}
-        ${scene}
-			{/if}
+			{#await gltf}
+				<slot name="fallback" />
+			{:then gltf}
+				${scene}
+			{:catch error}
+				<slot name="error" {error} />
+			{/await}
 
 			<slot {ref} />
 		</T>