angular-three 2.0.0-beta.300 → 2.0.0-beta.302

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-three",
-  "version": "2.0.0-beta.300",
+  "version": "2.0.0-beta.302",
   "publishConfig": {
     "access": "public"
   },
@@ -25,7 +25,13 @@
     "@angular/common": ">=18.0.0 <19.0.0",
     "@angular/core": ">=18.0.0 <19.0.0",
     "ngxtension": ">=3.0.0",
-    "three": ">=0.148.0 <0.168.0"
+    "three": ">=0.148.0 <0.168.0",
+    "node-three-gltf": ">=1.0.0 <2.0.0"
+  },
+  "peerDependenciesMeta": {
+    "node-three-gltf": {
+      "optional": true
+    }
   },
   "dependencies": {
     "tslib": "^2.3.0",

package/plugin/generators.json

@@ -10,11 +10,6 @@
 			"factory": "./src/generators/add-soba/generator",
 			"schema": "./src/generators/add-soba/schema.json",
 			"description": "Add angular-three-soba to your project"
-		},
-		"gltf": {
-			"factory": "./src/generators/gltf/generator",
-			"schema": "./src/generators/gltf/schema.json",
-			"description": "gltf generator"
 		}
 	},
 	"schematics": {
@@ -27,11 +22,6 @@
 			"factory": "./src/generators/add-soba/compat",
 			"schema": "./src/generators/add-soba/schema.json",
 			"description": "Add angular-three-soba to your project"
-		},
-    "gltf": {
-      "factory": "./src/generators/gltf/compat",
-      "schema": "./src/generators/gltf/schema.json",
-      "description": "gltf generator"
-    }
+		}
 	}
 }

package/plugin/src/generators/gltf/compat.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (generatorOptions: import("./generator").GltfGeneratorSchema) => (tree: any, context: any) => Promise<any>;
-export default _default;

package/plugin/src/generators/gltf/compat.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const generator_1 = require("./generator");
-exports.default = (0, devkit_1.convertNxGenerator)(generator_1.default);
-//# sourceMappingURL=compat.js.map

package/plugin/src/generators/gltf/compat.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../../libs/plugin/src/generators/gltf/compat.ts"],"names":[],"mappings":";;AAAA,uCAAgD;AAChD,2CAAwC;AAExC,kBAAe,IAAA,2BAAkB,EAAC,mBAAa,CAAC,CAAC"}

package/plugin/src/generators/gltf/files/__fileName__.ts__tmpl__

@@ -1,36 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA, Component, ChangeDetectionStrategy } from '@angular/core';
-import { extend, NgtGroup } from 'angular-three';
-import { injectGLTF } from 'angular-three-soba/loaders';
-import * as THREE from 'three';
-import { GLTF } from 'three-stdlib';
-
-interface <%= className %>GLTFResult extends GLTF {
-  nodes: {},
-  materials: {}
-}
-
-interface <%= className %>Options extends Partial<NgtGroup> {
-  /* more options */
-}
-
-@Component({
-  selector: '<%= selector %>',
-  standalone: true,
-  template: `
-    @if (gltf(); as gltf) {
-      <ngt-group [dispose]="null" [parameters]="options()">
-      </ngt-group>
-    }
-  `,
-  schemas: [CUSTOM_ELEMENTS_SCHEMA],
-  changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class <%= className %> {
-  options = input({} as <%= className %>Options);
-
-  gltf = injectGLTF(() => '<%= runtimeGltfPath %>') as Signal<<%= className %>GLTFResult | null>;
-
-  constructor() {
-    extend({ Group: THREE.Group });
-  }
-}

package/plugin/src/generators/gltf/generator.d.ts

@@ -1,12 +0,0 @@
-import { Tree } from '@nx/devkit';
-export interface GltfGeneratorSchema {
-    gltfPath: string;
-    project: string;
-    console: boolean;
-    modelName: string;
-    meshopt: boolean;
-    outputPath?: string;
-    draco?: boolean | string;
-}
-export declare function gltfGenerator(tree: Tree, options: GltfGeneratorSchema): Promise<void>;
-export default gltfGenerator;

package/plugin/src/generators/gltf/generator.js

@@ -1,125 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gltfGenerator = gltfGenerator;
-const devkit_1 = require("@nx/devkit");
-const enquirer_1 = require("enquirer");
-const node_fs_1 = require("node:fs");
-const three_stdlib_1 = require("three-stdlib");
-const generator_1 = require("../add-soba/generator");
-function normalizeOptions(options) {
-    let { gltfPath, project, console, modelName, outputPath, draco, meshopt } = options;
-    if (draco == null) {
-        draco = true;
-    }
-    return { gltfPath, project, console, modelName, outputPath, draco, meshopt };
-}
-function buildSelector(fileName, prefix) {
-    return `${prefix}-${fileName}`;
-}
-function toArrayBuffer(buf) {
-    const ab = new ArrayBuffer(buf.length);
-    const view = new Uint8Array(ab);
-    for (let i = 0; i < buf.length; ++i)
-        view[i] = buf[i];
-    return ab;
-}
-let dracoLoader = null;
-let decoderPath = 'https://www.gstatic.com/draco/versioned/decoders/1.5.5/';
-const loader = new three_stdlib_1.GLTFLoader();
-function load(input, draco, meshopt) {
-    if (draco) {
-        if (!dracoLoader) {
-            dracoLoader = new three_stdlib_1.DRACOLoader();
-        }
-        dracoLoader.setDecoderPath(typeof draco === 'string' ? draco : decoderPath);
-        loader.setDRACOLoader(dracoLoader);
-    }
-    if (meshopt) {
-        loader.setMeshoptDecoder(typeof three_stdlib_1.MeshoptDecoder === 'function' ? (0, three_stdlib_1.MeshoptDecoder)() : three_stdlib_1.MeshoptDecoder);
-    }
-    const data = input.startsWith('http')
-        ? null
-        : (() => {
-            const fileContent = (0, node_fs_1.readFileSync)(input);
-            return toArrayBuffer(fileContent);
-        })();
-    const operationFactory = (onLoad, onError) => {
-        return input.startsWith('http')
-            ? loader.load.call(loader, input, onLoad, () => { }, onError)
-            : loader.parse.call(loader, data, input, onLoad, onError);
-    };
-    return new Promise((resolve, reject) => {
-        operationFactory(resolve, reject);
-    });
-}
-async function gltfGenerator(tree, options) {
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    const hasAngularThreeSoba = packageJson['dependencies']['angular-three-soba'] || packageJson['devDependencies']['angular-three-soba'];
-    if (!hasAngularThreeSoba) {
-        devkit_1.logger.warn(`[NGT] angular-three-soba must be installed to use the GLTF generator`);
-        const { initSoba } = await (0, enquirer_1.prompt)({
-            type: 'confirm',
-            name: 'initSoba',
-            message: 'Would you like to initialize angular-three-soba?',
-            initial: true,
-        });
-        if (!initSoba)
-            return;
-        await (0, generator_1.addSobaGenerator)(tree);
-    }
-    try {
-        // const injectGLTF = await loadEsmModule<typeof import('angular-three-soba/loaders')>(
-        // 	'angular-three-soba/loaders',
-        // ).then((m) => m.injectGLTF);
-        // // const injectGLTF = await import('angular-three-soba/loaders').then((m) => m.injectGLTF);
-        // const injectGLTF = require('angular-three-soba/loaders').injectGLTF;
-        const { gltfPath, project, console: toConsole, modelName, outputPath, draco, meshopt } = normalizeOptions(options);
-        let runtimeGltfPath;
-        if (!gltfPath.startsWith('http')) {
-            const { path } = await (0, enquirer_1.prompt)({
-                type: 'input',
-                name: 'path',
-                message: 'What is the path to the asset file to be used at runtime (with injectGLTF)?',
-                required: true,
-            });
-            runtimeGltfPath = path;
-        }
-        else {
-            runtimeGltfPath = gltfPath;
-        }
-        await load(runtimeGltfPath, draco, meshopt);
-        // injectGLTF.preload(() => runtimeGltfPath, {
-        // 	useDraco: draco,
-        // 	useMeshOpt: meshopt,
-        // 	onLoad: (data) => {
-        // 		console.log('data', data);
-        // 	},
-        // });
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-        const modelNames = (0, devkit_1.names)(modelName);
-        const tmpPath = `${devkit_1.workspaceRoot}/tmp/ngt-gltf/${modelNames.fileName}`;
-        const output = toConsole ? tmpPath : (outputPath ?? (projectConfig.sourceRoot || `${projectConfig.root}/src`));
-        // NOTE: even if user passes in "console", we still generate the files.
-        //  But we generate them to a temporary destination then we'll remove them printing to console.
-        // generateFiles(tree, 'files', output, {
-        // 	tmpl: '',
-        // 	fileName: modelNames.fileName,
-        // 	className: modelNames.className,
-        // 	selector: buildSelector(
-        // 		modelNames.fileName,
-        // 		'prefix' in projectConfig && typeof projectConfig.prefix === 'string' ? projectConfig.prefix : 'app',
-        // 	),
-        // 	runtimeGltfPath,
-        // });
-        await (0, devkit_1.formatFiles)(tree);
-        if (toConsole) {
-            // print to console
-            // delete the files in tmp
-        }
-    }
-    catch (e) {
-        devkit_1.logger.error(`[NGT] Error generating GLTF files: ${e}`);
-    }
-}
-exports.default = gltfGenerator;
-//# sourceMappingURL=generator.js.map

package/plugin/src/generators/gltf/generator.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../libs/plugin/src/generators/gltf/generator.ts"],"names":[],"mappings":"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"}

package/plugin/src/generators/gltf/schema.json

@@ -1,58 +0,0 @@
-{
-	"$schema": "https://json-schema.org/schema",
-	"$id": "Gltf",
-	"title": "",
-	"type": "object",
-	"properties": {
-		"gltfPath": {
-			"type": "string",
-			"description": "",
-			"$default": {
-				"$source": "argv",
-				"index": 0
-			},
-			"x-prompt": "Where is your gltf file located?"
-		},
-    "project": {
-      "type": "string",
-      "description": "The name of the project to generate the model component for.",
-      "x-prompt": "What project would you like to generate the model component for?",
-      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$",
-      "x-dropdown": "projects",
-      "x-priority": "important"
-    },
-    "console": {
-      "type": "boolean",
-      "description": "Print to console instead of writing to file",
-      "default": false
-    },
-    "modelName": {
-      "type": "string",
-      "description": "Name of the model",
-      "default": "Model"
-    },
-    "outputPath": {
-      "type": "string",
-      "description": "The output path of the generated component",
-      "alias": ["o", "output"]
-    },
-    "draco": {
-      "oneOf": [
-        {
-          "type": "boolean",
-          "description": "Use Draco compression"
-        },
-        {
-          "type": "string",
-          "description": "Use Draco compression with a specific path"
-        }
-      ]
-    },
-    "meshopt": {
-      "type": "boolean",
-      "description": "Use Meshopt compression",
-      "default": true
-    }
-	},
-	"required": ["gltfPath", "project"]
-}