Skip to content

Cleanup assimpLoader based on LGTM Errors #16716

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
Jun 7, 2019
Merged

Cleanup assimpLoader based on LGTM Errors #16716

Show file tree
Hide file tree
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
18 changes: 11 additions & 7 deletions examples/js/loaders/AssimpLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,7 @@ THREE.AssimpLoader.prototype = {
for ( var i in root.children ) {

var child = cloneTreeToBones( root.children[ i ], scene );
if ( child )
rootBone.add( child );
rootBone.add( child );

}

Expand Down Expand Up @@ -1314,6 +1313,10 @@ THREE.AssimpLoader.prototype = {

function aiScene() {

this.versionMajor = 0;
this.versionMinor = 0;
this.versionRevision = 0;
this.compileFlags = 0;
this.mFlags = 0;
this.mNumMeshes = 0;
this.mNumMaterials = 0;
Expand Down Expand Up @@ -2232,13 +2235,13 @@ THREE.AssimpLoader.prototype = {
extendStream( stream );
stream.Seek( 44, aiOrigin_CUR ); // signature
/*unsigned int versionMajor =*/
var versionMajor = Read_unsigned_int( stream );
pScene.versionMajor = Read_unsigned_int( stream );
/*unsigned int versionMinor =*/
var versionMinor = Read_unsigned_int( stream );
pScene.versionMinor = Read_unsigned_int( stream );
/*unsigned int versionRevision =*/
var versionRevision = Read_unsigned_int( stream );
pScene.versionRevision = Read_unsigned_int( stream );
/*unsigned int compileFlags =*/
var compileFlags = Read_unsigned_int( stream );
pScene.compileFlags = Read_unsigned_int( stream );
shortened = Read_uint16_t( stream ) > 0;
compressed = Read_uint16_t( stream ) > 0;
if ( shortened )
Expand All @@ -2260,10 +2263,11 @@ THREE.AssimpLoader.prototype = {
} else {

ReadBinaryScene( stream, pScene );
return pScene.toTHREE();

}

return pScene.toTHREE();

}

return InternReadFile( buffer );
Expand Down
18 changes: 11 additions & 7 deletions examples/jsm/loaders/AssimpLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,8 +558,7 @@ AssimpLoader.prototype = {
for ( var i in root.children ) {

var child = cloneTreeToBones( root.children[ i ], scene );
if ( child )
rootBone.add( child );
rootBone.add( child );

}

Expand Down Expand Up @@ -1334,6 +1333,10 @@ AssimpLoader.prototype = {

function aiScene() {

this.versionMajor = 0;
this.versionMinor = 0;
this.versionRevision = 0;
this.compileFlags = 0;
this.mFlags = 0;
this.mNumMeshes = 0;
this.mNumMaterials = 0;
Expand Down Expand Up @@ -2252,13 +2255,13 @@ AssimpLoader.prototype = {
extendStream( stream );
stream.Seek( 44, aiOrigin_CUR ); // signature
/*unsigned int versionMajor =*/
var versionMajor = Read_unsigned_int( stream );
pScene.versionMajor = Read_unsigned_int( stream );
/*unsigned int versionMinor =*/
var versionMinor = Read_unsigned_int( stream );
pScene.versionMinor = Read_unsigned_int( stream );
/*unsigned int versionRevision =*/
var versionRevision = Read_unsigned_int( stream );
pScene.versionRevision = Read_unsigned_int( stream );
/*unsigned int compileFlags =*/
var compileFlags = Read_unsigned_int( stream );
pScene.compileFlags = Read_unsigned_int( stream );
shortened = Read_uint16_t( stream ) > 0;
compressed = Read_uint16_t( stream ) > 0;
if ( shortened )
Expand All @@ -2280,10 +2283,11 @@ AssimpLoader.prototype = {
} else {

ReadBinaryScene( stream, pScene );
return pScene.toTHREE();

}

return pScene.toTHREE();

}

return InternReadFile( buffer );
Expand Down