Skip to content

3dmLoader: Fix bug in texture type checking #21784

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 10 commits into from
May 5, 2021
Merged

3dmLoader: Fix bug in texture type checking #21784

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
158a875
extract name and value properties from objects
fraguada Feb 11, 2021
ec3ff76
Extract object userStrings
fraguada Feb 15, 2021
89da0c7
Merge branch 'dev' of https://github.com/mrdoob/three.js into wip/3DM…
fraguada Feb 15, 2021
78afc99
Merge branch 'wip/3DMLoader' of https://github.com/mcneel/three.js in…
fraguada Apr 15, 2021
c810381
3dmLoader: refactor es6
fraguada Apr 15, 2021
4176142
Remove unnecessary imports.
fraguada Apr 15, 2021
ea34dbf
adding some error catching related to PBR mats
fraguada Apr 30, 2021
103675f
Merge branch 'dev' of https://github.com/mrdoob/three.js into wip/3DM…
fraguada Apr 30, 2021
7731833
fix bug in texturetype checking
fraguada Apr 30, 2021
27b8f45
Merge branch 'dev' of https://github.com/mrdoob/three.js into wip/3DM…
fraguada May 5, 2021
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
6 changes: 2 additions & 4 deletions examples/jsm/loaders/3DMLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,15 +944,13 @@ function Rhino3dmWorker() {

if ( _pbrMaterial.supported ) {

console.log( 'pbr true' );

for ( let j = 0; j < pbrTextureTypes.length; j ++ ) {

const _texture = _material.getTexture( textureTypes[ j ] );
const _texture = _material.getTexture( pbrTextureTypes[ j ] );
if ( _texture ) {

const image = doc.getEmbeddedFileAsBase64( _texture.fileName );
let textureType = textureTypes[ j ].constructor.name;
let textureType = pbrTextureTypes[ j ].constructor.name;
textureType = textureType.substring( 12, textureType.length );
const texture = { type: textureType, image: 'data:image/png;base64,' + image };
textures.push( texture );
Expand Down