cesium 0.21 → 0.21.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (108) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/Assets/Textures/moonSmall.jpg +0 -0
  3. data/app/assets/javascripts/Cesium.js +10 -1
  4. data/app/assets/javascripts/Core/Cartesian2.js +28 -0
  5. data/app/assets/javascripts/Core/Cartesian3.js +28 -0
  6. data/app/assets/javascripts/Core/Cartesian4.js +28 -0
  7. data/app/assets/javascripts/Core/CatmullRomSpline.js +3 -3
  8. data/app/assets/javascripts/Core/Clock.js +7 -7
  9. data/app/assets/javascripts/Core/Color.js +1 -1
  10. data/app/assets/javascripts/Core/ComponentDatatype.js +11 -7
  11. data/app/assets/javascripts/Core/CorridorGeometryLibrary.js +23 -29
  12. data/app/assets/javascripts/Core/Ellipsoid.js +6 -0
  13. data/app/assets/javascripts/Core/EllipsoidTangentPlane.js +5 -4
  14. data/app/assets/javascripts/Core/Event.js +2 -1
  15. data/app/assets/javascripts/Core/ExtentGeometry.js +1 -1
  16. data/app/assets/javascripts/Core/ExtentOutlineGeometry.js +1 -1
  17. data/app/assets/javascripts/Core/GeometryAttributes.js +1 -1
  18. data/app/assets/javascripts/Core/GeometryInstance.js +2 -2
  19. data/app/assets/javascripts/Core/GeometryPipeline.js +10 -7
  20. data/app/assets/javascripts/Core/HermiteSpline.js +1 -1
  21. data/app/assets/javascripts/Core/Iau2000Orientation.js +132 -0
  22. data/app/assets/javascripts/Core/IauOrientationAxes.js +98 -0
  23. data/app/assets/javascripts/Core/IauOrientationParameters.js +48 -0
  24. data/app/assets/javascripts/Core/IntersectionTests.js +5 -5
  25. data/app/assets/javascripts/Core/JulianDate.js +27 -5
  26. data/app/assets/javascripts/Core/Math.js +9 -0
  27. data/app/assets/javascripts/Core/Matrix2.js +1 -142
  28. data/app/assets/javascripts/Core/Matrix3.js +168 -153
  29. data/app/assets/javascripts/Core/Matrix4.js +0 -249
  30. data/app/assets/javascripts/Core/NearFarScalar.js +13 -0
  31. data/app/assets/javascripts/Core/PolygonGeometry.js +1 -1
  32. data/app/assets/javascripts/Core/PolygonOutlineGeometry.js +2 -2
  33. data/app/assets/javascripts/Core/PolygonPipeline.js +2 -2
  34. data/app/assets/javascripts/Core/PolylinePipeline.js +7 -3
  35. data/app/assets/javascripts/Core/PolylineVolumeGeometry.js +239 -0
  36. data/app/assets/javascripts/Core/PolylineVolumeGeometryLibrary.js +404 -0
  37. data/app/assets/javascripts/Core/PolylineVolumeOutlineGeometry.js +154 -0
  38. data/app/assets/javascripts/Core/Quaternion.js +37 -10
  39. data/app/assets/javascripts/Core/Shapes.js +26 -2
  40. data/app/assets/javascripts/Core/Simon1994PlanetaryPositions.js +3 -3
  41. data/app/assets/javascripts/Core/TimeInterval.js +28 -17
  42. data/app/assets/javascripts/Core/TimeIntervalCollection.js +30 -0
  43. data/app/assets/javascripts/Core/Transforms.js +5 -5
  44. data/app/assets/javascripts/Core/WallGeometryLibrary.js +2 -2
  45. data/app/assets/javascripts/Core/getFilenameFromUri.js +37 -0
  46. data/app/assets/javascripts/DynamicScene/ColorMaterialProperty.js +2 -2
  47. data/app/assets/javascripts/DynamicScene/CzmlDataSource.js +96 -18
  48. data/app/assets/javascripts/DynamicScene/DataSource.js +8 -0
  49. data/app/assets/javascripts/DynamicScene/DynamicBillboard.js +15 -3
  50. data/app/assets/javascripts/DynamicScene/DynamicBillboardVisualizer.js +6 -1
  51. data/app/assets/javascripts/DynamicScene/DynamicConeVisualizerUsingCustomSensor.js +1 -1
  52. data/app/assets/javascripts/DynamicScene/DynamicLabel.js +12 -1
  53. data/app/assets/javascripts/DynamicScene/DynamicLabelVisualizer.js +5 -0
  54. data/app/assets/javascripts/DynamicScene/DynamicObject.js +44 -17
  55. data/app/assets/javascripts/DynamicScene/DynamicObjectView.js +3 -3
  56. data/app/assets/javascripts/DynamicScene/DynamicPoint.js +12 -1
  57. data/app/assets/javascripts/DynamicScene/DynamicPointVisualizer.js +11 -2
  58. data/app/assets/javascripts/DynamicScene/DynamicPolyline.js +10 -30
  59. data/app/assets/javascripts/DynamicScene/DynamicPolylineVisualizer.js +5 -20
  60. data/app/assets/javascripts/DynamicScene/GeoJsonDataSource.js +26 -8
  61. data/app/assets/javascripts/DynamicScene/GridMaterialProperty.js +2 -2
  62. data/app/assets/javascripts/DynamicScene/ImageMaterialProperty.js +2 -2
  63. data/app/assets/javascripts/DynamicScene/PolylineOutlineMaterialProperty.js +66 -0
  64. data/app/assets/javascripts/DynamicScene/PositionProperty.js +3 -3
  65. data/app/assets/javascripts/DynamicScene/ReferenceProperty.js +1 -1
  66. data/app/assets/javascripts/DynamicScene/SampledProperty.js +14 -8
  67. data/app/assets/javascripts/Renderer/AutomaticUniforms.js +4 -3
  68. data/app/assets/javascripts/Renderer/Context.js +16 -2
  69. data/app/assets/javascripts/Renderer/UniformState.js +14 -14
  70. data/app/assets/javascripts/Scene/Billboard.js +102 -26
  71. data/app/assets/javascripts/Scene/BillboardCollection.js +69 -16
  72. data/app/assets/javascripts/Scene/Camera.js +7 -7
  73. data/app/assets/javascripts/Scene/CameraController.js +23 -12
  74. data/app/assets/javascripts/Scene/CameraFlightPath.js +11 -11
  75. data/app/assets/javascripts/Scene/CentralBodySurface.js +1 -1
  76. data/app/assets/javascripts/Scene/CustomSensorVolume.js +17 -2
  77. data/app/assets/javascripts/Scene/EllipsoidPrimitive.js +79 -24
  78. data/app/assets/javascripts/Scene/ExtentPrimitive.js +17 -1
  79. data/app/assets/javascripts/Scene/Label.js +94 -18
  80. data/app/assets/javascripts/Scene/LabelCollection.js +6 -2
  81. data/app/assets/javascripts/Scene/Moon.js +150 -0
  82. data/app/assets/javascripts/Scene/Polygon.js +18 -1
  83. data/app/assets/javascripts/Scene/Polyline.js +32 -13
  84. data/app/assets/javascripts/Scene/PolylineCollection.js +7 -6
  85. data/app/assets/javascripts/Scene/Primitive.js +2 -2
  86. data/app/assets/javascripts/Scene/RectangularPyramidSensorVolume.js +12 -0
  87. data/app/assets/javascripts/Scene/Scene.js +122 -14
  88. data/app/assets/javascripts/Scene/SceneTransforms.js +2 -2
  89. data/app/assets/javascripts/Scene/SceneTransitioner.js +4 -4
  90. data/app/assets/javascripts/Scene/ScreenSpaceCameraController.js +1 -1
  91. data/app/assets/javascripts/Scene/SkyBox.js +53 -48
  92. data/app/assets/javascripts/Scene/TileMapServiceImageryProvider.js +2 -2
  93. data/app/assets/javascripts/Shaders/BillboardCollectionVS.glsl +36 -14
  94. data/app/assets/javascripts/Shaders/BillboardCollectionVS.js +27 -9
  95. data/app/assets/javascripts/Shaders/Builtin/Functions/phong.glsl +13 -0
  96. data/app/assets/javascripts/Shaders/Builtin/Functions/phong.js +10 -0
  97. data/app/assets/javascripts/Shaders/EllipsoidFS.glsl +24 -0
  98. data/app/assets/javascripts/Shaders/EllipsoidFS.js +21 -1
  99. data/app/assets/javascripts/Widgets/CesiumWidget/CesiumWidget.js +30 -9
  100. data/app/assets/javascripts/Widgets/HomeButton/HomeButtonViewModel.js +6 -5
  101. data/app/assets/javascripts/Widgets/Viewer/Viewer.js +13 -0
  102. data/app/assets/javascripts/Widgets/Viewer/viewerDynamicObjectMixin.js +46 -4
  103. data/app/assets/javascripts/Workers/cesiumWorkerBootstrapper.js +16 -8
  104. data/app/assets/javascripts/Workers/createPolylineVolumeGeometry.js +23 -0
  105. data/app/assets/javascripts/Workers/createPolylineVolumeOutlineGeometry.js +23 -0
  106. data/lib/cesium/version.rb +1 -1
  107. metadata +15 -5
  108. data/test/dummy/tmp/pids/server.pid +0 -1
@@ -1,5 +1,5 @@
1
1
  /*global define,console*/
2
- define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock', 'Core/DefaultProxy', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/destroyObject', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Event', 'Core/FeatureDetection', 'Core/requestAnimationFrame', 'Core/ScreenSpaceEventHandler', 'Scene/BingMapsImageryProvider', 'Scene/CentralBody', 'Scene/Credit', 'Scene/Scene', 'Scene/SceneMode', 'Scene/SceneTransitioner', 'Scene/SkyAtmosphere', 'Scene/SkyBox', 'Scene/Sun', 'Widgets/getElement'], function(
2
+ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock', 'Core/DefaultProxy', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/destroyObject', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Event', 'Core/FeatureDetection', 'Core/requestAnimationFrame', 'Core/ScreenSpaceEventHandler', 'Scene/BingMapsImageryProvider', 'Scene/CentralBody', 'Scene/Credit', 'Scene/Moon', 'Scene/Scene', 'Scene/SceneMode', 'Scene/SceneTransitioner', 'Scene/SkyAtmosphere', 'Scene/SkyBox', 'Scene/Sun', 'Widgets/getElement'], function(
3
3
  buildModuleUrl,
4
4
  Cartesian2,
5
5
  Cartesian3,
@@ -18,6 +18,7 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
18
18
  BingMapsImageryProvider,
19
19
  CentralBody,
20
20
  Credit,
21
+ Moon,
21
22
  Scene,
22
23
  SceneMode,
23
24
  SceneTransitioner,
@@ -74,6 +75,7 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
74
75
  * @param {Clock} [options.clock=new Clock()] The clock to use to control current time.
75
76
  * @param {ImageryProvider} [options.imageryProvider=new BingMapsImageryProvider()] The imagery provider to serve as the base layer. If set to false, no imagery provider will be added.
76
77
  * @param {TerrainProvider} [options.terrainProvider=new EllipsoidTerrainProvider] The terrain provider.
78
+ * @param {SkyBox} [options.skyBox] The skybox used to render the stars. When <code>undefined</code>, the default stars are used.
77
79
  * @param {SceneMode} [options.sceneMode=SceneMode.SCENE3D] The initial scene mode.
78
80
  * @param {Boolean} [options.useDefaultRenderLoop=true] True if this widget should control the render loop, false otherwise.
79
81
  * @param {Boolean} [options.showRenderLoopErrors=true] If true, this widget will automatically display an HTML panel to the user containing the error, if a render loop error occurs.
@@ -95,6 +97,17 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
95
97
  * terrainProvider : new Cesium.CesiumTerrainProvider({
96
98
  * url : 'http://cesium.agi.com/smallterrain',
97
99
  * credit : 'Terrain data courtesy Analytical Graphics, Inc.'
100
+ * }),
101
+ * // Use high-res stars downloaded from https://github.com/AnalyticalGraphicsInc/cesium-assets
102
+ * skyBox : new Cesium.SkyBox({
103
+ * sources : {
104
+ * positiveX : 'stars/TychoSkymapII.t3_08192x04096_80_px.jpg',
105
+ * negativeX : 'stars/TychoSkymapII.t3_08192x04096_80_mx.jpg',
106
+ * positiveY : 'stars/TychoSkymapII.t3_08192x04096_80_py.jpg',
107
+ * negativeY : 'stars/TychoSkymapII.t3_08192x04096_80_my.jpg',
108
+ * positiveZ : 'stars/TychoSkymapII.t3_08192x04096_80_pz.jpg',
109
+ * negativeZ : 'stars/TychoSkymapII.t3_08192x04096_80_mz.jpg'
110
+ * }
98
111
  * })
99
112
  * });
100
113
  */
@@ -145,16 +158,24 @@ define(['Core/buildModuleUrl', 'Core/Cartesian2', 'Core/Cartesian3', 'Core/Clock
145
158
  var centralBody = new CentralBody(ellipsoid);
146
159
  scene.getPrimitives().setCentralBody(centralBody);
147
160
 
148
- scene.skyBox = new SkyBox({
149
- positiveX : getDefaultSkyBoxUrl('px'),
150
- negativeX : getDefaultSkyBoxUrl('mx'),
151
- positiveY : getDefaultSkyBoxUrl('py'),
152
- negativeY : getDefaultSkyBoxUrl('my'),
153
- positiveZ : getDefaultSkyBoxUrl('pz'),
154
- negativeZ : getDefaultSkyBoxUrl('mz')
155
- });
161
+ var skyBox = options.skyBox;
162
+ if (!defined(skyBox)) {
163
+ skyBox = new SkyBox({
164
+ sources : {
165
+ positiveX : getDefaultSkyBoxUrl('px'),
166
+ negativeX : getDefaultSkyBoxUrl('mx'),
167
+ positiveY : getDefaultSkyBoxUrl('py'),
168
+ negativeY : getDefaultSkyBoxUrl('my'),
169
+ positiveZ : getDefaultSkyBoxUrl('pz'),
170
+ negativeZ : getDefaultSkyBoxUrl('mz')
171
+ }
172
+ });
173
+ }
174
+
175
+ scene.skyBox = skyBox;
156
176
  scene.skyAtmosphere = new SkyAtmosphere(ellipsoid);
157
177
  scene.sun = new Sun();
178
+ scene.moon = new Moon();
158
179
 
159
180
  //Set the base imagery layer
160
181
  var imageryProvider = options.imageryProvider;
@@ -1,6 +1,7 @@
1
1
  /*global define*/
2
- define(['Core/Cartesian3', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Extent', 'Core/Math', 'Core/Matrix4', 'Scene/Camera', 'Scene/CameraColumbusViewMode', 'Scene/CameraFlightPath', 'Scene/PerspectiveFrustum', 'Scene/SceneMode', 'Widgets/createCommand', 'ThirdParty/knockout'], function(
2
+ define(['Core/Cartesian3', 'Core/Matrix3', 'Core/defaultValue', 'Core/defined', 'Core/defineProperties', 'Core/DeveloperError', 'Core/Ellipsoid', 'Core/Extent', 'Core/Math', 'Core/Matrix4', 'Scene/Camera', 'Scene/CameraColumbusViewMode', 'Scene/CameraFlightPath', 'Scene/PerspectiveFrustum', 'Scene/SceneMode', 'Widgets/createCommand', 'ThirdParty/knockout'], function(
3
3
  Cartesian3,
4
+ Matrix3,
4
5
  defaultValue,
5
6
  defined,
6
7
  defineProperties,
@@ -50,10 +51,10 @@ define(['Core/Cartesian3', 'Core/defaultValue', 'Core/defined', 'Core/defineProp
50
51
  } else if (mode === SceneMode.SCENE3D) {
51
52
  Cartesian3.add(camera.position, Matrix4.getTranslation(camera.transform), camera.position);
52
53
  var rotation = Matrix4.getRotation(camera.transform);
53
- rotation.multiplyByVector(camera.direction, camera.direction);
54
- rotation.multiplyByVector(camera.up, camera.up);
55
- rotation.multiplyByVector(camera.right, camera.right);
56
- camera.transform = Matrix4.IDENTITY.clone();
54
+ Matrix3.multiplyByVector(rotation, camera.direction, camera.direction);
55
+ Matrix3.multiplyByVector(rotation, camera.up, camera.up);
56
+ Matrix3.multiplyByVector(rotation, camera.right, camera.right);
57
+ camera.transform = Matrix4.clone(Matrix4.IDENTITY);
57
58
  var defaultCamera = new Camera(context);
58
59
  description = {
59
60
  destination : defaultCamera.position,
@@ -82,6 +82,7 @@ define(['Core/Cartesian2', 'Core/defaultValue', 'Core/defined', 'Core/DeveloperE
82
82
  * @param {Array} [options.imageryProviderViewModels=createDefaultBaseLayers()] The array of ImageryProviderViewModels to be selectable from the BaseLayerPicker. This value is only valid if options.baseLayerPicker is set to true.
83
83
  * @param {ImageryProvider} [options.imageryProvider=new BingMapsImageryProvider()] The imagery provider to use. This value is only valid if options.baseLayerPicker is set to false.
84
84
  * @param {TerrainProvider} [options.terrainProvider=new EllipsoidTerrainProvider()] The terrain provider to use
85
+ * @param {SkyBox} [options.skyBox] The skybox used to render the stars. When <code>undefined</code>, the default stars are used.
85
86
  * @param {Element} [options.fullscreenElement=container] The element to make full screen when the full screen button is pressed.
86
87
  * @param {Boolean} [options.useDefaultRenderLoop=true] True if this widget should control the render loop, false otherwise.
87
88
  * @param {Boolean} [options.showRenderLoopErrors=true] If true, this widget will automatically display an HTML panel to the user containing the error, if a render loop error occurs.
@@ -118,6 +119,17 @@ define(['Core/Cartesian2', 'Core/defaultValue', 'Core/defined', 'Core/DeveloperE
118
119
  * //Use OpenStreetMaps
119
120
  * imageryProvider : new Cesium.OpenStreetMapImageryProvider({
120
121
  * url : 'http://tile.openstreetmap.org/'
122
+ * }),
123
+ * // Use high-res stars downloaded from https://github.com/AnalyticalGraphicsInc/cesium-assets
124
+ * skyBox : new Cesium.SkyBox({
125
+ * sources : {
126
+ * positiveX : 'stars/TychoSkymapII.t3_08192x04096_80_px.jpg',
127
+ * negativeX : 'stars/TychoSkymapII.t3_08192x04096_80_mx.jpg',
128
+ * positiveY : 'stars/TychoSkymapII.t3_08192x04096_80_py.jpg',
129
+ * negativeY : 'stars/TychoSkymapII.t3_08192x04096_80_my.jpg',
130
+ * positiveZ : 'stars/TychoSkymapII.t3_08192x04096_80_pz.jpg',
131
+ * negativeZ : 'stars/TychoSkymapII.t3_08192x04096_80_mz.jpg'
132
+ * }
121
133
  * })
122
134
  * });
123
135
  *
@@ -166,6 +178,7 @@ Either specify options.imageryProvider instead or set options.baseLayerPicker to
166
178
  var cesiumWidget = new CesiumWidget(cesiumWidgetContainer, {
167
179
  terrainProvider : options.terrainProvider,
168
180
  imageryProvider : createBaseLayerPicker ? false : options.imageryProvider,
181
+ skyBox : options.skyBox,
169
182
  sceneMode : options.sceneMode,
170
183
  contextOptions : options.contextOptions,
171
184
  useDefaultRenderLoop : false
@@ -58,10 +58,7 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
58
58
 
59
59
  function pickAndTrackObject(e) {
60
60
  var p = viewer.scene.pick(e.position);
61
- if (defined(p) &&
62
- defined(p.primitive) &&
63
- defined(p.primitive.dynamicObject) &&
64
- defined(p.primitive.dynamicObject.position)) {
61
+ if (defined(p) && defined(p.primitive) && defined(p.primitive.dynamicObject) && defined(p.primitive.dynamicObject.position)) {
65
62
  viewer.trackedObject = p.primitive.dynamicObject;
66
63
  }
67
64
  }
@@ -76,6 +73,44 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
76
73
  eventHelper.add(viewer.homeButton.viewModel.command.beforeExecute, clearTrackedObject);
77
74
  }
78
75
 
76
+ //We need to subscribe to the data sources and collections so that we can clear the
77
+ //tracked object when it is removed from the scene.
78
+ function onDynamicCollectionChanged(collection, added, removed) {
79
+ var length = removed.length;
80
+ for (var i = 0; i < length; i++) {
81
+ var removedObject = removed[i];
82
+ if (viewer.trackedObject === removedObject) {
83
+ viewer.homeButton.viewModel.command();
84
+ break;
85
+ }
86
+ }
87
+ }
88
+
89
+ function dataSourceAdded(dataSourceCollection, dataSource) {
90
+ dataSource.getDynamicObjectCollection().collectionChanged.addEventListener(onDynamicCollectionChanged);
91
+ }
92
+
93
+ function dataSourceRemoved(dataSourceCollection, dataSource) {
94
+ dataSource.getDynamicObjectCollection().collectionChanged.removeEventListener(onDynamicCollectionChanged);
95
+
96
+ if (defined(trackedObject)) {
97
+ if (dataSource.getDynamicObjectCollection().getById(viewer.trackedObject.id) === viewer.trackedObject) {
98
+ viewer.homeButton.viewModel.command();
99
+ }
100
+ }
101
+ }
102
+
103
+ //Subscribe to current data sources
104
+ var dataSources = viewer.dataSources;
105
+ var dataSourceLength = dataSources.getLength();
106
+ for (var i = 0; i < dataSourceLength; i++) {
107
+ dataSourceAdded(dataSources, dataSources.get(i));
108
+ }
109
+
110
+ //Hook up events so that we can subscribe to future sources.
111
+ eventHelper.add(viewer.dataSources.dataSourceAdded, dataSourceAdded);
112
+ eventHelper.add(viewer.dataSources.dataSourceRemoved, dataSourceRemoved);
113
+
79
114
  //Subscribe to left clicks and zoom to the picked object.
80
115
  viewer.screenSpaceEventHandler.setInputAction(pickAndTrackObject, ScreenSpaceEventType.LEFT_CLICK);
81
116
 
@@ -127,6 +162,13 @@ define(['Core/defaultValue', 'Core/defined', 'Core/DeveloperError', 'Core/define
127
162
  eventHelper.removeAll();
128
163
 
129
164
  viewer.screenSpaceEventHandler.removeInputAction(ScreenSpaceEventType.LEFT_CLICK);
165
+
166
+ //Unsubscribe from data sources
167
+ var dataSources = viewer.dataSources;
168
+ var dataSourceLength = dataSources.getLength();
169
+ for (var i = 0; i < dataSourceLength; i++) {
170
+ dataSourceRemoved(dataSources, dataSources.get(i));
171
+ }
130
172
  });
131
173
  };
132
174
 
@@ -21,7 +21,7 @@ function setTimeout(fn) {
21
21
  //below is RequireJS, verbatim
22
22
 
23
23
  /** vim: et:ts=4:sw=4:sts=4
24
- * @license RequireJS 2.1.6 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
24
+ * @license RequireJS 2.1.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
25
25
  * Available via the MIT or new BSD license.
26
26
  * see: http://github.com/jrburke/requirejs for details
27
27
  */
@@ -34,7 +34,7 @@ var requirejs, require, define;
34
34
  (function (global) {
35
35
  var req, s, head, baseElement, dataMain, src,
36
36
  interactiveScript, currentlyAddingScript, mainScript, subPath,
37
- version = '2.1.6',
37
+ version = '2.1.8',
38
38
  commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
39
39
  cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
40
40
  jsSuffixRegExp = /\.js$/,
@@ -1816,6 +1816,19 @@ var requirejs, require, define;
1816
1816
  */
1817
1817
  req.onError = defaultOnError;
1818
1818
 
1819
+ /**
1820
+ * Creates the node for the load command. Only used in browser envs.
1821
+ */
1822
+ req.createNode = function (config, moduleName, url) {
1823
+ var node = config.xhtml ?
1824
+ document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
1825
+ document.createElement('script');
1826
+ node.type = config.scriptType || 'text/javascript';
1827
+ node.charset = 'utf-8';
1828
+ node.async = true;
1829
+ return node;
1830
+ };
1831
+
1819
1832
  /**
1820
1833
  * Does the request to load a module for the browser case.
1821
1834
  * Make this a separate function to allow other environments
@@ -1830,12 +1843,7 @@ var requirejs, require, define;
1830
1843
  node;
1831
1844
  if (isBrowser) {
1832
1845
  //In the browser so use a script tag
1833
- node = config.xhtml ?
1834
- document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
1835
- document.createElement('script');
1836
- node.type = config.scriptType || 'text/javascript';
1837
- node.charset = 'utf-8';
1838
- node.async = true;
1846
+ node = req.createNode(config, moduleName, url);
1839
1847
 
1840
1848
  node.setAttribute('data-requirecontext', context.contextName);
1841
1849
  node.setAttribute('data-requiremodule', moduleName);
@@ -0,0 +1,23 @@
1
+ /*global define*/
2
+ define(['Core/PolylineVolumeGeometry', 'Core/Ellipsoid', 'Scene/PrimitivePipeline', 'Workers/createTaskProcessorWorker'], function(
3
+ PolylineVolumeGeometry,
4
+ Ellipsoid,
5
+ PrimitivePipeline,
6
+ createTaskProcessorWorker) {
7
+ "use strict";
8
+
9
+ function createPolylineVolumeGeometry(parameters, transferableObjects) {
10
+ var polylineVolumeGeometry = parameters.geometry;
11
+ polylineVolumeGeometry._ellipsoid = Ellipsoid.clone(polylineVolumeGeometry._ellipsoid);
12
+
13
+ var geometry = PolylineVolumeGeometry.createGeometry(polylineVolumeGeometry);
14
+ PrimitivePipeline.transferGeometry(geometry, transferableObjects);
15
+
16
+ return {
17
+ geometry : geometry,
18
+ index : parameters.index
19
+ };
20
+ }
21
+
22
+ return createTaskProcessorWorker(createPolylineVolumeGeometry);
23
+ });
@@ -0,0 +1,23 @@
1
+ /*global define*/
2
+ define(['Core/PolylineVolumeOutlineGeometry', 'Core/Ellipsoid', 'Scene/PrimitivePipeline', 'Workers/createTaskProcessorWorker'], function(
3
+ PolylineVolumeOutlineGeometry,
4
+ Ellipsoid,
5
+ PrimitivePipeline,
6
+ createTaskProcessorWorker) {
7
+ "use strict";
8
+
9
+ function createPolylineVolumeOutlineGeometry(parameters, transferableObjects) {
10
+ var polylineVolumeOutlineGeometry = parameters.geometry;
11
+ polylineVolumeOutlineGeometry._ellipsoid = Ellipsoid.clone(polylineVolumeOutlineGeometry._ellipsoid);
12
+
13
+ var geometry = PolylineVolumeOutlineGeometry.createGeometry(polylineVolumeOutlineGeometry);
14
+ PrimitivePipeline.transferGeometry(geometry, transferableObjects);
15
+
16
+ return {
17
+ geometry : geometry,
18
+ index : parameters.index
19
+ };
20
+ }
21
+
22
+ return createTaskProcessorWorker(createPolylineVolumeOutlineGeometry);
23
+ });
@@ -1,3 +1,3 @@
1
1
  module Cesium
2
- VERSION = '0.21'
2
+ VERSION = '0.21.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cesium
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.21'
4
+ version: 0.21.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bogumil Wrona
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-10-02 00:00:00.000000000 Z
11
+ date: 2013-10-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -117,6 +117,7 @@ files:
117
117
  - app/assets/javascripts/Assets/IAU2006_XYS/IAU2006_XYS_8.json
118
118
  - app/assets/javascripts/Assets/IAU2006_XYS/IAU2006_XYS_9.json
119
119
  - app/assets/javascripts/Assets/package.json
120
+ - app/assets/javascripts/Assets/Textures/moonSmall.jpg
120
121
  - app/assets/javascripts/Assets/Textures/NaturalEarthII/0/0/0.jpg
121
122
  - app/assets/javascripts/Assets/Textures/NaturalEarthII/0/1/0.jpg
122
123
  - app/assets/javascripts/Assets/Textures/NaturalEarthII/1/0/0.jpg
@@ -239,12 +240,16 @@ files:
239
240
  - app/assets/javascripts/Core/GeometryInstance.js
240
241
  - app/assets/javascripts/Core/GeometryInstanceAttribute.js
241
242
  - app/assets/javascripts/Core/GeometryPipeline.js
243
+ - app/assets/javascripts/Core/getFilenameFromUri.js
242
244
  - app/assets/javascripts/Core/getImagePixels.js
243
245
  - app/assets/javascripts/Core/HeightmapTessellator.js
244
246
  - app/assets/javascripts/Core/HermitePolynomialApproximation.js
245
247
  - app/assets/javascripts/Core/HermiteSpline.js
248
+ - app/assets/javascripts/Core/Iau2000Orientation.js
246
249
  - app/assets/javascripts/Core/Iau2006XysData.js
247
250
  - app/assets/javascripts/Core/Iau2006XysSample.js
251
+ - app/assets/javascripts/Core/IauOrientationAxes.js
252
+ - app/assets/javascripts/Core/IauOrientationParameters.js
248
253
  - app/assets/javascripts/Core/IndexDatatype.js
249
254
  - app/assets/javascripts/Core/InterpolationAlgorithm.js
250
255
  - app/assets/javascripts/Core/Intersect.js
@@ -285,6 +290,9 @@ files:
285
290
  - app/assets/javascripts/Core/PolygonPipeline.js
286
291
  - app/assets/javascripts/Core/PolylineGeometry.js
287
292
  - app/assets/javascripts/Core/PolylinePipeline.js
293
+ - app/assets/javascripts/Core/PolylineVolumeGeometry.js
294
+ - app/assets/javascripts/Core/PolylineVolumeGeometryLibrary.js
295
+ - app/assets/javascripts/Core/PolylineVolumeOutlineGeometry.js
288
296
  - app/assets/javascripts/Core/PrimitiveType.js
289
297
  - app/assets/javascripts/Core/QuadraticRealPolynomial.js
290
298
  - app/assets/javascripts/Core/QuarticRealPolynomial.js
@@ -367,6 +375,7 @@ files:
367
375
  - app/assets/javascripts/DynamicScene/ImageMaterialProperty.js
368
376
  - app/assets/javascripts/DynamicScene/MaterialProperty.js
369
377
  - app/assets/javascripts/DynamicScene/package.json
378
+ - app/assets/javascripts/DynamicScene/PolylineOutlineMaterialProperty.js
370
379
  - app/assets/javascripts/DynamicScene/PositionProperty.js
371
380
  - app/assets/javascripts/DynamicScene/Property.js
372
381
  - app/assets/javascripts/DynamicScene/ReferenceProperty.js
@@ -463,6 +472,7 @@ files:
463
472
  - app/assets/javascripts/Scene/LabelStyle.js
464
473
  - app/assets/javascripts/Scene/Material.js
465
474
  - app/assets/javascripts/Scene/MaterialAppearance.js
475
+ - app/assets/javascripts/Scene/Moon.js
466
476
  - app/assets/javascripts/Scene/NeverTileDiscardPolicy.js
467
477
  - app/assets/javascripts/Scene/OpenStreetMapImageryProvider.js
468
478
  - app/assets/javascripts/Scene/OrthographicFrustum.js
@@ -884,6 +894,8 @@ files:
884
894
  - app/assets/javascripts/Workers/createPolygonGeometry.js
885
895
  - app/assets/javascripts/Workers/createPolygonOutlineGeometry.js
886
896
  - app/assets/javascripts/Workers/createPolylineGeometry.js
897
+ - app/assets/javascripts/Workers/createPolylineVolumeGeometry.js
898
+ - app/assets/javascripts/Workers/createPolylineVolumeOutlineGeometry.js
887
899
  - app/assets/javascripts/Workers/createSimplePolylineGeometry.js
888
900
  - app/assets/javascripts/Workers/createSphereGeometry.js
889
901
  - app/assets/javascripts/Workers/createSphereOutlineGeometry.js
@@ -2502,7 +2514,6 @@ files:
2502
2514
  - test/dummy/tmp/cache/assets/EA4/CD0/sprockets%2F7d06cdaa883a75feeeedbd6f2e89dff6
2503
2515
  - test/dummy/tmp/cache/assets/EB1/730/sprockets%2Fbb7a9aa4c8afd1e1c0de56bd0d8fbdd4
2504
2516
  - test/dummy/tmp/cache/assets/ECD/BA0/sprockets%2Ff7a898dcfdfabd5c346afffdfe70fb06
2505
- - test/dummy/tmp/pids/server.pid
2506
2517
  - test/functional/cesium_controller_test.rb
2507
2518
  - test/integration/navigation_test.rb
2508
2519
  - test/test_helper.rb
@@ -2527,7 +2538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
2527
2538
  version: '0'
2528
2539
  requirements: []
2529
2540
  rubyforge_project:
2530
- rubygems_version: 2.0.7
2541
+ rubygems_version: 2.1.9
2531
2542
  signing_key:
2532
2543
  specification_version: 4
2533
2544
  summary: WebGL Virtual Globe and Map Engine as Rails' Engine
@@ -4128,7 +4139,6 @@ test_files:
4128
4139
  - test/dummy/tmp/cache/assets/EA4/CD0/sprockets%2F7d06cdaa883a75feeeedbd6f2e89dff6
4129
4140
  - test/dummy/tmp/cache/assets/EB1/730/sprockets%2Fbb7a9aa4c8afd1e1c0de56bd0d8fbdd4
4130
4141
  - test/dummy/tmp/cache/assets/ECD/BA0/sprockets%2Ff7a898dcfdfabd5c346afffdfe70fb06
4131
- - test/dummy/tmp/pids/server.pid
4132
4142
  - test/functional/cesium_controller_test.rb
4133
4143
  - test/integration/navigation_test.rb
4134
4144
  - test/test_helper.rb
@@ -1 +0,0 @@
1
- 85408