@openglobus/og 0.11.1 → 0.11.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +18 -20
- package/src/og/Clock.js +11 -11
- package/src/og/Deferred.js +1 -1
- package/src/og/Events.js +9 -7
- package/src/og/Extent.js +117 -72
- package/src/og/Globe.js +35 -22
- package/src/og/ImageCanvas.js +24 -18
- package/src/og/Lock.js +2 -2
- package/src/og/LonLat.js +40 -37
- package/src/og/Popup.js +21 -15
- package/src/og/QueueArray.js +7 -3
- package/src/og/Rectangle.js +11 -6
- package/src/og/Stack.js +8 -5
- package/src/og/ajax.js +21 -33
- package/src/og/astro/astro.js +5 -5
- package/src/og/astro/earth.js +23 -17
- package/src/og/astro/jd.js +44 -39
- package/src/og/astro/orbit.js +20 -18
- package/src/og/astro/rotation.js +17 -8
- package/src/og/bv/Box.js +7 -3
- package/src/og/bv/Sphere.js +17 -9
- package/src/og/camera/Camera.js +137 -86
- package/src/og/camera/Frustum.js +30 -19
- package/src/og/camera/PlanetCamera.js +30 -26
- package/src/og/control/CompassButton.js +8 -2
- package/src/og/control/Control.js +13 -11
- package/src/og/control/DebugInfo.js +4 -1
- package/src/og/control/EarthCoordinates.js +62 -41
- package/src/og/control/EarthNavigation.js +20 -22
- package/src/og/control/GeoImageDragControl.js +1 -1
- package/src/og/control/KeyboardNavigation.js +12 -12
- package/src/og/control/LayerSwitcher.js +24 -23
- package/src/og/control/Lighting.js +1 -1
- package/src/og/control/MouseNavigation.js +1 -1
- package/src/og/control/ScaleControl.js +1 -1
- package/src/og/control/SegmentBoundVisualization.js +8 -9
- package/src/og/control/ShowFps.js +15 -10
- package/src/og/control/SimpleNavigation.js +8 -10
- package/src/og/control/Sun.js +25 -15
- package/src/og/control/ToggleWireframe.js +5 -5
- package/src/og/control/TouchNavigation.js +58 -45
- package/src/og/control/ZoomControl.js +41 -25
- package/src/og/control/index.js +4 -0
- package/src/og/ellipsoid/Ellipsoid.js +181 -85
- package/src/og/ellipsoid/wgs84.js +4 -4
- package/src/og/entity/BaseBillboard.js +97 -44
- package/src/og/entity/Billboard.js +15 -11
- package/src/og/entity/BillboardHandler.js +314 -64
- package/src/og/entity/Entity.js +106 -74
- package/src/og/entity/EntityCollection.js +72 -49
- package/src/og/entity/GeoObject.js +228 -0
- package/src/og/entity/GeoObjectHandler.js +910 -0
- package/src/og/entity/Geometry.js +29 -26
- package/src/og/entity/GeometryHandler.js +598 -126
- package/src/og/entity/Label.js +74 -40
- package/src/og/entity/LabelHandler.js +47 -246
- package/src/og/entity/LabelWorker.js +213 -0
- package/src/og/entity/Object3d.js +504 -0
- package/src/og/entity/PointCloud.js +81 -33
- package/src/og/entity/PointCloudHandler.js +9 -9
- package/src/og/entity/Polyline.js +39 -39
- package/src/og/entity/Ray.js +61 -28
- package/src/og/entity/ShapeHandler.js +1 -1
- package/src/og/entity/Strip.js +77 -48
- package/src/og/entity/StripHandler.js +27 -27
- package/src/og/entity/index.js +8 -16
- package/src/og/input/KeyboardHandler.js +107 -104
- package/src/og/input/MouseHandler.js +81 -78
- package/src/og/input/TouchHandler.js +55 -51
- package/src/og/layer/BaseGeoImage.js +61 -30
- package/src/og/layer/CanvasTiles.js +26 -24
- package/src/og/layer/GeoImage.js +10 -10
- package/src/og/layer/GeoTexture2d.js +1 -1
- package/src/og/layer/GeoVideo.js +3 -3
- package/src/og/layer/KML.js +66 -40
- package/src/og/layer/Layer.js +27 -17
- package/src/og/layer/Material.js +93 -61
- package/src/og/layer/Vector.js +118 -72
- package/src/og/layer/WMS.js +36 -19
- package/src/og/layer/XYZ.js +55 -48
- package/src/og/light/LightSource.js +47 -40
- package/src/og/math/Line2.js +24 -24
- package/src/og/math/Line3.js +103 -102
- package/src/og/math/Mat3.js +134 -121
- package/src/og/math/Mat4.js +603 -459
- package/src/og/math/Plane.js +21 -20
- package/src/og/math/Quat.js +980 -927
- package/src/og/math/Ray.js +195 -187
- package/src/og/math/Vec2.js +127 -117
- package/src/og/math/Vec3.js +206 -176
- package/src/og/math/Vec4.js +49 -53
- package/src/og/math/coder.js +18 -18
- package/src/og/math.js +12 -12
- package/src/og/mercator.js +11 -11
- package/src/og/proj/EPSG3857.js +4 -4
- package/src/og/proj/EPSG4326.js +4 -4
- package/src/og/proj/Proj.js +31 -31
- package/src/og/quadTree/EntityCollectionNode.js +310 -300
- package/src/og/quadTree/Node.js +1008 -993
- package/src/og/renderer/Renderer.js +768 -747
- package/src/og/renderer/RendererEvents.js +9 -6
- package/src/og/scene/Axes.js +1 -1
- package/src/og/scene/BaseNode.js +8 -9
- package/src/og/scene/Planet.js +115 -87
- package/src/og/scene/RenderNode.js +29 -22
- package/src/og/scene/SkyBox.js +1 -1
- package/src/og/segment/Segment.js +1886 -1878
- package/src/og/segment/SegmentLonLat.js +298 -268
- package/src/og/segment/segmentHelper.js +11 -11
- package/src/og/shaders/bloom.js +1 -1
- package/src/og/shaders/blur.js +2 -2
- package/src/og/shaders/depth.js +1 -1
- package/src/og/shaders/geoObject.js +211 -0
- package/src/og/shaders/label.js +1 -1
- package/src/og/shaders/lumFilter.js +1 -1
- package/src/og/shaders/pointCloud.js +42 -42
- package/src/og/shaders/screenFrame.js +1 -1
- package/src/og/shaders/shape.js +15 -21
- package/src/og/shaders/skybox.js +37 -37
- package/src/og/shaders/toneMapping.js +1 -1
- package/src/og/shapes/BaseShape.js +129 -57
- package/src/og/shapes/Icosphere.js +30 -15
- package/src/og/shapes/Sphere.js +13 -16
- package/src/og/terrain/BilTerrain.js +2 -1
- package/src/og/terrain/EmptyTerrain.js +2 -2
- package/src/og/terrain/Geoid.js +2 -2
- package/src/og/terrain/GlobusTerrain.js +10 -10
- package/src/og/terrain/MapboxTerrain.js +1 -1
- package/src/og/utils/GeoImageCreator.js +9 -9
- package/src/og/utils/Loader.js +6 -6
- package/src/og/utils/NormalMapCreator.js +13 -13
- package/src/og/utils/TerrainWorker.js +1 -1
- package/src/og/utils/TextureAtlas.js +20 -22
- package/src/og/utils/VectorTileCreator.js +5 -5
- package/src/og/utils/earcut.js +1 -1
- package/src/og/utils/shared.js +15 -15
- package/src/og/webgl/Framebuffer.js +101 -53
- package/src/og/webgl/Handler.js +125 -85
- package/src/og/webgl/Multisample.js +55 -27
- package/src/og/webgl/Program.js +80 -35
- package/src/og/webgl/ProgramController.js +27 -23
- package/src/og/webgl/callbacks.js +8 -8
- package/types/Clock.d.ts +6 -2
- package/types/Deferred.d.ts +1 -1
- package/types/Events.d.ts +8 -4
- package/types/Extent.d.ts +37 -33
- package/types/Globe.d.ts +15 -13
- package/types/ImageCanvas.d.ts +5 -3
- package/types/LonLat.d.ts +24 -24
- package/types/Popup.d.ts +4 -0
- package/types/QueueArray.d.ts +6 -2
- package/types/Rectangle.d.ts +10 -4
- package/types/Stack.d.ts +4 -0
- package/types/ajax.d.ts +1 -1
- package/types/astro/earth.d.ts +3 -2
- package/types/bv/Box.d.ts +10 -5
- package/types/bv/Sphere.d.ts +13 -7
- package/types/camera/Camera.d.ts +90 -81
- package/types/camera/Frustum.d.ts +26 -22
- package/types/camera/PlanetCamera.d.ts +49 -53
- package/types/control/CompassButton.d.ts +4 -4
- package/types/control/Control.d.ts +7 -4
- package/types/control/DebugInfo.d.ts +3 -4
- package/types/control/EarthCoordinates.d.ts +6 -6
- package/types/control/EarthNavigation.d.ts +42 -0
- package/types/control/KeyboardNavigation.d.ts +3 -4
- package/types/control/LayerSwitcher.d.ts +3 -5
- package/types/control/Lighting.d.ts +3 -3
- package/types/control/MouseNavigation.d.ts +47 -0
- package/types/control/ScaleControl.d.ts +3 -3
- package/types/control/ShowFps.d.ts +3 -4
- package/types/control/SimpleNavigation.d.ts +3 -6
- package/types/control/Sun.d.ts +8 -10
- package/types/control/ToggleWireframe.d.ts +3 -3
- package/types/control/TouchNavigation.d.ts +48 -0
- package/types/control/ZoomControl.d.ts +3 -4
- package/types/control/index.d.ts +3 -1
- package/types/ellipsoid/Ellipsoid.d.ts +47 -43
- package/types/ellipsoid/wgs84.d.ts +3 -2
- package/types/entity/BaseBillboard.d.ts +41 -34
- package/types/entity/Billboard.d.ts +7 -7
- package/types/entity/BillboardHandler.d.ts +4 -0
- package/types/entity/Entity.d.ts +101 -83
- package/types/entity/EntityCollection.d.ts +57 -43
- package/types/entity/GeoObject.d.ts +111 -0
- package/types/entity/GeoObjectHandler.d.ts +77 -0
- package/types/entity/Geometry.d.ts +9 -7
- package/types/entity/GeometryHandler.d.ts +2 -2
- package/types/entity/Label.d.ts +24 -29
- package/types/entity/LabelHandler.d.ts +9 -2
- package/types/entity/LabelWorker.d.ts +9 -0
- package/types/entity/PointCloud.d.ts +8 -8
- package/types/entity/PointCloudHandler.d.ts +3 -3
- package/types/entity/Polyline.d.ts +58 -55
- package/types/entity/Ray.d.ts +19 -18
- package/types/entity/Strip.d.ts +8 -7
- package/types/entity/StripHandler.d.ts +3 -3
- package/types/entity/index.d.ts +7 -7
- package/types/input/KeyboardHandler.d.ts +10 -0
- package/types/input/MouseHandler.d.ts +5 -0
- package/types/input/TouchHandler.d.ts +5 -0
- package/types/layer/BaseGeoImage.d.ts +23 -35
- package/types/layer/CanvasTiles.d.ts +15 -22
- package/types/layer/GeoImage.d.ts +5 -18
- package/types/layer/GeoVideo.d.ts +5 -30
- package/types/layer/KML.d.ts +20 -15
- package/types/layer/Layer.d.ts +326 -0
- package/types/layer/Material.d.ts +45 -0
- package/types/layer/Vector.d.ts +208 -0
- package/types/layer/WMS.d.ts +4 -7
- package/types/layer/XYZ.d.ts +19 -25
- package/types/light/LightSource.d.ts +54 -53
- package/types/math/Line2.d.ts +11 -0
- package/types/math/Line3.d.ts +10 -0
- package/types/math/Mat3.d.ts +30 -18
- package/types/math/Mat4.d.ts +71 -52
- package/types/math/Plane.d.ts +5 -4
- package/types/math/Quat.d.ts +379 -0
- package/types/math/Ray.d.ts +82 -0
- package/types/math/Vec2.d.ts +102 -101
- package/types/math/Vec3.d.ts +143 -142
- package/types/math/Vec4.d.ts +40 -39
- package/types/math/coder.d.ts +12 -11
- package/types/math.d.ts +8 -8
- package/types/mercator.d.ts +3 -3
- package/types/proj/EPSG3857.d.ts +3 -2
- package/types/proj/EPSG4326.d.ts +3 -2
- package/types/proj/Proj.d.ts +42 -0
- package/types/quadTree/EntityCollectionNode.d.ts +34 -0
- package/types/quadTree/Node.d.ts +61 -0
- package/types/renderer/Renderer.d.ts +300 -0
- package/types/renderer/RendererEvents.d.ts +10 -7
- package/types/scene/BaseNode.d.ts +9 -9
- package/types/scene/Planet.d.ts +131 -126
- package/types/scene/RenderNode.d.ts +22 -23
- package/types/segment/Segment.d.ts +279 -0
- package/types/segment/SegmentLonLat.d.ts +16 -0
- package/types/shaders/geoObject.d.ts +3 -0
- package/types/shapes/BaseShape.d.ts +43 -40
- package/types/shapes/Sphere.d.ts +7 -7
- package/types/terrain/BilTerrain.d.ts +0 -1
- package/types/terrain/EmptyTerrain.d.ts +4 -4
- package/types/terrain/GlobusTerrain.d.ts +17 -54
- package/types/terrain/MapboxTerrain.d.ts +0 -1
- package/types/utils/GeoImageCreator.d.ts +3 -2
- package/types/utils/TextureAtlas.d.ts +8 -8
- package/types/utils/shared.d.ts +25 -24
- package/types/webgl/Framebuffer.d.ts +5 -5
- package/types/webgl/Handler.d.ts +68 -43
- package/types/webgl/Multisample.d.ts +5 -5
- package/types/webgl/Program.d.ts +8 -2
- package/types/webgl/ProgramController.d.ts +18 -13
- package/src/og/inherits.js +0 -8
- package/src/og/utils/polylabel.js +0 -176
- package/types/inherits.d.ts +0 -4
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
* @module og/entity/Geometry
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
"use strict";
|
|
6
6
|
|
|
7
|
-
import * as utils from
|
|
8
|
-
import { Extent } from
|
|
9
|
-
import { Vec4 } from
|
|
10
|
-
import { LonLat } from
|
|
7
|
+
import * as utils from "../utils/shared.js";
|
|
8
|
+
import { Extent } from "../Extent.js";
|
|
9
|
+
import { Vec4 } from "../math/Vec4.js";
|
|
10
|
+
import { LonLat } from "../LonLat.js";
|
|
11
11
|
|
|
12
12
|
const GeometryType = {
|
|
13
13
|
POINT: 1,
|
|
@@ -27,7 +27,7 @@ class Geometry {
|
|
|
27
27
|
/**
|
|
28
28
|
* Entity instance that holds this geometry.
|
|
29
29
|
* @protected
|
|
30
|
-
* @type {
|
|
30
|
+
* @type {Entity}
|
|
31
31
|
*/
|
|
32
32
|
this._entity = null;
|
|
33
33
|
|
|
@@ -58,15 +58,27 @@ class Geometry {
|
|
|
58
58
|
|
|
59
59
|
this._type = (options.type && Geometry.getType(options.type)) || GeometryType.POINT;
|
|
60
60
|
this._coordinates = [];
|
|
61
|
-
this._extent = Geometry.getExtent(
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
this._extent = Geometry.getExtent(
|
|
62
|
+
{
|
|
63
|
+
type: options.type || "Point",
|
|
64
|
+
coordinates: options.coordinates || []
|
|
65
|
+
},
|
|
66
|
+
this._coordinates
|
|
67
|
+
);
|
|
65
68
|
|
|
66
69
|
this._style = options.style || {};
|
|
67
|
-
this._style.fillColor = utils.createColorRGBA(
|
|
68
|
-
|
|
69
|
-
|
|
70
|
+
this._style.fillColor = utils.createColorRGBA(
|
|
71
|
+
options.style.fillColor,
|
|
72
|
+
new Vec4(0.19, 0.62, 0.85, 0.4)
|
|
73
|
+
);
|
|
74
|
+
this._style.lineColor = utils.createColorRGBA(
|
|
75
|
+
options.style.lineColor,
|
|
76
|
+
new Vec4(0.19, 0.62, 0.85, 1)
|
|
77
|
+
);
|
|
78
|
+
this._style.strokeColor = utils.createColorRGBA(
|
|
79
|
+
options.style.strokeColor,
|
|
80
|
+
new Vec4(1, 1, 1, 0.95)
|
|
81
|
+
);
|
|
70
82
|
this._style.lineWidth = options.style.lineWidth || 3;
|
|
71
83
|
this._style.strokeWidth = options.style.strokeWidth || 0;
|
|
72
84
|
|
|
@@ -95,8 +107,8 @@ class Geometry {
|
|
|
95
107
|
* Returns geometry feature extent.
|
|
96
108
|
@static
|
|
97
109
|
@param {Object} geometryObj - GeoJSON style geometry feature.
|
|
98
|
-
@param {
|
|
99
|
-
@returns {
|
|
110
|
+
@param {LonLat[]} outCoordinates - Geometry feature coordinates clone.
|
|
111
|
+
@returns {Extent} -
|
|
100
112
|
*/
|
|
101
113
|
static getExtent(geometryObj, outCoordinates) {
|
|
102
114
|
var res = new Extent(new LonLat(180.0, 90.0), new LonLat(-180.0, -90.0));
|
|
@@ -110,9 +122,7 @@ class Geometry {
|
|
|
110
122
|
res.northEast.lon = lon;
|
|
111
123
|
res.northEast.lat = lat;
|
|
112
124
|
outCoordinates && (outCoordinates[0] = lon) && (outCoordinates[1] = lat);
|
|
113
|
-
|
|
114
125
|
} else if (t === GeometryType.LINESTRING) {
|
|
115
|
-
|
|
116
126
|
let c = geometryObj.coordinates;
|
|
117
127
|
for (let i = 0; i < c.length; i++) {
|
|
118
128
|
let lon = c[i][0],
|
|
@@ -123,9 +133,7 @@ class Geometry {
|
|
|
123
133
|
if (lat > res.northEast.lat) res.northEast.lat = lat;
|
|
124
134
|
outCoordinates && (outCoordinates[i] = [lon, lat]);
|
|
125
135
|
}
|
|
126
|
-
|
|
127
136
|
} else if (t === GeometryType.POLYGON) {
|
|
128
|
-
|
|
129
137
|
let c = geometryObj.coordinates;
|
|
130
138
|
for (let i = 0; i < c.length; i++) {
|
|
131
139
|
let ci = c[i];
|
|
@@ -141,9 +149,7 @@ class Geometry {
|
|
|
141
149
|
outCoordinates && (outCoordinates[i][j] = [lon, lat]);
|
|
142
150
|
}
|
|
143
151
|
}
|
|
144
|
-
|
|
145
152
|
} else if (t === GeometryType.MULTIPOLYGON) {
|
|
146
|
-
|
|
147
153
|
let p = geometryObj.coordinates;
|
|
148
154
|
for (let i = 0; i < p.length; i++) {
|
|
149
155
|
let pi = p[i];
|
|
@@ -163,9 +169,7 @@ class Geometry {
|
|
|
163
169
|
}
|
|
164
170
|
}
|
|
165
171
|
}
|
|
166
|
-
|
|
167
172
|
} else if (t === GeometryType.MULTILINESTRING) {
|
|
168
|
-
|
|
169
173
|
let c = geometryObj.coordinates;
|
|
170
174
|
for (let i = 0; i < c.length; i++) {
|
|
171
175
|
let ci = c[i];
|
|
@@ -181,10 +185,9 @@ class Geometry {
|
|
|
181
185
|
outCoordinates && (outCoordinates[i][j] = [lon, lat]);
|
|
182
186
|
}
|
|
183
187
|
}
|
|
184
|
-
|
|
185
188
|
} else {
|
|
186
189
|
res.southWest.lon = res.southWest.lat = res.northEast.lon = res.northEast.lat = 0.0;
|
|
187
|
-
outCoordinates && (outCoordinates[0] =
|
|
190
|
+
outCoordinates && (outCoordinates[0] = 0) && (outCoordinates[1] = 0);
|
|
188
191
|
}
|
|
189
192
|
return res;
|
|
190
193
|
}
|
|
@@ -311,6 +314,6 @@ class Geometry {
|
|
|
311
314
|
getType() {
|
|
312
315
|
return this._type;
|
|
313
316
|
}
|
|
314
|
-
}
|
|
317
|
+
}
|
|
315
318
|
|
|
316
319
|
export { Geometry, GeometryType };
|