@threlte/gltf 1.0.0-next.11 → 1.0.0-next.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @threlte/gltf
 
+## 1.0.0-next.13
+
+### Major Changes
+
+- d5abde5: Simplified root option to more reasonable approach. When no root is given, the path supplied will be normalized and used as a file path, if root is given, takes full control.
+
+## 1.0.0-next.12
+
+### Patch Changes
+
+- 6d56d11c: Added proper types for new slots error & fallback
+
 ## 1.0.0-next.11
 
 ### Minor Changes

package/package.json

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

package/src/index.js

@@ -25,12 +25,8 @@ function toArrayBuffer(buf) {
 }
 
 export default function (file, output, options) {
-  function getRelativeFilePath(file) {
-    const filePath = path.resolve(file)
-    const rootPath = options.root ? path.resolve(options.root) : path.dirname(file)
-    const relativePath = path.relative(rootPath, filePath) || ''
-    if (process.platform === 'win32') return relativePath.replace(/\\/g, '/')
-    return relativePath
+  function getFilePath(file) {
+    return `${options.root ?? '/'}${options.root ? path.basename(file) : path.normalize(file)}`
   }
 
   return new Promise((resolve, reject) => {
@@ -48,7 +44,7 @@ export default function (file, output, options) {
         }
         resolve()
 
-        const filePath = getRelativeFilePath(file)
+        const filePath = getFilePath(file)
         const data = fs.readFileSync(file)
         const arrayBuffer = toArrayBuffer(data)
 

package/src/utils/parser.js

@@ -2,7 +2,7 @@ import THREE from 'three'
 import isVarName from './isVarName.js'
 
 function parse(fileName, gltf, options = {}) {
-  const url = (fileName.toLowerCase().startsWith('http') ? '' : '/') + fileName
+  const url = fileName
   const animations = gltf.animations
   const hasAnimations = animations.length > 0
 
@@ -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()