angular-three-plugin 4.0.0-next.36 → 4.0.0-next.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -28,11 +28,11 @@ export type <%= gltfAnimationApiTypeName %> = Exclude<NgtsAnimationApi<<%= gltfA
|
|
|
28
28
|
<% } %>
|
|
29
29
|
export type <%= gltfResultTypeName %> = GLTF & {
|
|
30
30
|
nodes: {
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
<%- meshesTypes %>
|
|
32
|
+
<%- bonesTypes %>
|
|
33
33
|
};
|
|
34
34
|
materials: {
|
|
35
|
-
|
|
35
|
+
<%- materialsTypes %>
|
|
36
36
|
};<% if (animations.length) { %>
|
|
37
37
|
animations: <%= gltfAnimationTypeName %>[];<% } %>
|
|
38
38
|
};
|
|
@@ -69,11 +69,9 @@ export class <%= className %> {
|
|
|
69
69
|
|
|
70
70
|
modelRef = viewChild<ElementRef<Group>>('model');
|
|
71
71
|
|
|
72
|
-
protected gltf = injectGLTF<<%= gltfResultTypeName %>>(() => ${options.importattribute && !url.startsWith("http") ? gltfName : `"${url}"`}${gltfOptions ? `, ${JSON.stringify(gltfOptions)}` : ""});
|
|
73
72
|
protected gltf = injectGLTF<<%= gltfResultTypeName %>>(() => <% if (useImportAttribute) { %> <%= gltfName %> <% } else { %> '<%= url %>' <% } %><% if (gltfOptions) { %>, <%= gltfOptions %><% } %>);
|
|
74
73
|
|
|
75
74
|
constructor() {
|
|
76
|
-
extend({ Group${ngtTypesArr.length ? ", " + ngtTypesArr.join(", ") : ""} });
|
|
77
75
|
extend({ Group<%= threeImports %> });
|
|
78
76
|
|
|
79
77
|
<% if (animations.length) { %>
|
|
@@ -12,16 +12,20 @@ export interface GltfGeneratorSchema {
|
|
|
12
12
|
console: boolean;
|
|
13
13
|
instance: boolean;
|
|
14
14
|
instanceAll: boolean;
|
|
15
|
+
transform: boolean;
|
|
16
|
+
degrade: string;
|
|
17
|
+
degradeResolution: number;
|
|
15
18
|
resolution: number;
|
|
16
19
|
keepMeshes: boolean;
|
|
17
20
|
keepMaterials: boolean;
|
|
18
21
|
keepAttributes: boolean;
|
|
19
22
|
keepNames: boolean;
|
|
20
23
|
keepGroups: boolean;
|
|
21
|
-
format:
|
|
24
|
+
format: 'jpeg' | 'png' | 'webp' | 'avif';
|
|
22
25
|
simplify: boolean;
|
|
23
26
|
ratio: number;
|
|
24
27
|
error: number;
|
|
28
|
+
header: string;
|
|
25
29
|
verbose: boolean;
|
|
26
30
|
}
|
|
27
31
|
export declare function gltfGenerator(tree: Tree, options: GltfGeneratorSchema): Promise<void>;
|
|
@@ -5,11 +5,40 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
6
|
const generate_ngt_1 = require("./utils/generate-ngt");
|
|
7
7
|
async function gltfGenerator(tree, options) {
|
|
8
|
-
const { loadGLTF, AnalyzedGLTF, gltfTransform, Log, allPruneStrategies } = await import('@rosskevin/gltfjsx');
|
|
8
|
+
const { loadGLTF, AnalyzedGLTF, gltfTransform, Log, allPruneStrategies, compareFileSizes } = await import('@rosskevin/gltfjsx');
|
|
9
9
|
const modelPath = (0, node_path_1.join)(tree.root, options.modelPath);
|
|
10
|
+
const log = new Log({ debug: options.verbose, silent: false });
|
|
11
|
+
//
|
|
12
|
+
// Transform the GLTF file if necessary using gltf-transform
|
|
13
|
+
//
|
|
14
|
+
let size = '';
|
|
15
|
+
let transformedModelPath = undefined;
|
|
16
|
+
if (options.transform) {
|
|
17
|
+
transformedModelPath = (0, node_path_1.resolve)(modelPath + '-transformed.glb');
|
|
18
|
+
await gltfTransform(modelPath, transformedModelPath, {
|
|
19
|
+
format: options.format,
|
|
20
|
+
degrade: options.degrade,
|
|
21
|
+
degraderesolution: options.degradeResolution,
|
|
22
|
+
simplify: options.simplify ? { ratio: options.ratio, error: options.error } : false,
|
|
23
|
+
log,
|
|
24
|
+
bones: options.bones,
|
|
25
|
+
meta: options.meta,
|
|
26
|
+
shadows: options.shadows,
|
|
27
|
+
instance: options.instance,
|
|
28
|
+
instanceall: options.instanceAll,
|
|
29
|
+
keepgroups: options.keepGroups,
|
|
30
|
+
keepnames: options.keepNames,
|
|
31
|
+
precision: options.precision,
|
|
32
|
+
keepattributes: options.keepAttributes,
|
|
33
|
+
keepmeshes: options.keepMeshes,
|
|
34
|
+
keepmaterials: options.keepMaterials,
|
|
35
|
+
resolution: options.resolution,
|
|
36
|
+
});
|
|
37
|
+
size = compareFileSizes(modelPath, transformedModelPath);
|
|
38
|
+
}
|
|
10
39
|
const gltf = await loadGLTF(modelPath);
|
|
11
40
|
const analyzed = new AnalyzedGLTF(gltf, {
|
|
12
|
-
log
|
|
41
|
+
log,
|
|
13
42
|
bones: options.bones,
|
|
14
43
|
meta: options.meta,
|
|
15
44
|
shadows: options.shadows,
|
|
@@ -58,9 +87,17 @@ async function gltfGenerator(tree, options) {
|
|
|
58
87
|
angularImports.push('NgtsOrthographicCamera');
|
|
59
88
|
}
|
|
60
89
|
const gltfOptions = options.draco ? `{ useDraco: true }` : '';
|
|
61
|
-
const
|
|
62
|
-
|
|
90
|
+
const meshesTypes = analyzed
|
|
91
|
+
.getMeshes()
|
|
92
|
+
.map(({ name, type }) => "\'" + name + "\'" + ': THREE.' + type)
|
|
93
|
+
.join(';\n');
|
|
94
|
+
const bonesTypes = analyzed
|
|
95
|
+
.getBones()
|
|
96
|
+
.map(({ name, type }) => "\'" + name + "\'" + ': THREE.' + type)
|
|
97
|
+
.join(';\n');
|
|
63
98
|
const materials = analyzed.getMaterials();
|
|
99
|
+
const materialsTypes = materials.map(({ name, type }) => "\'" + name + "\'" + ': THREE.' + type).join(';\n');
|
|
100
|
+
log.debug(materialsTypes);
|
|
64
101
|
(0, devkit_1.generateFiles)(tree, (0, node_path_1.join)(__dirname, 'files'), (0, node_path_1.dirname)(options.output), {
|
|
65
102
|
tmpl: '',
|
|
66
103
|
scene,
|
|
@@ -79,11 +116,14 @@ async function gltfGenerator(tree, options) {
|
|
|
79
116
|
gltfAnimationTypeName,
|
|
80
117
|
gltfAnimationApiTypeName,
|
|
81
118
|
gltfResultTypeName,
|
|
82
|
-
|
|
119
|
+
gltfPath: modelPath,
|
|
83
120
|
gltfOptions,
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
121
|
+
meshesTypes,
|
|
122
|
+
bonesTypes,
|
|
123
|
+
materialsTypes,
|
|
124
|
+
angularImports,
|
|
125
|
+
header: options.header,
|
|
126
|
+
size,
|
|
87
127
|
});
|
|
88
128
|
await (0, devkit_1.formatFiles)(tree);
|
|
89
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gltf.js","sourceRoot":"","sources":["../../../../../../libs/plugin/src/generators/gltf/gltf.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"gltf.js","sourceRoot":"","sources":["../../../../../../libs/plugin/src/generators/gltf/gltf.ts"],"names":[],"mappings":"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"}
|
|
@@ -81,6 +81,24 @@
|
|
|
81
81
|
"alias": "I",
|
|
82
82
|
"default": false
|
|
83
83
|
},
|
|
84
|
+
"transform": {
|
|
85
|
+
"type": "boolean",
|
|
86
|
+
"description": "Transform meshes via @gltf-transform/extensions",
|
|
87
|
+
"alias": "t",
|
|
88
|
+
"default": false
|
|
89
|
+
},
|
|
90
|
+
"degrade": {
|
|
91
|
+
"type": "string",
|
|
92
|
+
"description": "Degrade meshes via @gltf-transform/extensions",
|
|
93
|
+
"alias": "q",
|
|
94
|
+
"default": ""
|
|
95
|
+
},
|
|
96
|
+
"degradeResolution": {
|
|
97
|
+
"type": "number",
|
|
98
|
+
"description": "Degrade meshes via @gltf-transform/extensions",
|
|
99
|
+
"alias": "Q",
|
|
100
|
+
"default": 512
|
|
101
|
+
},
|
|
84
102
|
"resolution": {
|
|
85
103
|
"type": "number",
|
|
86
104
|
"description": "Resolution for texture resizing (default: 1024)",
|
|
@@ -141,6 +159,12 @@
|
|
|
141
159
|
"alias": "e",
|
|
142
160
|
"default": 0.0001
|
|
143
161
|
},
|
|
162
|
+
"header": {
|
|
163
|
+
"type": "string",
|
|
164
|
+
"description": "Custom header to add to the generated file",
|
|
165
|
+
"alias": "H",
|
|
166
|
+
"default": ""
|
|
167
|
+
},
|
|
144
168
|
"verbose": {
|
|
145
169
|
"type": "boolean",
|
|
146
170
|
"description": "Verbose log",
|