angular-three 2.0.0-beta.294 → 2.0.0-beta.296

package/lib/canvas.d.ts

@@ -97,7 +97,6 @@ export declare class NgtCanvas {
         getWorldQuaternion?: ((target: import("three").Quaternion) => import("three").Quaternion) | undefined;
         getWorldScale?: ((target: Vector3) => Vector3) | undefined;
         getWorldDirection?: ((target: Vector3) => Vector3) | undefined;
-        raycast?: ((raycaster: Raycaster, intersects: import("three").Intersection[]) => void) | undefined;
         traverse?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
         traverseVisible?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
         traverseAncestors?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
@@ -118,6 +117,7 @@ export declare class NgtCanvas {
         quaternion: import("angular-three").NgtQuaternion;
         layers: import("angular-three").NgtLayers;
         dispose: (() => void) | null;
+        raycast: import("three").Object3D["raycast"] | null;
     } & {
         addEventListener: (<TEventKey extends keyof import("angular-three").NgtNodeEventMap<import("three").PerspectiveCamera>>(type: TEventKey, listener: (this: import("angular-three").NgtNodeElement<import("three").PerspectiveCamera, typeof import("three").PerspectiveCamera>, ev: import("angular-three").NgtNodeEventMap<import("three").PerspectiveCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("angular-three").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("angular-three").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
         removeEventListener: (<TEventKey extends keyof import("angular-three").NgtNodeEventMap<import("three").PerspectiveCamera>>(type: TEventKey, listener: (this: import("angular-three").NgtNodeElement<import("three").PerspectiveCamera, typeof import("three").PerspectiveCamera>, ev: import("angular-three").NgtNodeEventMap<import("three").PerspectiveCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("angular-three").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("angular-three").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
@@ -199,7 +199,6 @@ export declare class NgtCanvas {
         getWorldQuaternion?: ((target: import("three").Quaternion) => import("three").Quaternion) | undefined;
         getWorldScale?: ((target: Vector3) => Vector3) | undefined;
         getWorldDirection?: ((target: Vector3) => Vector3) | undefined;
-        raycast?: ((raycaster: Raycaster, intersects: import("three").Intersection[]) => void) | undefined;
         traverse?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
         traverseVisible?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
         traverseAncestors?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
@@ -240,6 +239,7 @@ export declare class NgtCanvas {
         quaternion: import("angular-three").NgtQuaternion;
         layers: import("angular-three").NgtLayers;
         dispose: (() => void) | null;
+        raycast: import("three").Object3D["raycast"] | null;
     } & {
         addEventListener: (<TEventKey extends keyof import("angular-three").NgtNodeEventMap<import("three").OrthographicCamera>>(type: TEventKey, listener: (this: import("angular-three").NgtNodeElement<import("three").OrthographicCamera, typeof import("three").OrthographicCamera>, ev: import("angular-three").NgtNodeEventMap<import("three").OrthographicCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("angular-three").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("angular-three").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
         removeEventListener: (<TEventKey extends keyof import("angular-three").NgtNodeEventMap<import("three").OrthographicCamera>>(type: TEventKey, listener: (this: import("angular-three").NgtNodeElement<import("three").OrthographicCamera, typeof import("three").OrthographicCamera>, ev: import("angular-three").NgtNodeEventMap<import("three").OrthographicCamera>[TEventKey]) => any) => void) & (<TEventKey extends keyof import("angular-three").NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: any, ev: import("angular-three").NgtAllObject3DEventsMap[TEventKey]) => any) => void);
@@ -321,7 +321,6 @@ export declare class NgtCanvas {
         getWorldQuaternion?: ((target: import("three").Quaternion) => import("three").Quaternion) | undefined;
         getWorldScale?: ((target: Vector3) => Vector3) | undefined;
         getWorldDirection?: ((target: Vector3) => Vector3) | undefined;
-        raycast?: ((raycaster: Raycaster, intersects: import("three").Intersection[]) => void) | undefined;
         traverse?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
         traverseVisible?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
         traverseAncestors?: ((callback: (object: import("three").Object3D) => any) => void) | undefined;
@@ -353,6 +352,7 @@ export declare class NgtCanvas {
         quaternion: import("angular-three").NgtQuaternion;
         layers: import("angular-three").NgtLayers;
         dispose: (() => void) | null;
+        raycast: import("three").Object3D["raycast"] | null;
     }>) & {
         manual?: boolean;
     }) | undefined> | undefined>;

package/lib/loader.d.ts

@@ -21,11 +21,11 @@ export type NgtLoaderResults<TInput extends string | string[] | Record<string, s
 declare function _injectLoader<TData, TUrl extends string | string[] | Record<string, string>, TLoaderConstructor extends NgtLoaderProto<TData>, TReturn = NgtLoaderReturnType<TData, TLoaderConstructor>>(loaderConstructorFactory: (inputs: string[]) => TLoaderConstructor, inputs: () => TUrl, { extensions, onProgress, onLoad, injector, }?: {
     extensions?: NgtLoaderExtensions<TLoaderConstructor>;
     onProgress?: (event: ProgressEvent) => void;
-    onLoad?: (data: TData) => void;
+    onLoad?: (data: NoInfer<TData>) => void;
     injector?: Injector;
 }): Signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, NgtGLTFLike, NgtGLTFLike & NgtObjectMap>> | null>;
 declare namespace _injectLoader {
-    var preload: <TData, TUrl extends string | string[] | Record<string, string>, TLoaderConstructor extends NgtLoaderProto<TData>>(loaderConstructorFactory: (inputs: string[]) => TLoaderConstructor, inputs: () => TUrl, extensions?: NgtLoaderExtensions<TLoaderConstructor>) => void;
+    var preload: <TData, TUrl extends string | string[] | Record<string, string>, TLoaderConstructor extends NgtLoaderProto<TData>>(loaderConstructorFactory: (inputs: string[]) => TLoaderConstructor, inputs: () => TUrl, extensions?: NgtLoaderExtensions<TLoaderConstructor>, onLoad?: (data: NoInfer<TData>) => void) => void;
     var destroy: () => void;
     var clear: (urls: string | string[]) => void;
 }

package/lib/three-types.d.ts

@@ -51,6 +51,7 @@ export type NgtObject3DNode<TOriginal, TConstructor, TNoEvent = NoEvent<TOrigina
     quaternion: NgtQuaternion;
     layers: NgtLayers;
     dispose: (() => void) | null;
+    raycast: Object3D['raycast'] | null;
     addEventListener<TEventKey extends keyof NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: NgtObject3DNode<TOriginal, TConstructor>, ev: NgtAllObject3DEventsMap[TEventKey]) => any): void;
     removeEventListener<TEventKey extends keyof NgtAllObject3DEventsMap>(type: TEventKey, listener: (this: NgtObject3DNode<TOriginal, TConstructor>, ev: NgtAllObject3DEventsMap[TEventKey]) => any): void;
 }>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-three",
-  "version": "2.0.0-beta.294",
+  "version": "2.0.0-beta.296",
   "publishConfig": {
     "access": "public"
   },

package/plugin/generators.json

@@ -10,6 +10,11 @@
 			"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": {
@@ -18,10 +23,15 @@
 			"schema": "./src/generators/init/schema.json",
 			"description": "Add Angular Three with proper packages and config"
 		},
-    "add-soba": {
-      "factory": "./src/generators/add-soba/compat",
-      "schema": "./src/generators/add-soba/schema.json",
-      "description": "Add angular-three-soba to your project"
+		"add-soba": {
+			"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

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

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

@@ -0,0 +1,6 @@
+"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

@@ -0,0 +1 @@
+{"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__

@@ -0,0 +1,36 @@
+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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gltfGenerator = gltfGenerator;
+const devkit_1 = require("@nx/devkit");
+const enquirer_1 = require("enquirer");
+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}`;
+}
+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 Promise.resolve().then(() => require('angular-three-soba/loaders')).then((m) => m.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;
+        }
+        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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,58 @@
+{
+	"$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"]
+}