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

Add offset attribute to box, cylinder and ellipsoid #6931

Merged
merged 2 commits into from
Aug 17, 2018
Merged

Add offset attribute to box, cylinder and ellipsoid #6931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9112b62
add offset attribute to box, cylinder and ellipsoid
Aug 17, 2018
d6c23ee
Whitespace.
bagnell Aug 17, 2018
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
209 changes: 209 additions & 0 deletions Apps/Sandcastle/gallery/development/Geometry Offset Attribute box cylinder ellipsoid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="description" content="Draw a rectangle on the globe surface">
<meta name="cesium-sandcastle-labels" content="Development">
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
<script type="text/javascript">
if(typeof require === 'function') {
require.config({
baseUrl : '../../../Source',
waitSeconds : 120
});
}
</script>
</head>
<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
<style>
@import url(../templates/bucket.css);
</style>
<div id="cesiumContainer" class="fullSize"></div>
<div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbar"></div>
<script id="cesium_sandcastle_script">
function startup(Cesium) {
'use strict';
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer');
viewer.extend(Cesium.viewerCesiumInspectorMixin);
var scene = viewer.scene;
var ellipsoid = scene.globe.ellipsoid;

var id1 = '1';
var id2 = '2';
var id3 = '3';

var center1 = Cesium.Cartesian3.fromDegrees(-110, 30);
var offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center1), 100000, new Cesium.Cartesian3());
var dimensions = new Cesium.Cartesian3(400000.0, 300000.0, 500000.0);
var boxModelMatrix = Cesium.Matrix4.multiplyByTranslation(
Cesium.Transforms.eastNorthUpToFixedFrame(center1),
new Cesium.Cartesian3(0.0, 0.0, dimensions.z * 0.5), new Cesium.Matrix4());

var i1 = new Cesium.GeometryInstance({
id: id1,
geometry : Cesium.BoxGeometry.fromDimensions({
vertexFormat : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
dimensions : dimensions,
offsetAttribute: Cesium.GeometryOffsetAttribute.ALL
}),
modelMatrix : boxModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(new Cesium.Color(1.0, 0.0, 0.0, 0.5)),
offset: Cesium.OffsetGeometryInstanceAttribute.fromCartesian3(offset)
}
});

var o1 = new Cesium.GeometryInstance({
id: id1,
geometry : Cesium.BoxOutlineGeometry.fromDimensions({
dimensions : dimensions,
offsetAttribute: Cesium.GeometryOffsetAttribute.ALL
}),
modelMatrix : boxModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.WHITE),
offset: Cesium.OffsetGeometryInstanceAttribute.fromCartesian3(offset)
}
});

var center2 = Cesium.Cartesian3.fromDegrees(-100, 30);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center2), 100000, new Cesium.Cartesian3());
var length = 400000.0;
var topRad = 200000.0;
var bottomRad = 200000.0;
var cylinderModelMatrix = Cesium.Matrix4.multiplyByTranslation(
Cesium.Transforms.eastNorthUpToFixedFrame(center2),
new Cesium.Cartesian3(0.0, 0.0, length * 0.5), new Cesium.Matrix4()
);

var i2 = new Cesium.GeometryInstance({
id: id2,
geometry : new Cesium.CylinderGeometry({
length : length,
topRadius : topRad,
bottomRadius : 200000.0,
vertexFormat : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
offsetAttribute: Cesium.GeometryOffsetAttribute.ALL
}),
modelMatrix : cylinderModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(new Cesium.Color(1.0, 0.0, 0.0, 0.5)),
offset: Cesium.OffsetGeometryInstanceAttribute.fromCartesian3(offset)
}
});

var o2 = new Cesium.GeometryInstance({
id: id2,
geometry : new Cesium.CylinderOutlineGeometry({
length : length,
topRadius : topRad,
bottomRadius : 200000.0,
numberOfVerticalLines: 16,
offsetAttribute: Cesium.GeometryOffsetAttribute.ALL
}),
modelMatrix : cylinderModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.WHITE),
offset: Cesium.OffsetGeometryInstanceAttribute.fromCartesian3(offset)
}
});

var center3 = Cesium.Cartesian3.fromDegrees(-90, 30);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center3), 100000, new Cesium.Cartesian3());
var radii = new Cesium.Cartesian3(200000.0, 200000.0, 300000.0);
var ellipsoidModelMatrix = Cesium.Matrix4.multiplyByTranslation(
Cesium.Transforms.eastNorthUpToFixedFrame(center3),
new Cesium.Cartesian3(0.0, 0.0, radii.z), new Cesium.Matrix4()
);
var i3 = new Cesium.GeometryInstance({
id: id3,
geometry : new Cesium.EllipsoidGeometry({
vertexFormat : Cesium.PerInstanceColorAppearance.VERTEX_FORMAT,
radii : radii,
offsetAttribute: Cesium.GeometryOffsetAttribute.ALL
}),
modelMatrix : ellipsoidModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(new Cesium.Color(1.0, 0.0, 0.0, 0.5)),
offset: Cesium.OffsetGeometryInstanceAttribute.fromCartesian3(offset)
}
});
var o3 = new Cesium.GeometryInstance({
id: id3,
geometry : new Cesium.EllipsoidOutlineGeometry({
radii : radii,
stackPartitions : 16,
slicePartitions : 8,
offsetAttribute: Cesium.GeometryOffsetAttribute.ALL
}),
modelMatrix : ellipsoidModelMatrix,
attributes : {
color : Cesium.ColorGeometryInstanceAttribute.fromColor(Cesium.Color.WHITE),
offset: Cesium.OffsetGeometryInstanceAttribute.fromCartesian3(offset)
}
});

var p = scene.primitives.add(new Cesium.Primitive({
geometryInstances : [i1, i2, i3],
appearance : new Cesium.PerInstanceColorAppearance({
closed : true
}),
asynchronous : false
}));
var o = scene.primitives.add(new Cesium.Primitive({
geometryInstances : [o1, o2, o3],
appearance : new Cesium.PerInstanceColorAppearance({
flat : true,
renderState : {
lineWidth : Math.min(2.0, scene.maximumAliasedLineWidth)
}
}),
asynchronous : false
}));

Sandcastle.addToolbarButton('Move box', function() {
var attributes = p.getGeometryInstanceAttributes(id1);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center1), 150000, new Cesium.Cartesian3());
attributes.offset = Cesium.OffsetGeometryInstanceAttribute.toValue(offset, attributes.offset);

attributes = o.getGeometryInstanceAttributes(id1);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center1), 150000, new Cesium.Cartesian3());
attributes.offset = Cesium.OffsetGeometryInstanceAttribute.toValue(offset, attributes.offset);
});

Sandcastle.addToolbarButton('Move Cylinder', function() {
var attributes = p.getGeometryInstanceAttributes(id2);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center2), 150000, new Cesium.Cartesian3());
attributes.offset = Cesium.OffsetGeometryInstanceAttribute.toValue(offset, attributes.offset);

attributes = o.getGeometryInstanceAttributes(id2);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center2), 150000, new Cesium.Cartesian3());
attributes.offset = Cesium.OffsetGeometryInstanceAttribute.toValue(offset, attributes.offset);
});

Sandcastle.addToolbarButton('Move ellipsoid', function() {
var attributes = p.getGeometryInstanceAttributes(id3);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center3), 150000, new Cesium.Cartesian3());
attributes.offset = Cesium.OffsetGeometryInstanceAttribute.toValue(offset, attributes.offset);

attributes = o.getGeometryInstanceAttributes(id3);
offset = Cesium.Cartesian3.multiplyByScalar(ellipsoid.geodeticSurfaceNormal(center3), 150000, new Cesium.Cartesian3());
attributes.offset = Cesium.OffsetGeometryInstanceAttribute.toValue(offset, attributes.offset);
});
//Sandcastle_End
Sandcastle.finishedLoading();
}
if (typeof Cesium !== 'undefined') {
startup(Cesium);
} else if (typeof require === 'function') {
require(['Cesium'], startup);
}
</script>
</body>
</html>
Binary file added ...castle/gallery/development/Geometry Offset Attribute box cylinder ellipsoid.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 33 additions & 4 deletions Source/Core/BoxGeometry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
define([
'./arrayFill',
'./BoundingSphere',
'./Cartesian3',
'./Check',
'./ComponentDatatype',
'./defaultValue',
'./defined',
'./DeveloperError',
'./Geometry',
'./GeometryAttribute',
'./GeometryAttributes',
'./GeometryOffsetAttribute',
'./PrimitiveType',
'./VertexFormat'
], function(
arrayFill,
BoundingSphere,
Cartesian3,
Check,
ComponentDatatype,
defaultValue,
defined,
DeveloperError,
Geometry,
GeometryAttribute,
GeometryAttributes,
GeometryOffsetAttribute,
PrimitiveType,
VertexFormat) {
'use strict';
Expand Down Expand Up @@ -60,13 +66,17 @@ define([
//>>includeStart('debug', pragmas.debug);
Check.typeOf.object('min', min);
Check.typeOf.object('max', max);
if (defined(options.offsetAttribute) && options.offsetAttribute === GeometryOffsetAttribute.TOP) {
throw new DeveloperError('GeometryOffsetAttribute.TOP is not a supported options.offsetAttribute for this geometry.');
}
//>>includeEnd('debug');

var vertexFormat = defaultValue(options.vertexFormat, VertexFormat.DEFAULT);

this._minimum = Cartesian3.clone(min);
this._maximum = Cartesian3.clone(max);
this._vertexFormat = vertexFormat;
this._offsetAttribute = options.offsetAttribute;
this._workerName = 'createBoxGeometry';
}

Expand Down Expand Up @@ -106,7 +116,8 @@ define([
return new BoxGeometry({
minimum : Cartesian3.negate(corner, new Cartesian3()),
maximum : corner,
vertexFormat : options.vertexFormat
vertexFormat : options.vertexFormat,
offsetAttribute: options.offsetAttribute
});
};

Expand Down Expand Up @@ -145,7 +156,7 @@ define([
* The number of elements used to pack the object into an array.
* @type {Number}
*/
BoxGeometry.packedLength = 2 * Cartesian3.packedLength + VertexFormat.packedLength;
BoxGeometry.packedLength = 2 * Cartesian3.packedLength + VertexFormat.packedLength + 1;

/**
* Stores the provided instance into the provided array.
Expand All @@ -167,6 +178,7 @@ define([
Cartesian3.pack(value._minimum, array, startingIndex);
Cartesian3.pack(value._maximum, array, startingIndex + Cartesian3.packedLength);
VertexFormat.pack(value._vertexFormat, array, startingIndex + 2 * Cartesian3.packedLength);
array[startingIndex + 2 * Cartesian3.packedLength + VertexFormat.packedLength] = defaultValue(value._offsetAttribute, -1);

return array;
};
Expand All @@ -177,7 +189,8 @@ define([
var scratchOptions = {
minimum: scratchMin,
maximum: scratchMax,
vertexFormat: scratchVertexFormat
vertexFormat: scratchVertexFormat,
offsetAttribute : undefined
};

/**
Expand All @@ -198,14 +211,17 @@ define([
var min = Cartesian3.unpack(array, startingIndex, scratchMin);
var max = Cartesian3.unpack(array, startingIndex + Cartesian3.packedLength, scratchMax);
var vertexFormat = VertexFormat.unpack(array, startingIndex + 2 * Cartesian3.packedLength, scratchVertexFormat);
var offsetAttribute = array[startingIndex + 2 * Cartesian3.packedLength + VertexFormat.packedLength];

if (!defined(result)) {
scratchOptions.offsetAttribute = offsetAttribute === -1 ? undefined : offsetAttribute;
return new BoxGeometry(scratchOptions);
}

result._minimum = Cartesian3.clone(min, result._minimum);
result._maximum = Cartesian3.clone(max, result._maximum);
result._vertexFormat = VertexFormat.clone(vertexFormat, result._vertexFormat);
result._offsetAttribute = offsetAttribute === -1 ? undefined : offsetAttribute;

return result;
};
Expand Down Expand Up @@ -818,11 +834,24 @@ define([
var diff = Cartesian3.subtract(max, min, diffScratch);
var radius = Cartesian3.magnitude(diff) * 0.5;

if (defined(boxGeometry._offsetAttribute)) {
var length = positions.length;
var applyOffset = new Uint8Array(length / 3);
var offsetValue = boxGeometry._offsetAttribute === GeometryOffsetAttribute.NONE ? 0 : 1;
arrayFill(applyOffset, offsetValue);
attributes.applyOffset = new GeometryAttribute({
componentDatatype : ComponentDatatype.UNSIGNED_BYTE,
componentsPerAttribute : 1,
values: applyOffset
});
}

return new Geometry({
attributes : attributes,
indices : indices,
primitiveType : PrimitiveType.TRIANGLES,
boundingSphere : new BoundingSphere(Cartesian3.ZERO, radius)
boundingSphere : new BoundingSphere(Cartesian3.ZERO, radius),
offsetAttribute : boxGeometry._offsetAttribute
});
};

Expand Down
Loading