Skip to content

Commit 3250687

Browse files
committed
同步代码
1 parent 136b75d commit 3250687

File tree

7 files changed

+32
-23
lines changed

7 files changed

+32
-23
lines changed

public/lib/mars3d/mars3d.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* Mars3D三维可视化平台 mars3d
33
*
4-
* 版本信息:v3.9.9
5-
* 编译日期:2025-05-07 14:01
4+
* 版本信息:v3.9.10
5+
* 编译日期:2025-05-11 11:07
66
* 版权所有:Copyright by 火星科技 http://mars3d.cn
77
* 使用单位:火星科技免费公开版 ,2025-02-01
88
*/

public/lib/mars3d/mars3d.d.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/**
33
* Mars3D三维可视化平台 mars3d
44
*
5-
* 版本信息:v3.9.9
6-
* 编译日期:2025-05-07 14:01
5+
* 版本信息:v3.9.10
6+
* 编译日期:2025-05-11 11:07
77
* 版权所有:Copyright by 火星科技 http://mars3d.cn
88
* 使用单位:火星科技免费公开版 ,2025-02-01
99
*/
@@ -21212,6 +21212,7 @@ declare namespace VideoPrimitive {
2121221212
* @param options.positions - 坐标位置
2121321213
* @param options.style - 样式信息
2121421214
* @param [options.attr] - 附件的属性信息,可以任意附加属性,导出geojson或json时会自动处理导出。
21215+
* @param [options.grids = 4] - 网格行列数
2121521216
* @param [options.positions_grid] - 历史编辑的网格坐标点,用于json导出导入
2121621217
* @param [options.play = true] - 初始化后默认是播放还是停止状态
2121721218
* @param [options.synchronizer] - 是否内部加VideoSynchronizer同步时钟
@@ -21246,6 +21247,7 @@ declare class VideoPrimitive extends BasePolyPrimitive {
2124621247
positions: LngLatPoint[] | Cesium.Cartesian3[] | any[];
2124721248
style: VideoPrimitive.StyleOptions | any;
2124821249
attr?: any | BaseGraphic.AjaxAttr;
21250+
grids?: number;
2124921251
positions_grid?: Cesium.Cartesian3[];
2125021252
play?: boolean;
2125121253
synchronizer?: boolean;
@@ -29921,7 +29923,7 @@ declare class Map extends BaseClass {
2992129923
*/
2992229924
onlyPickTerrainPosition: boolean;
2992329925
/**
29924-
* 是否开启顶点吸附功能,只拾取顶点上的点
29926+
* 是否开启顶点吸附功能,只拾取顶点上的点(仅3D模式下、切相机视角高度低于1000000时有效)
2992529927
*/
2992629928
onlyVertexPosition: boolean;
2992729929
/**

public/lib/mars3d/mars3d.js

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/example/graphic/combine/box/map.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,10 @@ export function addRandomGraphicByCount(count) {
9696
// graphic.offsetHeight = height
9797
// }, 10)
9898

99-
100-
// graphic.setColorStyle({ color: Cesium.Color.fromCssColorString("#ff0000").withAlpha(0.1) }, 1)
101-
99+
// 演示:设置颜色
100+
// graphic.readyPromise.then(() => {
101+
// graphic.setColorStyle({ color: "#ff0000" }, 0)
102+
// })
102103

103104
graphicLayer.enabledEvent = true // 恢复事件
104105
return result.points.length

src/example/graphic/primitive/polygon/map.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ function addDemoGraphic7(graphicLayer) {
255255
// 面状:碎石面效果
256256
function addDemoGraphic8(graphicLayer) {
257257
const graphic = new mars3d.graphic.PolygonPrimitive({
258+
unit: "mu",
258259
positions: [
259260
[117.275127, 31.839641, 25.1],
260261
[117.291876, 31.83181, 23.6],

src/example/graphic/primitive/polyline-tower/map.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -199,18 +199,17 @@ function drawWireTowerModel(position, degree, scale, item) {
199199
}
200200

201201
function drawWireTowerJYZModel(position, degree) {
202-
// cesium v1.123渲染报错,暂时注释了
203-
// const graphic2 = new mars3d.graphic.ModelPrimitive({
204-
// position,
205-
// style: {
206-
// url: "https://data.mars3d.cn/gltf/mars/tower/tower-jyz.glb",
207-
// heading: degree,
208-
// pitch: 90, // 模型本身不是竖直,需要加pitch纠正
209-
// scale: 1,
210-
// distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 4000.0)
211-
// }
212-
// })
213-
// graphicLayer.addGraphic(graphic2)
202+
const graphic2 = new mars3d.graphic.ModelPrimitive({
203+
position,
204+
style: {
205+
url: "https://data.mars3d.cn/gltf/mars/tower/tower-jyz.glb",
206+
heading: degree,
207+
pitch: 90, // 模型本身不是竖直,需要加pitch纠正
208+
scale: 1,
209+
distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 4000.0)
210+
}
211+
})
212+
graphicLayer.addGraphic(graphic2)
214213
}
215214

216215
function drawGuideLine(positions, color) {

src/example/graphic/video/video-edit/map.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ function addDemoGraphic1(graphicLayer) {
5252
[117.204087, 31.842668, 43.6],
5353
[117.204827, 31.842712, 43.6]
5454
],
55+
grids: 4,
5556
style: {
5657
url: "https://data.mars3d.cn/file/video/lukou.mp4",
5758
opacity: 0.9,

0 commit comments

Comments
 (0)