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.

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 Box, Cylinder and Corridor to CZML #3989

Merged
merged 6 commits into from
Jun 3, 2016
Merged
Changes from 1 commit
Commits
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
16 changes: 8 additions & 8 deletions Apps/Sandcastle/CesiumSandcastle.js
Original file line number Diff line number Diff line change
@@ -20,6 +20,10 @@ require({
location : '../ThirdParty/codemirror-4.6'
}]
}, [
"dijit/Dialog",
"dijit/form/Button",
"dijit/form/Form",
"dijit/form/Textarea",
'CodeMirror/lib/codemirror',
'dijit/layout/ContentPane',
'dijit/popup',
@@ -38,10 +42,6 @@ require({
'dojo/query',
'dojo/when',
'Sandcastle/LinkButton',
"dijit/Dialog",
"dijit/form/Form",
"dijit/form/Textarea",
"dijit/form/Button",
'Source/Cesium',
'CodeMirror/addon/hint/show-hint',
'CodeMirror/addon/hint/javascript-hint',
@@ -63,6 +63,10 @@ require({
'dijit/ToolbarSeparator',
'dojo/domReady!'
], function(
Dialog,
Button,
Form,
TextArea,
CodeMirror,
ContentPane,
popup,
@@ -81,10 +85,6 @@ require({
query,
when,
LinkButton,
Dialog,
Form,
TextArea,
Button,
Cesium) {
'use strict';

306 changes: 153 additions & 153 deletions Source/DataSources/CzmlDataSource.js
Original file line number Diff line number Diff line change
@@ -1,158 +1,158 @@
/*global define*/
define([
'../Core/Cartesian2',
'../Core/Cartesian3',
'../Core/Cartographic',
'../Core/ClockRange',
'../Core/ClockStep',
'../Core/Color',
'../Core/CornerType',
'../Core/createGuid',
'../Core/defaultValue',
'../Core/defined',
'../Core/defineProperties',
'../Core/DeveloperError',
'../Core/Ellipsoid',
'../Core/Event',
'../Core/ExtrapolationType',
'../Core/getAbsoluteUri',
'../Core/getFilenameFromUri',
'../Core/HermitePolynomialApproximation',
'../Core/isArray',
'../Core/Iso8601',
'../Core/JulianDate',
'../Core/LagrangePolynomialApproximation',
'../Core/LinearApproximation',
'../Core/loadJson',
'../Core/Math',
'../Core/Quaternion',
'../Core/Rectangle',
'../Core/ReferenceFrame',
'../Core/RuntimeError',
'../Core/Spherical',
'../Core/TimeInterval',
'../Core/TimeIntervalCollection',
'../Scene/HorizontalOrigin',
'../Scene/LabelStyle',
'../Scene/VerticalOrigin',
'../ThirdParty/Uri',
'../ThirdParty/when',
'./BillboardGraphics',
'./BoxGraphics',
'./ColorMaterialProperty',
'./CompositeMaterialProperty',
'./CompositePositionProperty',
'./CompositeProperty',
'./ConstantPositionProperty',
'./ConstantProperty',
'./CorridorGraphics',
'./CylinderGraphics',
'./DataSource',
'./DataSourceClock',
'./EllipseGraphics',
'./EllipsoidGraphics',
'./EntityCollection',
'./GridMaterialProperty',
'./ImageMaterialProperty',
'./LabelGraphics',
'./ModelGraphics',
'./NodeTransformationProperty',
'./PathGraphics',
'./PointGraphics',
'./PolygonGraphics',
'./PolylineArrowMaterialProperty',
'./PolylineGlowMaterialProperty',
'./PolylineGraphics',
'./PolylineOutlineMaterialProperty',
'./PositionPropertyArray',
'./PropertyBag',
'./RectangleGraphics',
'./ReferenceProperty',
'./Rotation',
'./SampledPositionProperty',
'./SampledProperty',
'./StripeMaterialProperty',
'./StripeOrientation',
'./TimeIntervalCollectionPositionProperty',
'./TimeIntervalCollectionProperty',
'./WallGraphics'
], function(
Cartesian2,
Cartesian3,
Cartographic,
ClockRange,
ClockStep,
Color,
CornerType,
createGuid,
defaultValue,
defined,
defineProperties,
DeveloperError,
Ellipsoid,
Event,
ExtrapolationType,
getAbsoluteUri,
getFilenameFromUri,
HermitePolynomialApproximation,
isArray,
Iso8601,
JulianDate,
LagrangePolynomialApproximation,
LinearApproximation,
loadJson,
CesiumMath,
Quaternion,
Rectangle,
ReferenceFrame,
RuntimeError,
Spherical,
TimeInterval,
TimeIntervalCollection,
HorizontalOrigin,
LabelStyle,
VerticalOrigin,
Uri,
when,
BillboardGraphics,
BoxGraphics,
ColorMaterialProperty,
CompositeMaterialProperty,
CompositePositionProperty,
CompositeProperty,
ConstantPositionProperty,
ConstantProperty,
CorridorGraphics,
CylinderGraphics,
DataSource,
DataSourceClock,
EllipseGraphics,
EllipsoidGraphics,
EntityCollection,
GridMaterialProperty,
ImageMaterialProperty,
LabelGraphics,
ModelGraphics,
NodeTransformationProperty,
PathGraphics,
PointGraphics,
PolygonGraphics,
PolylineArrowMaterialProperty,
PolylineGlowMaterialProperty,
PolylineGraphics,
PolylineOutlineMaterialProperty,
PositionPropertyArray,
PropertyBag,
RectangleGraphics,
ReferenceProperty,
Rotation,
SampledPositionProperty,
SampledProperty,
StripeMaterialProperty,
StripeOrientation,
TimeIntervalCollectionPositionProperty,
TimeIntervalCollectionProperty,
WallGraphics) {
'../Core/Cartesian2',
'../Core/Cartesian3',
'../Core/Cartographic',
'../Core/ClockRange',
'../Core/ClockStep',
'../Core/Color',
'../Core/CornerType',
'../Core/createGuid',
'../Core/defaultValue',
'../Core/defined',
'../Core/defineProperties',
'../Core/DeveloperError',
'../Core/Ellipsoid',
'../Core/Event',
'../Core/ExtrapolationType',
'../Core/getAbsoluteUri',
'../Core/getFilenameFromUri',
'../Core/HermitePolynomialApproximation',
'../Core/isArray',
'../Core/Iso8601',
'../Core/JulianDate',
'../Core/LagrangePolynomialApproximation',
'../Core/LinearApproximation',
'../Core/loadJson',
'../Core/Math',
'../Core/Quaternion',
'../Core/Rectangle',
'../Core/ReferenceFrame',
'../Core/RuntimeError',
'../Core/Spherical',
'../Core/TimeInterval',
'../Core/TimeIntervalCollection',
'../Scene/HorizontalOrigin',
'../Scene/LabelStyle',
'../Scene/VerticalOrigin',
'../ThirdParty/Uri',
'../ThirdParty/when',
'./BillboardGraphics',
'./BoxGraphics',
'./ColorMaterialProperty',
'./CompositeMaterialProperty',
'./CompositePositionProperty',
'./CompositeProperty',
'./ConstantPositionProperty',
'./ConstantProperty',
'./CorridorGraphics',
'./CylinderGraphics',
'./DataSource',
'./DataSourceClock',
'./EllipseGraphics',
'./EllipsoidGraphics',
'./EntityCollection',
'./GridMaterialProperty',
'./ImageMaterialProperty',
'./LabelGraphics',
'./ModelGraphics',
'./NodeTransformationProperty',
'./PathGraphics',
'./PointGraphics',
'./PolygonGraphics',
'./PolylineArrowMaterialProperty',
'./PolylineGlowMaterialProperty',
'./PolylineGraphics',
'./PolylineOutlineMaterialProperty',
'./PositionPropertyArray',
'./PropertyBag',
'./RectangleGraphics',
'./ReferenceProperty',
'./Rotation',
'./SampledPositionProperty',
'./SampledProperty',
'./StripeMaterialProperty',
'./StripeOrientation',
'./TimeIntervalCollectionPositionProperty',
'./TimeIntervalCollectionProperty',
'./WallGraphics'
], function(
Cartesian2,
Cartesian3,
Cartographic,
ClockRange,
ClockStep,
Color,
CornerType,
createGuid,
defaultValue,
defined,
defineProperties,
DeveloperError,
Ellipsoid,
Event,
ExtrapolationType,
getAbsoluteUri,
getFilenameFromUri,
HermitePolynomialApproximation,
isArray,
Iso8601,
JulianDate,
LagrangePolynomialApproximation,
LinearApproximation,
loadJson,
CesiumMath,
Quaternion,
Rectangle,
ReferenceFrame,
RuntimeError,
Spherical,
TimeInterval,
TimeIntervalCollection,
HorizontalOrigin,
LabelStyle,
VerticalOrigin,
Uri,
when,
BillboardGraphics,
BoxGraphics,
ColorMaterialProperty,
CompositeMaterialProperty,
CompositePositionProperty,
CompositeProperty,
ConstantPositionProperty,
ConstantProperty,
CorridorGraphics,
CylinderGraphics,
DataSource,
DataSourceClock,
EllipseGraphics,
EllipsoidGraphics,
EntityCollection,
GridMaterialProperty,
ImageMaterialProperty,
LabelGraphics,
ModelGraphics,
NodeTransformationProperty,
PathGraphics,
PointGraphics,
PolygonGraphics,
PolylineArrowMaterialProperty,
PolylineGlowMaterialProperty,
PolylineGraphics,
PolylineOutlineMaterialProperty,
PositionPropertyArray,
PropertyBag,
RectangleGraphics,
ReferenceProperty,
Rotation,
SampledPositionProperty,
SampledProperty,
StripeMaterialProperty,
StripeOrientation,
TimeIntervalCollectionPositionProperty,
TimeIntervalCollectionProperty,
WallGraphics) {
'use strict';

var currentId;
34 changes: 17 additions & 17 deletions Source/DataSources/VelocityVectorProperty.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
/*global define*/
define([
'../Core/Cartesian3',
'../Core/defaultValue',
'../Core/defined',
'../Core/defineProperties',
'../Core/DeveloperError',
'../Core/Event',
'../Core/JulianDate',
'./Property'
], function(
Cartesian3,
defaultValue,
defined,
defineProperties,
DeveloperError,
Event,
JulianDate,
Property) {
'../Core/Cartesian3',
'../Core/defaultValue',
'../Core/defined',
'../Core/defineProperties',
'../Core/DeveloperError',
'../Core/Event',
'../Core/JulianDate',
'./Property'
], function(
Cartesian3,
defaultValue,
defined,
defineProperties,
DeveloperError,
Event,
JulianDate,
Property) {
'use strict';

/**
30 changes: 15 additions & 15 deletions Specs/DataSources/VelocityVectorPropertySpec.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
/*global defineSuite*/
defineSuite([
'DataSources/VelocityVectorProperty',
'Core/Cartesian3',
'Core/Event',
'Core/ExtrapolationType',
'Core/JulianDate',
'DataSources/CallbackProperty',
'DataSources/SampledPositionProperty'
], function(
VelocityVectorProperty,
Cartesian3,
Event,
ExtrapolationType,
JulianDate,
CallbackProperty,
SampledPositionProperty) {
'DataSources/VelocityVectorProperty',
'Core/Cartesian3',
'Core/Event',
'Core/ExtrapolationType',
'Core/JulianDate',
'DataSources/CallbackProperty',
'DataSources/SampledPositionProperty'
], function(
VelocityVectorProperty,
Cartesian3,
Event,
ExtrapolationType,
JulianDate,
CallbackProperty,
SampledPositionProperty) {
'use strict';

var time = JulianDate.now();
4 changes: 2 additions & 2 deletions Specs/Scene/ShadowMapSpec.js
Original file line number Diff line number Diff line change
@@ -4,9 +4,9 @@ defineSuite([
'Core/BoundingSphere',
'Core/BoxGeometry',
'Core/Cartesian3',
'Core/ComponentDatatype',
'Core/Color',
'Core/ColorGeometryInstanceAttribute',
'Core/ComponentDatatype',
'Core/defined',
'Core/EllipsoidTerrainProvider',
'Core/GeometryInstance',
@@ -35,9 +35,9 @@ defineSuite([
BoundingSphere,
BoxGeometry,
Cartesian3,
ComponentDatatype,
Color,
ColorGeometryInstanceAttribute,
ComponentDatatype,
defined,
EllipsoidTerrainProvider,
GeometryInstance,