Remove the create*Geometry workers. Require geometries to implement p…

…ackable and have a createGeometry function.
CesiumGS · Jan 5, 2015 · 4073f38 · 4073f38
1 parent e5d3f39
commit 4073f38
Show file tree

Hide file tree

Showing 50 changed files with 63 additions and 558 deletions.
diff --git a/Source/Core/BoxGeometry.js b/Source/Core/BoxGeometry.js
@@ -52,7 +52,7 @@ define([
      * });
      * var geometry = Cesium.BoxGeometry.createGeometry(box);
      */
-    var BoxGeometry = function(options) {
+    function BoxGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var min = options.minimumCorner;
         var max = options.maximumCorner;
@@ -71,8 +71,7 @@ define([
         this._minimumCorner = Cartesian3.clone(min);
         this._maximumCorner = Cartesian3.clone(max);
         this._vertexFormat = vertexFormat;
-        this._workerName = 'createBoxGeometry';
-    };
+    }
 
     /**
      * Creates a cube centered at the origin given its dimensions.

diff --git a/Source/Core/BoxOutlineGeometry.js b/Source/Core/BoxOutlineGeometry.js
@@ -47,7 +47,7 @@ define([
      * });
      * var geometry = Cesium.BoxOutlineGeometry.createGeometry(box);
      */
-    var BoxOutlineGeometry = function(options) {
+    function BoxOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var min = options.minimumCorner;
@@ -64,8 +64,7 @@ define([
 
         this._min = Cartesian3.clone(min);
         this._max = Cartesian3.clone(max);
-        this._workerName = 'createBoxOutlineGeometry';
-    };
+    }
 
     /**
      * Creates an outline of a cube centered at the origin given its dimensions.

diff --git a/Source/Core/CircleGeometry.js b/Source/Core/CircleGeometry.js
@@ -49,7 +49,7 @@ define([
      * });
      * var geometry = Cesium.CircleGeometry.createGeometry(circle);
      */
-    var CircleGeometry = function(options) {
+    function CircleGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var radius = options.radius;
 
@@ -74,8 +74,7 @@ define([
             stRotation : options.stRotation
         };
         this._ellipseGeometry = new EllipseGeometry(ellipseGeometryOptions);
-        this._workerName = 'createCircleGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/CircleOutlineGeometry.js b/Source/Core/CircleOutlineGeometry.js
@@ -46,7 +46,7 @@ define([
      * });
      * var geometry = Cesium.CircleOutlineGeometry.createGeometry(circle);
      */
-    var CircleOutlineGeometry = function(options) {
+    function CircleOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var radius = options.radius;
 
@@ -70,8 +70,7 @@ define([
             numberOfVerticalLines : options.numberOfVerticalLines
         };
         this._ellipseGeometry = new EllipseOutlineGeometry(ellipseGeometryOptions);
-        this._workerName = 'createCircleOutlineGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/CorridorGeometry.js b/Source/Core/CorridorGeometry.js
@@ -648,7 +648,7 @@ define([
      *   width : 100000
      * });
      */
-    var CorridorGeometry = function(options) {
+    function CorridorGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var positions = options.positions;
         var width = options.width;
@@ -670,14 +670,13 @@ define([
         this._extrudedHeight = defaultValue(options.extrudedHeight, this._height);
         this._cornerType = defaultValue(options.cornerType, CornerType.ROUNDED);
         this._granularity = defaultValue(options.granularity, CesiumMath.RADIANS_PER_DEGREE);
-        this._workerName = 'createCorridorGeometry';
 
         /**
          * The number of elements used to pack the object into an array.
          * @type {Number}
          */
         this.packedLength = 1 + positions.length * Cartesian3.packedLength + Ellipsoid.packedLength + VertexFormat.packedLength + 5;
-    };
+    }
 
     /**
      * Stores the provided instance into the provided array.

diff --git a/Source/Core/CorridorOutlineGeometry.js b/Source/Core/CorridorOutlineGeometry.js
@@ -325,7 +325,7 @@ define([
      *   width : 100000
      * });
      */
-    var CorridorOutlineGeometry = function(options) {
+    function CorridorOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var positions = options.positions;
         var width = options.width;
@@ -346,14 +346,13 @@ define([
         this._extrudedHeight = defaultValue(options.extrudedHeight, this._height);
         this._cornerType = defaultValue(options.cornerType, CornerType.ROUNDED);
         this._granularity = defaultValue(options.granularity, CesiumMath.RADIANS_PER_DEGREE);
-        this._workerName = 'createCorridorOutlineGeometry';
 
         /**
          * The number of elements used to pack the object into an array.
          * @type {Number}
          */
         this.packedLength = 1 + positions.length * Cartesian3.packedLength + Ellipsoid.packedLength + 5;
-    };
+    }
 
     /**
      * Stores the provided instance into the provided array.

diff --git a/Source/Core/CylinderGeometry.js b/Source/Core/CylinderGeometry.js
@@ -72,7 +72,7 @@ define([
      * });
      * var geometry = Cesium.CylinderGeometry.createGeometry(cylinder);
      */
-    var CylinderGeometry = function(options) {
+    function CylinderGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var length = options.length;
@@ -104,8 +104,7 @@ define([
         this._bottomRadius = bottomRadius;
         this._vertexFormat = VertexFormat.clone(vertexFormat);
         this._slices = slices;
-        this._workerName = 'createCylinderGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/CylinderOutlineGeometry.js b/Source/Core/CylinderOutlineGeometry.js
@@ -63,7 +63,7 @@ define([
      * });
      * var geometry = Cesium.CylinderOutlineGeometry.createGeometry(cylinder);
      */
-    var CylinderOutlineGeometry = function(options) {
+    function CylinderOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var length = options.length;
@@ -95,8 +95,7 @@ define([
         this._bottomRadius = bottomRadius;
         this._slices = slices;
         this._numberOfVerticalLines = numberOfVerticalLines;
-        this._workerName = 'createCylinderOutlineGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/EllipseGeometry.js b/Source/Core/EllipseGeometry.js
@@ -586,7 +586,7 @@ define([
      * });
      * var geometry = Cesium.EllipseGeometry.createGeometry(ellipse);
      */
-    var EllipseGeometry = function(options) {
+    function EllipseGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var center = options.center;
@@ -631,8 +631,7 @@ define([
         this._vertexFormat = VertexFormat.clone(vertexFormat);
         this._extrudedHeight = defaultValue(extrudedHeight, height);
         this._extrude = extrude;
-        this._workerName = 'createEllipseGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/EllipseOutlineGeometry.js b/Source/Core/EllipseOutlineGeometry.js
@@ -161,7 +161,7 @@ define([
      * });
      * var geometry = Cesium.EllipseOutlineGeometry.createGeometry(ellipse);
      */
-    var EllipseOutlineGeometry = function(options) {
+    function EllipseOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var center = options.center;
@@ -204,8 +204,7 @@ define([
         this._extrudedHeight = defaultValue(extrudedHeight, 0.0);
         this._extrude = extrude;
         this._numberOfVerticalLines = Math.max(defaultValue(options.numberOfVerticalLines, 16), 0);
-        this._workerName = 'createEllipseOutlineGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/EllipsoidGeometry.js b/Source/Core/EllipsoidGeometry.js
@@ -69,7 +69,7 @@ define([
      * });
      * var geometry = Cesium.EllipsoidGeometry.createGeometry(ellipsoid);
      */
-    var EllipsoidGeometry = function(options) {
+    function EllipsoidGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var radii = defaultValue(options.radii, defaultRadii);
@@ -90,8 +90,7 @@ define([
         this._stackPartitions = stackPartitions;
         this._slicePartitions = slicePartitions;
         this._vertexFormat = VertexFormat.clone(vertexFormat);
-        this._workerName = 'createEllipsoidGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/EllipsoidOutlineGeometry.js b/Source/Core/EllipsoidOutlineGeometry.js
@@ -59,7 +59,7 @@ define([
      * });
      * var geometry = Cesium.EllipsoidOutlineGeometry.createGeometry(ellipsoid);
      */
-    var EllipsoidOutlineGeometry = function(options) {
+    function EllipsoidOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var radii = defaultValue(options.radii, defaultRadii);
@@ -83,8 +83,7 @@ define([
         this._stackPartitions = stackPartitions;
         this._slicePartitions = slicePartitions;
         this._subdivisions = subdivisions;
-        this._workerName = 'createEllipsoidOutlineGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.

diff --git a/Source/Core/PolygonGeometry.js b/Source/Core/PolygonGeometry.js
@@ -603,7 +603,7 @@ define([
      * });
      * var geometry = Cesium.PolygonGeometry.createGeometry(extrudedPolygon);
      */
-    var PolygonGeometry = function(options) {
+    function PolygonGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var vertexFormat = defaultValue(options.vertexFormat, VertexFormat.DEFAULT);
@@ -637,14 +637,13 @@ define([
         this._extrude = extrude;
         this._polygonHierarchy = polygonHierarchy;
         this._perPositionHeight = perPositionHeight;
-        this._workerName = 'createPolygonGeometry';
 
         /**
          * The number of elements used to pack the object into an array.
          * @type {Number}
          */
         this.packedLength = PolygonGeometryLibrary.computeHierarchyPackedLength(polygonHierarchy) + Ellipsoid.packedLength + VertexFormat.packedLength + 6;
-    };
+    }
 
     /**
      * A description of a polygon from an array of positions.

diff --git a/Source/Core/PolygonOutlineGeometry.js b/Source/Core/PolygonOutlineGeometry.js
@@ -298,7 +298,7 @@ define([
      * });
      * var geometry = Cesium.PolygonOutlineGeometry.createGeometry(extrudedPolygon);
      */
-    var PolygonOutlineGeometry = function(options) {
+    function PolygonOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84);
@@ -328,14 +328,13 @@ define([
         this._extrude = extrude;
         this._polygonHierarchy = polygonHierarchy;
         this._perPositionHeight = perPositionHeight;
-        this._workerName = 'createPolygonOutlineGeometry';
 
         /**
          * The number of elements used to pack the object into an array.
          * @type {Number}
          */
         this.packedLength = PolygonGeometryLibrary.computeHierarchyPackedLength(polygonHierarchy) + Ellipsoid.packedLength + 5;
-    };
+    }
 
     /**
      * Stores the provided instance into the provided array.

diff --git a/Source/Core/PolylineGeometry.js b/Source/Core/PolylineGeometry.js
@@ -110,7 +110,7 @@ define([
      * });
      * var geometry = Cesium.PolylineGeometry.createGeometry(polyline);
      */
-    var PolylineGeometry = function(options) {
+    function PolylineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var positions = options.positions;
         var colors = options.colors;
@@ -137,7 +137,6 @@ define([
         this._followSurface = defaultValue(options.followSurface, true);
         this._granularity = defaultValue(options.granularity, CesiumMath.RADIANS_PER_DEGREE);
         this._ellipsoid = Ellipsoid.clone(defaultValue(options.ellipsoid, Ellipsoid.WGS84));
-        this._workerName = 'createPolylineGeometry';
 
         var numComponents = 1 + positions.length * Cartesian3.packedLength;
         numComponents += defined(colors) ? 1 + colors.length * Color.packedLength : 1;
@@ -147,7 +146,7 @@ define([
          * @type {Number}
          */
         this.packedLength = numComponents + Ellipsoid.packedLength + VertexFormat.packedLength + 4;
-    };
+    }
 
     /**
      * Stores the provided instance into the provided array.

diff --git a/Source/Core/PolylineVolumeGeometry.js b/Source/Core/PolylineVolumeGeometry.js
@@ -213,7 +213,7 @@ define([
      *   shapePositions : computeCircle(100000.0)
      * });
      */
-    var PolylineVolumeGeometry = function(options) {
+    function PolylineVolumeGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var positions = options.polylinePositions;
         var shape = options.shapePositions;
@@ -233,7 +233,6 @@ define([
         this._cornerType = defaultValue(options.cornerType, CornerType.ROUNDED);
         this._vertexFormat = VertexFormat.clone(defaultValue(options.vertexFormat, VertexFormat.DEFAULT));
         this._granularity = defaultValue(options.granularity, CesiumMath.RADIANS_PER_DEGREE);
-        this._workerName = 'createPolylineVolumeGeometry';
 
         var numComponents = 1 + positions.length * Cartesian3.packedLength;
         numComponents += 1 + shape.length * Cartesian2.packedLength;
@@ -243,7 +242,7 @@ define([
          * @type {Number}
          */
         this.packedLength = numComponents + Ellipsoid.packedLength + VertexFormat.packedLength + 2;
-    };
+    }
 
     /**
      * Stores the provided instance into the provided array.

diff --git a/Source/Core/PolylineVolumeOutlineGeometry.js b/Source/Core/PolylineVolumeOutlineGeometry.js
@@ -128,7 +128,7 @@ define([
      *   shapePositions : computeCircle(100000.0)
      * });
      */
-    var PolylineVolumeOutlineGeometry = function(options) {
+    function PolylineVolumeOutlineGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
         var positions = options.polylinePositions;
         var shape = options.shapePositions;
@@ -147,7 +147,6 @@ define([
         this._ellipsoid = Ellipsoid.clone(defaultValue(options.ellipsoid, Ellipsoid.WGS84));
         this._cornerType = defaultValue(options.cornerType, CornerType.ROUNDED);
         this._granularity = defaultValue(options.granularity, CesiumMath.RADIANS_PER_DEGREE);
-        this._workerName = 'createPolylineVolumeOutlineGeometry';
 
         var numComponents = 1 + positions.length * Cartesian3.packedLength;
         numComponents += 1 + shape.length * Cartesian2.packedLength;
@@ -157,7 +156,7 @@ define([
          * @type {Number}
          */
         this.packedLength = numComponents + Ellipsoid.packedLength + 2;
-    };
+    }
 
     /**
      * Stores the provided instance into the provided array.

diff --git a/Source/Core/RectangleGeometry.js b/Source/Core/RectangleGeometry.js
@@ -543,7 +543,7 @@ define([
      * });
      * var geometry = Cesium.RectangleGeometry.createGeometry(rectangle);
      */
-    var RectangleGeometry = function(options) {
+    function RectangleGeometry(options) {
         options = defaultValue(options, defaultValue.EMPTY_OBJECT);
 
         var rectangle = options.rectangle;
@@ -579,8 +579,7 @@ define([
         this._extrude = extrude;
         this._closeTop = closeTop;
         this._closeBottom = closeBottom;
-        this._workerName = 'createRectangleGeometry';
-    };
+    }
 
     /**
      * The number of elements used to pack the object into an array.