Skip to content
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

Jump to bottom

Pack geometry creation sub-tasks #2365

Merged
merged 1 commit into from
Dec 31, 2014
Merged

Pack geometry creation sub-tasks #2365

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
52 changes: 35 additions & 17 deletions Source/Scene/Primitive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,22 +731,10 @@ define([
for (i = 0; i < length; ++i) {
geometry = instances[i].geometry;
instanceIds.push(instances[i].id);
if (defined(geometry.constructor.pack)) {
var packedLength = defined(geometry.constructor.packedLength) ? geometry.constructor.packedLength : geometry.packedLength;
var array = new Float64Array(packedLength);
geometry.constructor.pack(geometry, array);

subTasks.push({
moduleName : geometry._workerName,
geometry : array,
transferableObjects : [array.buffer]
});
} else {
subTasks.push({
moduleName : geometry._workerName,
geometry : geometry
});
}
subTasks.push({
moduleName : geometry._workerName,
geometry : geometry
});
}

if (!defined(createGeometryTaskProcessors)) {
Expand All @@ -756,11 +744,41 @@ define([
}
}

var subTask;
subTasks = subdivideArray(subTasks, numberOfCreationWorkers);

for (i = 0; i < subTasks.length; i++) {
var packedLength = 0;
var workerSubTasks = subTasks[i];
var workerSubTasksLength = workerSubTasks.length;
for (j = 0; j < workerSubTasksLength; ++j) {
subTask = workerSubTasks[j];
geometry = subTask.geometry;
if (defined(geometry.constructor.pack)) {
subTask.offset = packedLength;
packedLength += defined(geometry.constructor.packedLength) ? geometry.constructor.packedLength : geometry.packedLength;
}
}

var subTaskTransferableObjects;

if (packedLength > 0) {
var array = new Float64Array(packedLength);
subTaskTransferableObjects = [array.buffer];

for (j = 0; j < workerSubTasksLength; ++j) {
subTask = workerSubTasks[j];
geometry = subTask.geometry;
if (defined(geometry.constructor.pack)) {
geometry.constructor.pack(geometry, array, subTask.offset);
subTask.geometry = array;
}
}
}

promises.push(createGeometryTaskProcessors[i].scheduleTask({
subTasks : subTasks[i]
}, subTasks[i].transferableObjects));
}, subTaskTransferableObjects));
}

this._state = PrimitiveState.CREATING;
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createBoxGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
defined) {
"use strict";

return function(boxGeometry) {
if (defined(boxGeometry.buffer)) {
boxGeometry = BoxGeometry.unpack(boxGeometry);
return function(boxGeometry, offset) {
if (defined(offset)) {
boxGeometry = BoxGeometry.unpack(boxGeometry, offset);
}
return BoxGeometry.createGeometry(boxGeometry);
};
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createBoxOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
defined) {
"use strict";

return function(boxGeometry) {
if (defined(boxGeometry.buffer)) {
boxGeometry = BoxOutlineGeometry.unpack(boxGeometry);
return function(boxGeometry, offset) {
if (defined(offset)) {
boxGeometry = BoxOutlineGeometry.unpack(boxGeometry, offset);
}
return BoxOutlineGeometry.createGeometry(boxGeometry);
};
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createCircleGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ define([
Ellipsoid) {
"use strict";

function createCircleGeometry(circleGeometry) {
if (defined(circleGeometry.buffer)) {
circleGeometry = CircleGeometry.unpack(circleGeometry);
function createCircleGeometry(circleGeometry, offset) {
if (defined(offset)) {
circleGeometry = CircleGeometry.unpack(circleGeometry, offset);
}
circleGeometry._ellipseGeometry._center = Cartesian3.clone(circleGeometry._ellipseGeometry._center);
circleGeometry._ellipseGeometry._ellipsoid = Ellipsoid.clone(circleGeometry._ellipseGeometry._ellipsoid);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createCircleOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ define([
Ellipsoid) {
"use strict";

function createCircleOutlineGeometry(circleGeometry) {
if (defined(circleGeometry.buffer)) {
circleGeometry = CircleOutlineGeometry.unpack(circleGeometry);
function createCircleOutlineGeometry(circleGeometry, offset) {
if (defined(offset)) {
circleGeometry = CircleOutlineGeometry.unpack(circleGeometry, offset);
}
circleGeometry._ellipseGeometry._center = Cartesian3.clone(circleGeometry._ellipseGeometry._center);
circleGeometry._ellipseGeometry._ellipsoid = Ellipsoid.clone(circleGeometry._ellipseGeometry._ellipsoid);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createCorridorGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
Ellipsoid) {
"use strict";

function createCorridorGeometry(corridorGeometry) {
if (defined(corridorGeometry.buffer)) {
corridorGeometry = CorridorGeometry.unpack(corridorGeometry);
function createCorridorGeometry(corridorGeometry, offset) {
if (defined(offset)) {
corridorGeometry = CorridorGeometry.unpack(corridorGeometry, offset);
}
corridorGeometry._ellipsoid = Ellipsoid.clone(corridorGeometry._ellipsoid);
return CorridorGeometry.createGeometry(corridorGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createCorridorOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
Ellipsoid) {
"use strict";

function createCorridorOutlineGeometry(corridorOutlineGeometry) {
if (defined(corridorOutlineGeometry.buffer)) {
corridorOutlineGeometry = CorridorOutlineGeometry.unpack(corridorOutlineGeometry);
function createCorridorOutlineGeometry(corridorOutlineGeometry, offset) {
if (defined(offset)) {
corridorOutlineGeometry = CorridorOutlineGeometry.unpack(corridorOutlineGeometry, offset);
}
corridorOutlineGeometry._ellipsoid = Ellipsoid.clone(corridorOutlineGeometry._ellipsoid);
return CorridorOutlineGeometry.createGeometry(corridorOutlineGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createCylinderGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
defined) {
"use strict";

return function(cylinderGeometry) {
if (defined(cylinderGeometry.buffer)) {
cylinderGeometry = CylinderGeometry.unpack(cylinderGeometry);
return function(cylinderGeometry, offset) {
if (defined(offset)) {
cylinderGeometry = CylinderGeometry.unpack(cylinderGeometry, offset);
}
return CylinderGeometry.createGeometry(cylinderGeometry);
};
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createCylinderOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
defined) {
"use strict";

return function(cylinderGeometry) {
if (defined(cylinderGeometry.buffer)) {
cylinderGeometry = CylinderOutlineGeometry.unpack(cylinderGeometry);
return function(cylinderGeometry, offset) {
if (defined(offset)) {
cylinderGeometry = CylinderOutlineGeometry.unpack(cylinderGeometry, offset);
}
return CylinderOutlineGeometry.createGeometry(cylinderGeometry);
};
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createEllipseGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ define([
Ellipsoid) {
"use strict";

function createEllipseGeometry(ellipseGeometry) {
if (defined(ellipseGeometry.buffer)) {
ellipseGeometry = EllipseGeometry.unpack(ellipseGeometry);
function createEllipseGeometry(ellipseGeometry, offset) {
if (defined(offset)) {
ellipseGeometry = EllipseGeometry.unpack(ellipseGeometry, offset);
}
ellipseGeometry._center = Cartesian3.clone(ellipseGeometry._center);
ellipseGeometry._ellipsoid = Ellipsoid.clone(ellipseGeometry._ellipsoid);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createEllipseOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ define([
Ellipsoid) {
"use strict";

function createEllipseOutlineGeometry(ellipseGeometry) {
if (defined(ellipseGeometry.buffer)) {
ellipseGeometry = EllipseOutlineGeometry.unpack(ellipseGeometry);
function createEllipseOutlineGeometry(ellipseGeometry, offset) {
if (defined(offset)) {
ellipseGeometry = EllipseOutlineGeometry.unpack(ellipseGeometry, offset);
}
ellipseGeometry._center = Cartesian3.clone(ellipseGeometry._center);
ellipseGeometry._ellipsoid = Ellipsoid.clone(ellipseGeometry._ellipsoid);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createEllipsoidGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
EllipsoidGeometry) {
"use strict";

return function(ellipsoidGeometry) {
if (defined(ellipsoidGeometry.buffer)) {
ellipsoidGeometry = EllipsoidGeometry.unpack(ellipsoidGeometry);
return function(ellipsoidGeometry, offset) {
if (defined(offset)) {
ellipsoidGeometry = EllipsoidGeometry.unpack(ellipsoidGeometry, offset);
}
return EllipsoidGeometry.createGeometry(ellipsoidGeometry);
};
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createEllipsoidOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
EllipsoidOutlineGeometry) {
"use strict";

return function(ellipsoidGeometry) {
if (defined(ellipsoidGeometry.buffer)) {
ellipsoidGeometry = EllipsoidOutlineGeometry.unpack(ellipsoidGeometry);
return function(ellipsoidGeometry, offset) {
if (defined(ellipsoidGeometry.buffer, offset)) {
ellipsoidGeometry = EllipsoidOutlineGeometry.unpack(ellipsoidGeometry, offset);
}
return EllipsoidOutlineGeometry.createGeometry(ellipsoidGeometry);
};
Expand Down
2 changes: 1 addition & 1 deletion Source/Workers/createGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ define([

if (defined(moduleName)) {
var createFunction = getModule(moduleName);
results.push(createFunction(geometry));
results.push(createFunction(geometry, task.offset));
} else {
//Already created geometry
results.push(geometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createPolygonGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
PolygonGeometry) {
"use strict";

function createPolygonGeometry(polygonGeometry) {
if (defined(polygonGeometry.buffer)) {
polygonGeometry = PolygonGeometry.unpack(polygonGeometry);
function createPolygonGeometry(polygonGeometry, offset) {
if (defined(offset)) {
polygonGeometry = PolygonGeometry.unpack(polygonGeometry, offset);
}
polygonGeometry._ellipsoid = Ellipsoid.clone(polygonGeometry._ellipsoid);
return PolygonGeometry.createGeometry(polygonGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createPolygonOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
PolygonOutlineGeometry) {
"use strict";

function createPolygonOutlineGeometry(polygonGeometry) {
if (defined(polygonGeometry.buffer)) {
polygonGeometry = PolygonOutlineGeometry.unpack(polygonGeometry);
function createPolygonOutlineGeometry(polygonGeometry, offset) {
if (defined(offset)) {
polygonGeometry = PolygonOutlineGeometry.unpack(polygonGeometry, offset);
}
polygonGeometry._ellipsoid = Ellipsoid.clone(polygonGeometry._ellipsoid);
return PolygonOutlineGeometry.createGeometry(polygonGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createPolylineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
PolylineGeometry) {
"use strict";

function createPolylineGeometry(polylineGeometry) {
if (defined(polylineGeometry.buffer)) {
polylineGeometry = PolylineGeometry.unpack(polylineGeometry);
function createPolylineGeometry(polylineGeometry, offset) {
if (defined(offset)) {
polylineGeometry = PolylineGeometry.unpack(polylineGeometry, offset);
}
polylineGeometry._ellipsoid = Ellipsoid.clone(polylineGeometry._ellipsoid);
return PolylineGeometry.createGeometry(polylineGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createPolylineVolumeGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
PolylineVolumeGeometry) {
"use strict";

function createPolylineVolumeGeometry(polylineVolumeGeometry) {
if (defined(polylineVolumeGeometry.buffer)) {
polylineVolumeGeometry = PolylineVolumeGeometry.unpack(polylineVolumeGeometry);
function createPolylineVolumeGeometry(polylineVolumeGeometry, offset) {
if (defined(offset)) {
polylineVolumeGeometry = PolylineVolumeGeometry.unpack(polylineVolumeGeometry, offset);
}
polylineVolumeGeometry._ellipsoid = Ellipsoid.clone(polylineVolumeGeometry._ellipsoid);
return PolylineVolumeGeometry.createGeometry(polylineVolumeGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createPolylineVolumeOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
PolylineVolumeOutlineGeometry) {
"use strict";

function createPolylineVolumeOutlineGeometry(polylineVolumeOutlineGeometry) {
if (defined(polylineVolumeOutlineGeometry.buffer)) {
polylineVolumeOutlineGeometry = PolylineVolumeOutlineGeometry.unpack(polylineVolumeOutlineGeometry);
function createPolylineVolumeOutlineGeometry(polylineVolumeOutlineGeometry, offset) {
if (defined(offset)) {
polylineVolumeOutlineGeometry = PolylineVolumeOutlineGeometry.unpack(polylineVolumeOutlineGeometry, offset);
}
polylineVolumeOutlineGeometry._ellipsoid = Ellipsoid.clone(polylineVolumeOutlineGeometry._ellipsoid);
return PolylineVolumeOutlineGeometry.createGeometry(polylineVolumeOutlineGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createRectangleGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ define([
RectangleGeometry) {
"use strict";

function createRectangleGeometry(rectangleGeometry) {
if (defined(rectangleGeometry.buffer)) {
rectangleGeometry = RectangleGeometry.unpack(rectangleGeometry);
function createRectangleGeometry(rectangleGeometry, offset) {
if (defined(offset)) {
rectangleGeometry = RectangleGeometry.unpack(rectangleGeometry, offset);
}
rectangleGeometry._ellipsoid = Ellipsoid.clone(rectangleGeometry._ellipsoid);
rectangleGeometry._rectangle = Rectangle.clone(rectangleGeometry._rectangle);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createRectangleOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ define([
RectangleOutlineGeometry) {
"use strict";

function createRectangleOutlineGeometry(rectangleGeometry) {
if (defined(rectangleGeometry.buffer)) {
rectangleGeometry = RectangleOutlineGeometry.unpack(rectangleGeometry);
function createRectangleOutlineGeometry(rectangleGeometry, offset) {
if (defined(offset)) {
rectangleGeometry = RectangleOutlineGeometry.unpack(rectangleGeometry, offset);
}
rectangleGeometry._ellipsoid = Ellipsoid.clone(rectangleGeometry._ellipsoid);
rectangleGeometry._rectangle = Rectangle.clone(rectangleGeometry._rectangle);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createSimplePolylineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
SimplePolylineGeometry) {
"use strict";

function createSimplePolylineGeometry(simplePolylineGeometry) {
if (defined(simplePolylineGeometry.buffer)) {
simplePolylineGeometry = SimplePolylineGeometry.unpack(simplePolylineGeometry);
function createSimplePolylineGeometry(simplePolylineGeometry, offset) {
if (defined(offset)) {
simplePolylineGeometry = SimplePolylineGeometry.unpack(simplePolylineGeometry, offset);
}
simplePolylineGeometry._ellipsoid = Ellipsoid.clone(simplePolylineGeometry._ellipsoid);
return SimplePolylineGeometry.createGeometry(simplePolylineGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createSphereGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
SphereGeometry) {
"use strict";

return function(sphereGeometry) {
if (defined(sphereGeometry.buffer)) {
sphereGeometry = SphereGeometry.unpack(sphereGeometry);
return function(sphereGeometry, offset) {
if (defined(offset)) {
sphereGeometry = SphereGeometry.unpack(sphereGeometry, offset);
}
return SphereGeometry.createGeometry(sphereGeometry);
};
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createSphereOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ define([
SphereOutlineGeometry) {
"use strict";

return function(sphereGeometry) {
if (defined(sphereGeometry.buffer)) {
sphereGeometry = SphereOutlineGeometry.unpack(sphereGeometry);
return function(sphereGeometry, offset) {
if (defined(offset)) {
sphereGeometry = SphereOutlineGeometry.unpack(sphereGeometry, offset);
}
return SphereOutlineGeometry.createGeometry(sphereGeometry);
};
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createWallGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
WallGeometry) {
"use strict";

function createWallGeometry(wallGeometry) {
if (defined(wallGeometry.buffer)) {
wallGeometry = WallGeometry.unpack(wallGeometry);
function createWallGeometry(wallGeometry, offset) {
if (defined(offset)) {
wallGeometry = WallGeometry.unpack(wallGeometry, offset);
}
wallGeometry._ellipsoid = Ellipsoid.clone(wallGeometry._ellipsoid);
return WallGeometry.createGeometry(wallGeometry);
Expand Down
6 changes: 3 additions & 3 deletions Source/Workers/createWallOutlineGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ define([
WallOutlineGeometry) {
"use strict";

function createWallOutlineGeometry(wallGeometry) {
if (defined(wallGeometry.buffer)) {
wallGeometry = WallOutlineGeometry.unpack(wallGeometry);
function createWallOutlineGeometry(wallGeometry, offset) {
if (defined(offset)) {
wallGeometry = WallOutlineGeometry.unpack(wallGeometry, offset);
}
wallGeometry._ellipsoid = Ellipsoid.clone(wallGeometry._ellipsoid);
return WallOutlineGeometry.createGeometry(wallGeometry);
Expand Down