@combeenation/3d-viewer 12.0.0-alpha2 → 12.0.0-alpha3
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/dist/lib-cjs/api/manager/gltfExportManager.d.ts +1 -1
- package/dist/lib-cjs/api/manager/gltfExportManager.js +5 -5
- package/dist/lib-cjs/api/manager/gltfExportManager.js.map +1 -1
- package/dist/lib-cjs/buildinfo.json +1 -1
- package/dist/lib-cjs/commonjs.tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/api/manager/gltfExportManager.ts +9 -7
|
@@ -22,5 +22,5 @@ export declare class GltfExportManager {
|
|
|
22
22
|
/**
|
|
23
23
|
* Create an export-friendly replacement material for a material using refraction.
|
|
24
24
|
*/
|
|
25
|
-
protected _createRefractionMaterialReplacement(material: PBRMaterial):
|
|
25
|
+
protected _createRefractionMaterialReplacement(material: PBRMaterial): void;
|
|
26
26
|
}
|
|
@@ -64,6 +64,7 @@ class GltfExportManager {
|
|
|
64
64
|
}
|
|
65
65
|
_exportPreProcess(excluded) {
|
|
66
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
67
|
+
this.viewer.pauseRendering();
|
|
67
68
|
// handle materials
|
|
68
69
|
this.viewer.scene.materials
|
|
69
70
|
.filter(material => this._shouldReplaceMaterial(material))
|
|
@@ -77,7 +78,7 @@ class GltfExportManager {
|
|
|
77
78
|
.forEach(mesh => (0, geometryHelper_1.bakeGeometryOfMesh)(mesh));
|
|
78
79
|
// reset transformation of all "TransformNodes", which couldn't be handled by the geometry baking algorithm
|
|
79
80
|
// it's important that this is done AFTER all geometries have been baked
|
|
80
|
-
this.viewer.scene.transformNodes
|
|
81
|
+
[...this.viewer.scene.transformNodes, ...this.viewer.scene.meshes]
|
|
81
82
|
.filter(node => { var _a; return !!((_a = node.metadata) === null || _a === void 0 ? void 0 : _a[GltfExportManager._METADATA_PROPS.exportNode]); })
|
|
82
83
|
.forEach(node => (0, geometryHelper_1.resetTransformation)(node));
|
|
83
84
|
});
|
|
@@ -91,6 +92,7 @@ class GltfExportManager {
|
|
|
91
92
|
this.viewer.scene.materials
|
|
92
93
|
.filter(mat => { var _a; return !!((_a = mat.metadata) === null || _a === void 0 ? void 0 : _a[GltfExportManager._METADATA_PROPS.deleteAfterExport]); })
|
|
93
94
|
.forEach(material => material.dispose(false, false));
|
|
95
|
+
this.viewer.resumeRendering();
|
|
94
96
|
});
|
|
95
97
|
}
|
|
96
98
|
_gltfExportOptions() {
|
|
@@ -165,10 +167,9 @@ class GltfExportManager {
|
|
|
165
167
|
*/
|
|
166
168
|
_createRefractionMaterialReplacement(material) {
|
|
167
169
|
const newName = `${material.name}_clone`;
|
|
168
|
-
|
|
169
|
-
const clonedMaterial = material.clone(newName); // clone material
|
|
170
|
+
const clonedMaterial = material.clone(newName);
|
|
170
171
|
clonedMaterial.refractionTexture = null;
|
|
171
|
-
clonedMaterial.metallicReflectanceTexture = null;
|
|
172
|
+
clonedMaterial.metallicReflectanceTexture = null;
|
|
172
173
|
clonedMaterial.alpha = 0.7;
|
|
173
174
|
clonedMaterial.albedoColor = new index_1.Color3(0.3, 0.3, 0.3);
|
|
174
175
|
clonedMaterial.transparencyMode = index_1.PBRMaterial.PBRMATERIAL_ALPHABLEND;
|
|
@@ -176,7 +177,6 @@ class GltfExportManager {
|
|
|
176
177
|
clonedMaterial.roughness = 0.15;
|
|
177
178
|
(0, babylonHelper_1.injectMetadata)(material, { [GltfExportManager._METADATA_PROPS.exchangeMaterialWith]: newName });
|
|
178
179
|
(0, babylonHelper_1.injectMetadata)(clonedMaterial, { [GltfExportManager._METADATA_PROPS.deleteAfterExport]: true });
|
|
179
|
-
return clonedMaterial;
|
|
180
180
|
}
|
|
181
181
|
}
|
|
182
182
|
exports.GltfExportManager = GltfExportManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gltfExportManager.js","sourceRoot":"","sources":["../../../../src/api/manager/gltfExportManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkF;AAClF,8CAA2C;AAC3C,yDAAuD;AACvD,2DAA8G;AAC9G,6DAAwE;AACxE,sDAAmD;AACnD,wEAAqE;AACrE,mFAA6E;AAE7E,MAAa,iBAAiB;IAO5B,YAAgC,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAE3C,MAAM,CAAO,MAAM,CAAC,MAAc;;YACvC,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;KAAA;IAEY,SAAS,CAAC,QAAQ,GAAG,gBAAgB,EAAE,QAA+B;;YACjF,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAEvC,MAAM,OAAO,GAAG,MAAM,4BAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAElG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAEhC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YAC/C,iFAAiF;YACjF,IAAI,OAAO,YAAY,IAAI,EAAE;gBAC3B,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBAC9B,QAAQ,IAAI,MAAM,CAAC;iBACpB;gBACD,OAAO,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;aACtC;iBAAM;gBACL,8BAA8B;gBAC9B,OAAO,SAAS,CAAC;aAClB;QACH,CAAC;KAAA;IAEY,gBAAgB,CAAC,QAAgB,EAAE,QAA+B;;YAC7E,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAEvC,MAAM,IAAI,GAAG,MAAM,4BAAW,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;YACjG,IAAI,CAAC,aAAa,EAAE,CAAC;YAErB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;KAAA;IAEY,eAAe,CAAC,QAAgB,EAAE,QAA+B;;YAC5E,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAEvC,MAAM,GAAG,GAAG,MAAM,4BAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAC/F,GAAG,CAAC,aAAa,EAAE,CAAC;YAEpB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;KAAA;IAEe,iBAAiB,CAAC,QAA+B;;YAC/D,mBAAmB;YACnB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS;iBACxB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;iBACzD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,oCAAoC,CAAC,QAAuB,CAAC,CAAC,CAAC;YAE3F,eAAe;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;YAEtG,2EAA2E;YAC3E,sGAAsG;YACtG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM;iBACrB,MAAM,CAAC,IAAI,CAAC,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAG,iBAAiB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAA,CAAA,EAAA,CAAC;iBAC/E,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAA,mCAAkB,EAAC,IAAY,CAAC,CAAC,CAAC;YAErD,2GAA2G;YAC3G,wEAAwE;YACxE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"gltfExportManager.js","sourceRoot":"","sources":["../../../../src/api/manager/gltfExportManager.ts"],"names":[],"mappings":"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"}
|