@needle-tools/engine 3.47.6 → 3.47.7

package/src/engine/engine_utils_format.ts

@@ -12,16 +12,16 @@ export declare type FileType = "gltf" | "glb" | "vrm" | "fbx" | "obj" | "usdz" |
  * This method does perform a range request to the server to get the first few bytes of the file   
  * If the file type can not be determined it will return "unknown"
  * @param url The URL of the file
- * @param lazy If true the file type will be determined by the file extension first - if the file extension is not known it will then check the header
+ * @param useExtension If true the file type will be determined by the file extension first - if the file extension is not known it will then check the header
  * @example
  * ```typescript
  * const url = "https://example.com/model.glb";
  * const fileType = await tryDetermineFileTypeFromURL(url);
  * console.log(fileType); // "glb"
  */
-export async function tryDetermineFileTypeFromURL(url: string, lazy: boolean = true): Promise<FileType> {
+export async function tryDetermineFileTypeFromURL(url: string, useExtension: boolean = true): Promise<FileType> {
 
-    if (lazy) {
+    if (useExtension) {
         // We want to save on requests so we first check the file extension if there's any
         // In some scenarios we might not have one (e.g. if we're dealing with blob: files or if the URL doesn't contain the filename)
         // In that case we need to check the header
@@ -37,6 +37,7 @@ export async function tryDetermineFileTypeFromURL(url: string, lazy: boolean = t
         if (!ext?.length) {
             ext = urlobj.pathname.split(".").pop()?.toUpperCase();
         }
+        console.debug("Use file extension to determine type: " + ext);
         switch (ext) {
             case "GLTF":
                 return "gltf";
@@ -52,6 +53,8 @@ export async function tryDetermineFileTypeFromURL(url: string, lazy: boolean = t
                 return "usda";
             case "USDZ":
                 return "usdz";
+            case "OBJ":
+                return "obj";
         }
     }
 
@@ -94,29 +97,48 @@ export function tryDetermineFileTypeFromBinary(data: ArrayBuffer): FileType {
 
     // GLTF or GLB
     if (bytes[0] == 103 && bytes[1] == 108 && bytes[2] == 84 && bytes[3] == 70) {
+        console.debug("GLTF detected");
         return "glb";
     }
     // USDZ
     if (bytes[0] == 80 && bytes[1] == 75 && bytes[2] == 3 && bytes[3] == 4) {
+        console.debug("USDZ detected");
         return "usdz";
     }
     // USD
     if (bytes[0] == 80 && bytes[1] == 88 && bytes[2] == 82 && bytes[3] == 45 && bytes[4] == 85 && bytes[5] == 83 && bytes[6] == 68 && bytes[7] == 67) {
+        console.debug("Binary USD detected");
         return "usd";
     }
     // USDA: check if the file starts with #usda
-    else if(bytes[0] == 35 && bytes[1] == 117 && bytes[2] == 115 && bytes[3] == 100 && bytes[4] == 97) {
+    else if (bytes[0] == 35 && bytes[1] == 117 && bytes[2] == 115 && bytes[3] == 100 && bytes[4] == 97) {
+        console.debug("ASCII USD detected");
         return "usda";
     }
     // FBX
     if (bytes[0] == 75 && bytes[1] == 97 && bytes[2] == 121 && bytes[3] == 100 && bytes[4] == 97 && bytes[5] == 114 && bytes[6] == 97 && bytes[7] == 32) {
+        console.debug("Binary FBX detected");
+        return "fbx";
+    }
+    // ASCII FBX
+    else if (bytes[0] == 59 && bytes[1] == 32 && bytes[2] == 70 && bytes[3] == 66 && bytes[4] == 88 && bytes[5] == 32) {
+        console.debug("ASCII FBX detected");
         return "fbx";
     }
     // OBJ - in this case exported from blender it starts with "# Blender" - we only check the first 10 bytes, technically it could still be a different file so we should do this check at the end
     else if (bytes[0] == 35 && bytes[1] == 32 && bytes[2] == 66 && bytes[3] == 108 && bytes[4] == 101 && bytes[5] == 110 && bytes[6] == 100 && bytes[7] == 101 && bytes[8] == 114 && bytes[9] == 32) {
-        // const text = new TextDecoder().decode(data.slice(0, 9));
+        console.debug("OBJ detected");
         return "obj";
     }
+    // Check if it starts "# Alias OBJ"
+    else if (bytes[0] == 35 && bytes[1] == 32 && bytes[2] == 65 && bytes[3] == 108 && bytes[4] == 105 && bytes[5] == 97 && bytes[6] == 115 && bytes[7] == 32 && bytes[8] == 79 && bytes[9] == 66 && bytes[10] == 74) {
+        console.debug("OBJ detected");
+        return "obj";
+    }
+    else {
+        // const text = new TextDecoder().decode(data.slice(0, 9));
+        console.debug("Could not determine file type from binary data", bytes);
+    }
 
     // const text = new TextDecoder().decode(data);
     // if (text.startsWith("Kaydara FBX")) {

package/src/engine/webcomponents/needle menu/needle-menu.ts

@@ -487,6 +487,7 @@ export class NeedleMenuElement extends HTMLElement {
         }
         .compact .options { 
             flex-wrap: wrap;
+            gap: .3rem;
         }
         .compact .top .options {
             height: auto;
@@ -550,6 +551,7 @@ export class NeedleMenuElement extends HTMLElement {
         .compact .options > button {
             display: flex;
             flex-basis: 100%;
+            min-height: 3rem;
         }
         .compact .options > button.row2 {
             //border: 1px solid red !important;