Skip to content

3MFLoader: Clean up #16436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2019
Merged

3MFLoader: Clean up #16436

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions examples/js/loaders/3MFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
/**
* @author technohippy / https://github.com/technohippy
* @author Mugen87 / https://github.com/Mugen87
*
* 3D Manufacturing Format (3MF) specification: https://3mf.io/specification/
*
* The following features from the core specification are supported:
*
* - 3D Models
* - Object Resources (Meshes and Components)
* - Material Resources (Base Materials)
*
* 3MF Materials and Properties Extension (e.g. textures) are not yet supported.
*
*/

THREE.ThreeMFLoader = function ( manager ) {
Expand Down Expand Up @@ -63,7 +75,7 @@ THREE.ThreeMFLoader.prototype = {

if ( e instanceof ReferenceError ) {

console.error( 'THREE.ThreeMFLoader: jszip missing and file is compressed.' );
console.error( 'THREE.3MFLoader: jszip missing and file is compressed.' );
return null;

}
Expand Down Expand Up @@ -110,7 +122,7 @@ THREE.ThreeMFLoader.prototype = {

if ( xmlData.documentElement.nodeName.toLowerCase() !== 'model' ) {

console.error( 'THREE.ThreeMFLoader: Error loading 3MF - no 3MF document found: ', modelPart );
console.error( 'THREE.3MFLoader: Error loading 3MF - no 3MF document found: ', modelPart );

}

Expand Down Expand Up @@ -596,14 +608,20 @@ THREE.ThreeMFLoader.prototype = {

var material;

// add material if an object-level definition is present

if ( basematerialsData && ( basematerialsData.id === objectData.pid ) ) {

var materialIndex = objectData.pindex;
var basematerialData = basematerialsData.basematerials[ materialIndex ];

material = getBuild( basematerialData, objects, modelData, objectData, buildBasematerial );

} else if ( geometry.groups.length > 0 ) {
}

// add/overwrite material if definitions on triangles are present

if ( geometry.groups.length > 0 ) {

var groups = geometry.groups;
material = [];
Expand All @@ -617,13 +635,11 @@ THREE.ThreeMFLoader.prototype = {

}

} else {

// default material
}

material = new THREE.MeshPhongMaterial( { color: 0xaaaaff, flatShading: true } );
// default material

}
if ( material === undefined ) material = new THREE.MeshPhongMaterial( { color: 0xaaaaff, flatShading: true } );

return new THREE.Mesh( geometry, material );

Expand Down