ObjectLoader: Moved json handling to geometries (mrdoob#22040)

* ObjectLoader: Moved json handling to geometries * ObjectLoader: Fixed data.type switch * ObjectLoader: Moved out TubeGeometry json handling. * ObjectLoader: Moved out ExtrudeGeometry and ShapeGeometry json handling
marcopaivaf · Jun 24, 2021 · 9517d2e · 9517d2e
1 parent 4f5236a
commit 9517d2e
Show file tree

Hide file tree

Showing 19 changed files with 155 additions and 234 deletions.
diff --git a/src/geometries/BoxGeometry.js b/src/geometries/BoxGeometry.js
@@ -159,6 +159,12 @@ class BoxGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new BoxGeometry( data.width, data.height, data.depth, data.widthSegments, data.heightSegments, data.depthSegments );
+
+	}
+
 }
 
 export { BoxGeometry, BoxGeometry as BoxBufferGeometry };
diff --git a/src/geometries/CircleGeometry.js b/src/geometries/CircleGeometry.js
@@ -79,6 +79,12 @@ class CircleGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new CircleGeometry( data.radius, data.segments, data.thetaStart, data.thetaLength );
+
+	}
+
 }
 
 

diff --git a/src/geometries/ConeGeometry.js b/src/geometries/ConeGeometry.js
@@ -20,6 +20,12 @@ class ConeGeometry extends CylinderGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new ConeGeometry( data.radius, data.height, data.radialSegments, data.heightSegments, data.openEnded, data.thetaStart, data.thetaLength );
+
+	}
+
 }
 
 export { ConeGeometry, ConeGeometry as ConeBufferGeometry };
diff --git a/src/geometries/CylinderGeometry.js b/src/geometries/CylinderGeometry.js
@@ -263,6 +263,12 @@ class CylinderGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new CylinderGeometry( data.radiusTop, data.radiusBottom, data.height, data.radialSegments, data.heightSegments, data.openEnded, data.thetaStart, data.thetaLength );
+
+	}
+
 }
 
 

diff --git a/src/geometries/DodecahedronGeometry.js b/src/geometries/DodecahedronGeometry.js
@@ -54,6 +54,12 @@ class DodecahedronGeometry extends PolyhedronGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new DodecahedronGeometry( data.radius, data.detail );
+
+	}
+
 }
 
 

diff --git a/src/geometries/ExtrudeGeometry.js b/src/geometries/ExtrudeGeometry.js
@@ -22,6 +22,7 @@
 
 import { BufferGeometry } from '../core/BufferGeometry.js';
 import { Float32BufferAttribute } from '../core/BufferAttribute.js';
+import * as Curves from '../extras/curves/Curves.js';
 import { Vector2 } from '../math/Vector2.js';
 import { Vector3 } from '../math/Vector3.js';
 import { ShapeUtils } from '../extras/ShapeUtils.js';
@@ -695,6 +696,30 @@ class ExtrudeGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data, shapes ) {
+
+		const geometryShapes = [];
+
+		for ( let j = 0, jl = data.shapes.length; j < jl; j ++ ) {
+
+			const shape = shapes[ data.shapes[ j ] ];
+
+			geometryShapes.push( shape );
+
+		}
+
+		const extrudePath = data.options.extrudePath;
+
+		if ( extrudePath !== undefined ) {
+
+			data.options.extrudePath = new Curves[ extrudePath.type ]().fromJSON( extrudePath );
+
+		}
+
+		return new ExtrudeGeometry( geometryShapes, data.options );
+
+	}
+
 }
 
 const WorldUVGenerator = {

diff --git a/src/geometries/IcosahedronGeometry.js b/src/geometries/IcosahedronGeometry.js
@@ -30,6 +30,12 @@ class IcosahedronGeometry extends PolyhedronGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new IcosahedronGeometry( data.radius, data.detail );
+
+	}
+
 }
 
 

diff --git a/src/geometries/LatheGeometry.js b/src/geometries/LatheGeometry.js
@@ -144,6 +144,12 @@ class LatheGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new LatheGeometry( data.points, data.segments, data.phiStart, data.phiLength );
+
+	}
+
 }
 
 

diff --git a/src/geometries/OctahedronGeometry.js b/src/geometries/OctahedronGeometry.js
@@ -26,6 +26,12 @@ class OctahedronGeometry extends PolyhedronGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new OctahedronGeometry( data.radius, data.detail );
+
+	}
+
 }
 
 export { OctahedronGeometry, OctahedronGeometry as OctahedronBufferGeometry };
diff --git a/src/geometries/PlaneGeometry.js b/src/geometries/PlaneGeometry.js
@@ -76,6 +76,12 @@ class PlaneGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new PlaneGeometry( data.width, data.height, data.widthSegments, data.heightSegments );
+
+	}
+
 }
 
 export { PlaneGeometry, PlaneGeometry as PlaneBufferGeometry };
diff --git a/src/geometries/PolyhedronGeometry.js b/src/geometries/PolyhedronGeometry.js
@@ -298,6 +298,12 @@ class PolyhedronGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new PolyhedronGeometry( data.vertices, data.indices, data.radius, data.details );
+
+	}
+
 }
 
 export { PolyhedronGeometry, PolyhedronGeometry as PolyhedronBufferGeometry };
diff --git a/src/geometries/RingGeometry.js b/src/geometries/RingGeometry.js
@@ -106,6 +106,12 @@ class RingGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new RingGeometry( data.innerRadius, data.outerRadius, data.thetaSegments, data.phiSegments, data.thetaStart, data.thetaLength );
+
+	}
+
 }
 
 

diff --git a/src/geometries/ShapeGeometry.js b/src/geometries/ShapeGeometry.js
@@ -137,6 +137,22 @@ class ShapeGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data, shapes ) {
+
+		const geometryShapes = [];
+
+		for ( let j = 0, jl = data.shapes.length; j < jl; j ++ ) {
+
+			const shape = shapes[ data.shapes[ j ] ];
+
+			geometryShapes.push( shape );
+
+		}
+
+		return new ShapeGeometry( geometryShapes, data.curveSegments );
+
+	}
+
 }
 
 function toJSON( shapes, data ) {

diff --git a/src/geometries/SphereGeometry.js b/src/geometries/SphereGeometry.js
@@ -115,6 +115,12 @@ class SphereGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new SphereGeometry( data.radius, data.widthSegments, data.heightSegments, data.phiStart, data.phiLength, data.thetaStart, data.thetaLength );
+
+	}
+
 }
 
 export { SphereGeometry, SphereGeometry as SphereBufferGeometry };
diff --git a/src/geometries/TetrahedronGeometry.js b/src/geometries/TetrahedronGeometry.js
@@ -23,6 +23,12 @@ class TetrahedronGeometry extends PolyhedronGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new TetrahedronGeometry( data.radius, data.detail );
+
+	}
+
 }
 
 export { TetrahedronGeometry, TetrahedronGeometry as TetrahedronBufferGeometry };
diff --git a/src/geometries/TorusGeometry.js b/src/geometries/TorusGeometry.js
@@ -98,6 +98,12 @@ class TorusGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new TorusGeometry( data.radius, data.tube, data.radialSegments, data.tubularSegments, data.arc );
+
+	}
+
 }
 
 export { TorusGeometry, TorusGeometry as TorusBufferGeometry };
diff --git a/src/geometries/TorusKnotGeometry.js b/src/geometries/TorusKnotGeometry.js
@@ -145,6 +145,12 @@ class TorusKnotGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		return new TorusKnotGeometry( data.radius, data.tube, data.tubularSegments, data.radialSegments, data.p, data.q );
+
+	}
+
 }
 
 export { TorusKnotGeometry, TorusKnotGeometry as TorusKnotBufferGeometry };
diff --git a/src/geometries/TubeGeometry.js b/src/geometries/TubeGeometry.js
@@ -1,5 +1,6 @@
 import { BufferGeometry } from '../core/BufferGeometry.js';
 import { Float32BufferAttribute } from '../core/BufferAttribute.js';
+import * as Curves from '../extras/curves/Curves.js';
 import { Vector2 } from '../math/Vector2.js';
 import { Vector3 } from '../math/Vector3.js';
 
@@ -171,6 +172,20 @@ class TubeGeometry extends BufferGeometry {
 
 	}
 
+	static fromJSON( data ) {
+
+		// This only works for built-in curves (e.g. CatmullRomCurve3).
+		// User defined curves or instances of CurvePath will not be deserialized.
+		return new TubeGeometry(
+			new Curves[ data.path.type ]().fromJSON( data.path ),
+			data.tubularSegments,
+			data.radius,
+			data.radialSegments,
+			data.closed
+		);
+
+	}
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,12 @@ class CircleGeometry extends BufferGeometry { @@
     	}
+    	static fromJSON( data ) {
+    		return new CircleGeometry( data.radius, data.segments, data.thetaStart, data.thetaLength );
+    	}
     }
@@ Expand Down @@