Skip to content

VRMLLoader: Handle invalid geometry definitions. #16940

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

VRMLLoader: Handle invalid geometry definitions. #16940

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
22 changes: 15 additions & 7 deletions examples/js/loaders/VRMLLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ THREE.VRMLLoader = ( function () {

var object;

if ( geometry ) {
if ( geometry && geometry.attributes.position ) {

var type = geometry._type;

Expand Down Expand Up @@ -1003,7 +1003,7 @@ THREE.VRMLLoader = ( function () {

object = new THREE.Object3D();

// if the geometry field is NULL the object is not drawn
// if the geometry field is NULL or no vertices are defined the object is not drawn

object.visible = false;

Expand Down Expand Up @@ -1353,6 +1353,14 @@ THREE.VRMLLoader = ( function () {

}

if ( coordIndex === undefined ) {

console.warn( 'THREE.VRMLLoader: Missing coordIndex.' );

return new THREE.BufferGeometry(); // handle VRML files with incomplete geometry definition

}

var triangulatedCoordIndex = triangulateFaceIndex( coordIndex, ccw );

var positionAttribute;
Expand All @@ -1364,7 +1372,7 @@ THREE.VRMLLoader = ( function () {

if ( colorPerVertex === true ) {

if ( colorIndex.length > 0 ) {
if ( colorIndex && colorIndex.length > 0 ) {

// if the colorIndex field is not empty, then it is used to choose colors for each vertex of the IndexedFaceSet.

Expand All @@ -1381,7 +1389,7 @@ THREE.VRMLLoader = ( function () {

} else {

if ( colorIndex.length > 0 ) {
if ( colorIndex && colorIndex.length > 0 ) {

// if the colorIndex field is not empty, then they are used to choose one color for each face of the IndexedFaceSet

Expand Down Expand Up @@ -1409,7 +1417,7 @@ THREE.VRMLLoader = ( function () {

// consider vertex normals

if ( normalIndex.length > 0 ) {
if ( normalIndex && normalIndex.length > 0 ) {

// if the normalIndex field is not empty, then it is used to choose normals for each vertex of the IndexedFaceSet.

Expand All @@ -1428,7 +1436,7 @@ THREE.VRMLLoader = ( function () {

// consider face normals

if ( normalIndex.length > 0 ) {
if ( normalIndex && normalIndex.length > 0 ) {

// if the normalIndex field is not empty, then they are used to choose one normal for each face of the IndexedFaceSet

Expand Down Expand Up @@ -1459,7 +1467,7 @@ THREE.VRMLLoader = ( function () {

// texture coordinates are always defined on vertex level

if ( texCoordIndex.length > 0 ) {
if ( texCoordIndex && texCoordIndex.length > 0 ) {

// if the texCoordIndex field is not empty, then it is used to choose texture coordinates for each vertex of the IndexedFaceSet.

Expand Down
22 changes: 15 additions & 7 deletions examples/jsm/loaders/VRMLLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ var VRMLLoader = ( function () {

var object;

if ( geometry ) {
if ( geometry && geometry.attributes.position ) {

var type = geometry._type;

Expand Down Expand Up @@ -1037,7 +1037,7 @@ var VRMLLoader = ( function () {

object = new Object3D();

// if the geometry field is NULL the object is not drawn
// if the geometry field is NULL or no vertices are defined the object is not drawn

object.visible = false;

Expand Down Expand Up @@ -1387,6 +1387,14 @@ var VRMLLoader = ( function () {

}

if ( coordIndex === undefined ) {

console.warn( 'THREE.VRMLLoader: Missing coordIndex.' );

return new BufferGeometry(); // handle VRML files with incomplete geometry definition

}

var triangulatedCoordIndex = triangulateFaceIndex( coordIndex, ccw );

var positionAttribute;
Expand All @@ -1398,7 +1406,7 @@ var VRMLLoader = ( function () {

if ( colorPerVertex === true ) {

if ( colorIndex.length > 0 ) {
if ( colorIndex && colorIndex.length > 0 ) {

// if the colorIndex field is not empty, then it is used to choose colors for each vertex of the IndexedFaceSet.

Expand All @@ -1415,7 +1423,7 @@ var VRMLLoader = ( function () {

} else {

if ( colorIndex.length > 0 ) {
if ( colorIndex && colorIndex.length > 0 ) {

// if the colorIndex field is not empty, then they are used to choose one color for each face of the IndexedFaceSet

Expand Down Expand Up @@ -1443,7 +1451,7 @@ var VRMLLoader = ( function () {

// consider vertex normals

if ( normalIndex.length > 0 ) {
if ( normalIndex && normalIndex.length > 0 ) {

// if the normalIndex field is not empty, then it is used to choose normals for each vertex of the IndexedFaceSet.

Expand All @@ -1462,7 +1470,7 @@ var VRMLLoader = ( function () {

// consider face normals

if ( normalIndex.length > 0 ) {
if ( normalIndex && normalIndex.length > 0 ) {

// if the normalIndex field is not empty, then they are used to choose one normal for each face of the IndexedFaceSet

Expand Down Expand Up @@ -1493,7 +1501,7 @@ var VRMLLoader = ( function () {

// texture coordinates are always defined on vertex level

if ( texCoordIndex.length > 0 ) {
if ( texCoordIndex && texCoordIndex.length > 0 ) {

// if the texCoordIndex field is not empty, then it is used to choose texture coordinates for each vertex of the IndexedFaceSet.

Expand Down