Add support for GLB Draco Mesh Compression #97
This commit is contained in:
parent
265da7548d
commit
ab0d0172e7
@ -8,6 +8,7 @@
|
||||
"OV": "writable",
|
||||
"$": "readonly",
|
||||
"THREE": "readonly",
|
||||
"DracoDecoderModule": "readonly",
|
||||
"rhino3dm": "readonly",
|
||||
"IfcAPI": "readonly"
|
||||
},
|
||||
|
||||
252
libs/draco.license.md
Normal file
252
libs/draco.license.md
Normal file
@ -0,0 +1,252 @@
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Files: docs/assets/js/ASCIIMathML.js
|
||||
|
||||
Copyright (c) 2014 Peter Jipsen and other ASCIIMathML.js contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
Files: docs/assets/css/pygments/*
|
||||
|
||||
This is free and unencumbered software released into the public domain.
|
||||
|
||||
Anyone is free to copy, modify, publish, use, compile, sell, or
|
||||
distribute this software, either in source code form or as a compiled
|
||||
binary, for any purpose, commercial or non-commercial, and by any
|
||||
means.
|
||||
|
||||
In jurisdictions that recognize copyright laws, the author or authors
|
||||
of this software dedicate any and all copyright interest in the
|
||||
software to the public domain. We make this dedication for the benefit
|
||||
of the public at large and to the detriment of our heirs and
|
||||
successors. We intend this dedication to be an overt act of
|
||||
relinquishment in perpetuity of all present and future rights to this
|
||||
software under copyright law.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
For more information, please refer to <http://unlicense.org>
|
||||
52
libs/draco_decoder.js
Normal file
52
libs/draco_decoder.js
Normal file
File diff suppressed because one or more lines are too long
BIN
libs/draco_decoder.wasm
Normal file
BIN
libs/draco_decoder.wasm
Normal file
Binary file not shown.
@ -257,9 +257,34 @@ OV.GltfExtensions = class
|
||||
constructor ()
|
||||
{
|
||||
this.supportedExtensions = [
|
||||
'KHR_draco_mesh_compression',
|
||||
'KHR_materials_pbrSpecularGlossiness',
|
||||
'KHR_texture_transform',
|
||||
];
|
||||
this.draco = null;
|
||||
}
|
||||
|
||||
LoadLibraries (extensionsRequired, onReady)
|
||||
{
|
||||
if (extensionsRequired === undefined) {
|
||||
onReady ();
|
||||
return;
|
||||
}
|
||||
if (this.draco === null && extensionsRequired.indexOf ('KHR_draco_mesh_compression') !== -1) {
|
||||
OV.LoadExternalLibrary ('draco_decoder.js', {
|
||||
success : () => {
|
||||
DracoDecoderModule ().then ((draco) => {
|
||||
this.draco = draco;
|
||||
onReady ();
|
||||
});
|
||||
},
|
||||
error : () => {
|
||||
onReady ();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
onReady ();
|
||||
}
|
||||
}
|
||||
|
||||
GetUnsupportedExtensions (extensionsRequired)
|
||||
@ -341,6 +366,110 @@ OV.GltfExtensions = class
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ProcessPrimitive (importer, gltf, primitive, mesh)
|
||||
{
|
||||
function EnumerateComponents (draco, decoder, dracoMesh, attributeId, processor)
|
||||
{
|
||||
let attribute = decoder.GetAttributeByUniqueId (dracoMesh, attributeId);
|
||||
let numComponents = attribute.num_components ();
|
||||
let numPoints = dracoMesh.num_points ();
|
||||
let numValues = numPoints * numComponents;
|
||||
let dataSize = numValues * 4;
|
||||
let attributePtr = draco._malloc (dataSize);
|
||||
decoder.GetAttributeDataArrayForAllPoints (dracoMesh, attribute, draco.DT_FLOAT32, dataSize, attributePtr);
|
||||
let attributeArray = new Float32Array (draco.HEAPF32.buffer, attributePtr, numValues).slice ();
|
||||
if (numComponents === 2) {
|
||||
for (let i = 0; i < attributeArray.length; i += 2) {
|
||||
processor (new OV.Coord2D (
|
||||
attributeArray[i + 0],
|
||||
attributeArray[i + 1]
|
||||
));
|
||||
}
|
||||
} else if (numComponents === 3) {
|
||||
for (let i = 0; i < attributeArray.length; i += 3) {
|
||||
processor (new OV.Coord3D (
|
||||
attributeArray[i + 0],
|
||||
attributeArray[i + 1],
|
||||
attributeArray[i + 2]
|
||||
));
|
||||
}
|
||||
}
|
||||
draco._free (attributePtr);
|
||||
}
|
||||
|
||||
if (this.draco === null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (primitive.extensions === undefined || primitive.extensions.KHR_draco_mesh_compression === undefined) {
|
||||
return false;
|
||||
}
|
||||
|
||||
let decoder = new this.draco.Decoder ();
|
||||
let decoderBuffer = new this.draco.DecoderBuffer ();
|
||||
|
||||
let extensionParams = primitive.extensions.KHR_draco_mesh_compression;
|
||||
let compressedBufferView = gltf.bufferViews[extensionParams.bufferView];
|
||||
let compressedReader = importer.GetReaderFromBufferView (compressedBufferView);
|
||||
let compressedArrayBuffer = compressedReader.ReadArrayBuffer (compressedBufferView.byteLength);
|
||||
decoderBuffer.Init (new Int8Array (compressedArrayBuffer), compressedArrayBuffer.byteLength);
|
||||
let geometryType = decoder.GetEncodedGeometryType (decoderBuffer);
|
||||
if (geometryType !== this.draco.TRIANGULAR_MESH) {
|
||||
return true;
|
||||
}
|
||||
|
||||
let dracoMesh = new this.draco.Mesh ();
|
||||
let decodingStatus = decoder.DecodeBufferToMesh (decoderBuffer, dracoMesh);
|
||||
if (!decodingStatus.ok ()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
let hasVertices = (extensionParams.attributes.POSITION !== undefined);
|
||||
let hasNormals = (extensionParams.attributes.NORMAL !== undefined);
|
||||
let hasUVs = (extensionParams.attributes.TEXCOORD_0 !== undefined);
|
||||
|
||||
if (!hasVertices) {
|
||||
return true;
|
||||
}
|
||||
|
||||
let vertexOffset = mesh.VertexCount ();
|
||||
let normalOffset = mesh.NormalCount ();
|
||||
let uvOffset = mesh.TextureUVCount ();
|
||||
|
||||
EnumerateComponents (this.draco, decoder, dracoMesh, extensionParams.attributes.POSITION, (vertex) => {
|
||||
mesh.AddVertex (vertex);
|
||||
});
|
||||
|
||||
if (hasNormals) {
|
||||
EnumerateComponents (this.draco, decoder, dracoMesh, extensionParams.attributes.NORMAL, (normal) => {
|
||||
mesh.AddNormal (normal);
|
||||
});
|
||||
}
|
||||
|
||||
if (hasUVs) {
|
||||
EnumerateComponents (this.draco, decoder, dracoMesh, extensionParams.attributes.TEXCOORD_0, (uv) => {
|
||||
uv.y = -uv.y;
|
||||
mesh.AddTextureUV (uv);
|
||||
});
|
||||
}
|
||||
|
||||
let faceCount = dracoMesh.num_faces ();
|
||||
let indexCount = faceCount * 3;
|
||||
let indexDataSize = indexCount * 4;
|
||||
let indexDataPtr = this.draco._malloc (indexDataSize);
|
||||
decoder.GetTrianglesUInt32Array (dracoMesh, indexDataSize, indexDataPtr);
|
||||
let indexArray = new Uint32Array (this.draco.HEAPU32.buffer, indexDataPtr, indexCount).slice ();
|
||||
for (let i = 0; i < indexArray.length; i += 3) {
|
||||
let v0 = indexArray[i];
|
||||
let v1 = indexArray[i + 1];
|
||||
let v2 = indexArray[i + 2];
|
||||
importer.AddTriangle (primitive, mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset);
|
||||
}
|
||||
this.draco._free (indexDataPtr);
|
||||
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
OV.ImporterGltf = class extends OV.ImporterBase
|
||||
@ -348,6 +477,7 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
constructor ()
|
||||
{
|
||||
super ();
|
||||
this.gltfExtensions = new OV.GltfExtensions ();
|
||||
}
|
||||
|
||||
CanImportExtension (extension)
|
||||
@ -372,33 +502,31 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
ClearContent ()
|
||||
{
|
||||
this.bufferContents = null;
|
||||
this.gltfExtensions = null;
|
||||
this.imageIndexToTextureParams = null;
|
||||
}
|
||||
|
||||
ResetContent ()
|
||||
{
|
||||
this.bufferContents = [];
|
||||
this.gltfExtensions = new OV.GltfExtensions ();
|
||||
this.imageIndexToTextureParams = {};
|
||||
}
|
||||
|
||||
ImportContent (fileContent, onFinish)
|
||||
{
|
||||
if (this.extension === 'gltf') {
|
||||
this.ProcessGltf (fileContent);
|
||||
this.ProcessGltf (fileContent, onFinish);
|
||||
} else if (this.extension === 'glb') {
|
||||
this.ProcessBinaryGltf (fileContent);
|
||||
this.ProcessBinaryGltf (fileContent, onFinish);
|
||||
}
|
||||
onFinish ();
|
||||
}
|
||||
|
||||
ProcessGltf (fileContent)
|
||||
ProcessGltf (fileContent, onFinish)
|
||||
{
|
||||
let gltf = JSON.parse (fileContent);
|
||||
if (gltf.asset.version !== '2.0') {
|
||||
this.SetError ();
|
||||
this.SetMessage ('Invalid glTF version.');
|
||||
onFinish ();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -417,15 +545,16 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
if (buffer === null) {
|
||||
this.SetError ();
|
||||
this.SetMessage ('One of the requested buffers is missing.');
|
||||
onFinish ();
|
||||
return;
|
||||
}
|
||||
this.bufferContents.push (buffer);
|
||||
}
|
||||
|
||||
this.ProcessMainFile (gltf);
|
||||
this.ProcessMainFile (gltf, onFinish);
|
||||
}
|
||||
|
||||
ProcessBinaryGltf (fileContent)
|
||||
ProcessBinaryGltf (fileContent, onFinish)
|
||||
{
|
||||
function ReadChunk (reader)
|
||||
{
|
||||
@ -443,18 +572,21 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
if (magic !== OV.GltfConstants.GLTF_STRING) {
|
||||
this.SetError ();
|
||||
this.SetMessage ('Invalid glTF file.');
|
||||
onFinish ();
|
||||
return;
|
||||
}
|
||||
let version = reader.ReadUnsignedInteger32 ();
|
||||
if (version !== 2) {
|
||||
this.SetError ();
|
||||
this.SetMessage ('Invalid glTF version.');
|
||||
onFinish ();
|
||||
return;
|
||||
}
|
||||
let length = reader.ReadUnsignedInteger32 ();
|
||||
if (length !== reader.GetByteLength ()) {
|
||||
this.SetError ();
|
||||
this.SetMessage ('Invalid glTF file.');
|
||||
onFinish ();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -470,40 +602,46 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
|
||||
if (gltfTextContent !== null) {
|
||||
let gltf = JSON.parse (gltfTextContent);
|
||||
this.ProcessMainFile (gltf);
|
||||
this.ProcessMainFile (gltf, onFinish);
|
||||
}
|
||||
}
|
||||
|
||||
ProcessMainFile (gltf)
|
||||
ProcessMainFile (gltf, onFinish)
|
||||
{
|
||||
this.ImportModelProperties (gltf);
|
||||
|
||||
let unsupportedExtensions = this.gltfExtensions.GetUnsupportedExtensions (gltf.extensionsRequired);
|
||||
if (unsupportedExtensions.length > 0) {
|
||||
this.SetError ();
|
||||
this.SetMessage ('Unsupported extension: ' + unsupportedExtensions.join (', ') + '.');
|
||||
return;
|
||||
onFinish ();
|
||||
return;
|
||||
}
|
||||
|
||||
let defaultScene = this.GetDefaultScene (gltf);
|
||||
if (defaultScene === null) {
|
||||
this.SetError ();
|
||||
this.SetMessage ('No default scene found.');
|
||||
onFinish ();
|
||||
return;
|
||||
}
|
||||
|
||||
let materials = gltf.materials;
|
||||
if (materials !== undefined) {
|
||||
for (let i = 0; i < materials.length; i++) {
|
||||
this.ImportMaterial (gltf, i);
|
||||
}
|
||||
}
|
||||
this.gltfExtensions.LoadLibraries (gltf.extensionsRequired, () => {
|
||||
this.ImportModelProperties (gltf);
|
||||
|
||||
let nodeTree = this.CollectMeshNodesForScene (gltf, defaultScene);
|
||||
for (let i = 0; i < nodeTree.nodes.length; i++) {
|
||||
let nodeIndex = nodeTree.nodes[i];
|
||||
this.ImportMeshNode (gltf, nodeIndex, nodeTree);
|
||||
}
|
||||
let materials = gltf.materials;
|
||||
if (materials !== undefined) {
|
||||
for (let i = 0; i < materials.length; i++) {
|
||||
this.ImportMaterial (gltf, i);
|
||||
}
|
||||
}
|
||||
|
||||
let nodeTree = this.CollectMeshNodesForScene (gltf, defaultScene);
|
||||
for (let i = 0; i < nodeTree.nodes.length; i++) {
|
||||
let nodeIndex = nodeTree.nodes[i];
|
||||
this.ImportMeshNode (gltf, nodeIndex, nodeTree);
|
||||
}
|
||||
|
||||
onFinish ();
|
||||
});
|
||||
}
|
||||
|
||||
ImportModelProperties (gltf)
|
||||
@ -759,27 +897,8 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
|
||||
ImportPrimitive (gltf, primitive, mesh)
|
||||
{
|
||||
function AddTriangle (mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset)
|
||||
{
|
||||
let triangle = new OV.Triangle (vertexOffset + v0, vertexOffset + v1, vertexOffset + v2);
|
||||
if (hasNormals) {
|
||||
triangle.SetNormals (
|
||||
normalOffset + v0,
|
||||
normalOffset + v1,
|
||||
normalOffset + v2
|
||||
);
|
||||
}
|
||||
if (hasUVs) {
|
||||
triangle.SetTextureUVs (
|
||||
uvOffset + v0,
|
||||
uvOffset + v1,
|
||||
uvOffset + v2
|
||||
);
|
||||
}
|
||||
if (primitive.material !== undefined) {
|
||||
triangle.mat = primitive.material;
|
||||
}
|
||||
mesh.AddTriangle (triangle);
|
||||
if (this.gltfExtensions.ProcessPrimitive (this, gltf, primitive, mesh)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (primitive.attributes === undefined) {
|
||||
@ -860,7 +979,7 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
let v0 = vertexIndices[i];
|
||||
let v1 = vertexIndices[i + 1];
|
||||
let v2 = vertexIndices[i + 2];
|
||||
AddTriangle (mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset);
|
||||
this.AddTriangle (primitive, mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset);
|
||||
}
|
||||
} else if (mode === OV.GltfRenderMode.TRIANGLE_STRIP) {
|
||||
for (let i = 0; i < vertexIndices.length - 2; i++) {
|
||||
@ -872,18 +991,41 @@ OV.ImporterGltf = class extends OV.ImporterBase
|
||||
v1 = v2;
|
||||
v2 = tmp;
|
||||
}
|
||||
AddTriangle (mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset);
|
||||
this.AddTriangle (primitive, mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset);
|
||||
}
|
||||
} else if (mode === OV.GltfRenderMode.TRIANGLE_FAN) {
|
||||
for (let i = 1; i < vertexIndices.length - 1; i++) {
|
||||
let v0 = vertexIndices[0];
|
||||
let v1 = vertexIndices[i];
|
||||
let v2 = vertexIndices[i + 1];
|
||||
AddTriangle (mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset);
|
||||
this.AddTriangle (primitive, mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
AddTriangle (primitive, mesh, v0, v1, v2, hasNormals, hasUVs, vertexOffset, normalOffset, uvOffset)
|
||||
{
|
||||
let triangle = new OV.Triangle (vertexOffset + v0, vertexOffset + v1, vertexOffset + v2);
|
||||
if (hasNormals) {
|
||||
triangle.SetNormals (
|
||||
normalOffset + v0,
|
||||
normalOffset + v1,
|
||||
normalOffset + v2
|
||||
);
|
||||
}
|
||||
if (hasUVs) {
|
||||
triangle.SetTextureUVs (
|
||||
uvOffset + v0,
|
||||
uvOffset + v1,
|
||||
uvOffset + v2
|
||||
);
|
||||
}
|
||||
if (primitive.material !== undefined) {
|
||||
triangle.mat = primitive.material;
|
||||
}
|
||||
mesh.AddTriangle (triangle);
|
||||
}
|
||||
|
||||
GetReaderFromBufferView (bufferView)
|
||||
{
|
||||
let bufferIndex = bufferView.buffer || 0;
|
||||
|
||||
@ -3,6 +3,9 @@ process.chdir (__dirname);
|
||||
|
||||
require ('./utils/globals.js');
|
||||
require ('./utils/importall.js');
|
||||
|
||||
OV.ExternalLibLocation = '../../libs';
|
||||
|
||||
var testDirName = './tests/';
|
||||
var files = fs.readdirSync (testDirName, { withFileTypes: true });
|
||||
var i, file;
|
||||
|
||||
@ -49,7 +49,8 @@ describe ('Gltf Importer', function () {
|
||||
let testFileList = [
|
||||
['Box/glTF', 'Box.gltf'],
|
||||
['Box/glTF-Embedded', 'Box.gltf'],
|
||||
['Box/glTF-Binary', 'Box.glb']
|
||||
['Box/glTF-Binary', 'Box.glb'],
|
||||
['Box/glTF-Draco', 'Box.gltf']
|
||||
];
|
||||
let processed = 0;
|
||||
for (let i = 0; i < testFileList.length; i++) {
|
||||
|
||||
@ -61,3 +61,23 @@ global.FileReader = class
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
global.document = {
|
||||
head : {
|
||||
appendChild : function (element) {
|
||||
if (element.type === 'text/javascript') {
|
||||
if (element.src.indexOf ('draco') !== -1) {
|
||||
global.DracoDecoderModule = require (element.src);
|
||||
element.onload ();
|
||||
} else {
|
||||
element.onerror ();
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
createElement : function (type) {
|
||||
return {
|
||||
type : type
|
||||
};
|
||||
}
|
||||
};
|
||||
Loading…
Reference in New Issue
Block a user