Browse Source

Revert "Allow tube geometry to be serialized and loaded"

This reverts commit f7253b08c11fbce2962f5fec354a3e3927cd4d95.
Temdog007 6 years ago
parent
commit
dac691af50
3 changed files with 2 additions and 41 deletions
  1. 1 14
      src/core/BufferGeometry.js
  2. 1 14
      src/core/Geometry.js
  3. 0 13
      src/loaders/ObjectLoader.js

+ 1 - 14
src/core/BufferGeometry.js

@@ -960,20 +960,7 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
 
 			for ( var key in parameters ) {
 
-				var value = parameters[ key ];
-				if ( value !== undefined ) {
-
-					if ( value.toJSON ) {
-
-						data[ key ] = value.toJSON();
-
-					} else {
-
-						data[ key ] = value;
-
-					}
-
-				}
+				if ( parameters[ key ] !== undefined ) data[ key ] = parameters[ key ];
 
 			}
 

+ 1 - 14
src/core/Geometry.js

@@ -988,20 +988,7 @@ Geometry.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
 
 			for ( var key in parameters ) {
 
-				var value = parameters[ key ];
-				if ( value !== undefined ) {
-
-					if ( value.toJSON ) {
-
-						data[ key ] = value.toJSON();
-
-					} else {
-
-						data[ key ] = value;
-
-					}
-
-				}
+				if ( parameters[ key ] !== undefined ) data[ key ] = parameters[ key ];
 
 			}
 

+ 0 - 13
src/loaders/ObjectLoader.js

@@ -327,19 +327,6 @@ Object.assign( ObjectLoader.prototype, {
 
 						break;
 
-					case 'TubeGeometry':
-					case 'TubeBufferGeometry':
-
-						geometry = new Geometries[ data.type ](
-							new Curves[ data.path.type ]().fromJSON( data.path ),
-							data.tubularSegments,
-							data.radius,
-							data.radialSegments,
-							data.closed
-						);
-
-						break;
-
 					case 'TorusKnotGeometry':
 					case 'TorusKnotBufferGeometry':