From a293246c07e5cc9940fa2985a135e4b58c1acc0f Mon Sep 17 00:00:00 2001
From: zh <972939975@qq.com>
Date: Fri, 22 Aug 2025 16:05:40 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Obj/Base/TrajectoryMotion/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Obj/Base/TrajectoryMotion/index.js b/src/Obj/Base/TrajectoryMotion/index.js
index e02a63a..167135a 100644
--- a/src/Obj/Base/TrajectoryMotion/index.js
+++ b/src/Obj/Base/TrajectoryMotion/index.js
@@ -2087,7 +2087,7 @@ class TrajectoryMotion extends Base {
rubricElm.style.color = '#ff5733';
rubricElm.style.display = 'none'
- rubricElm.innerHTML = `场景正北方向为轨迹前进正方向`
+ rubricElm.innerHTML = `场景正东方向为轨迹前进正方向`
let iconRubric = contentElm.getElementsByClassName('icon-rubric')[0]
iconRubric.addEventListener('mouseenter', (e) => {
rubricElm.style.display = 'block'
From 97c0d13a886721b49a28cf9bfb76f1d87bd203bf Mon Sep 17 00:00:00 2001
From: zh <972939975@qq.com>
Date: Fri, 22 Aug 2025 17:36:45 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=8C=E4=B8=89=E7=BB=B4=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5=E5=BA=95=E5=9B=BE=E9=80=8F=E6=98=8E=E5=BA=A6=EF=BC=8C?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E7=94=B5=E5=AD=90=E5=9B=B4=E5=A2=99=E4=BA=8C?=
=?UTF-8?q?=E7=BB=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Global/MultiViewportMode/index.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/Global/MultiViewportMode/index.js b/src/Global/MultiViewportMode/index.js
index 53ec9c0..9e61089 100644
--- a/src/Global/MultiViewportMode/index.js
+++ b/src/Global/MultiViewportMode/index.js
@@ -49,7 +49,11 @@ async function init(sdk) {
sdk2D.viewer.imageryLayers.removeAll()
for (let i = 0; i < imageryLayers.length; i++) {
let entity = sdk2D.viewer.imageryLayers.addImageryProvider(imageryLayers[i].imageryProvider, imageryLayers[i]._layerIndex)
+ if(imageryLayers[i]._id) {
+ entity._id = imageryLayers[i]._id
+ }
entity.show = imageryLayers[i].show
+ entity.alpha = imageryLayers[i].alpha
if (imageryLayers[i]._objectState) {
if (imageryLayers[i]._showView == 3) {
entity.show = false
@@ -136,7 +140,7 @@ async function syncData2(sdk, id, entityId) {
options.height = 0
}
- if (!that.type || (that.type !== 'tileset' && that.type !== 'bim' && that.type !== 'glb' && that.type !== 'layer')) {
+ if (!that.type || (that.type !== 'tileset' && that.type !== 'bim' && that.type !== 'glb' && that.type !== 'layer' && that.type !== 'wallStereoscopic')) {
if (that.showView == 3) {
options.show = false
}
@@ -227,7 +231,7 @@ async function syncData2(sdk, id, entityId) {
obj.options.heightReference = 1
}
let options = syncObject.tools.deepCopyObj(obj.options)
- if (!obj.type || (obj.type !== 'tileset' && obj.type !== 'bim' && obj.type !== 'glb' && obj.type !== 'layer')) {
+ if (!obj.type || (obj.type !== 'tileset' && obj.type !== 'bim' && obj.type !== 'glb' && obj.type !== 'layer' && obj.type !== 'wallStereoscopic')) {
if (obj.showView == 3) {
options.show = false
}
From 2d1bc61cca6541882ecaef018717a2134c0ab611 Mon Sep 17 00:00:00 2001
From: zh <972939975@qq.com>
Date: Fri, 22 Aug 2025 17:40:31 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=8C=E4=B8=89=E7=BB=B4=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5=E5=BA=95=E5=9B=BE=E9=80=8F=E6=98=8E=E5=BA=A6=EF=BC=8C?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E7=94=B5=E5=AD=90=E5=9B=B4=E5=A2=99=E4=BA=8C?=
=?UTF-8?q?=E7=BB=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Obj/Base/BaseSource/BaseLayer/index.js | 15 +++++++++++++--
src/Obj/Base/index.js | 4 ++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/Obj/Base/BaseSource/BaseLayer/index.js b/src/Obj/Base/BaseSource/BaseLayer/index.js
index f4a0a79..083fd74 100644
--- a/src/Obj/Base/BaseSource/BaseLayer/index.js
+++ b/src/Obj/Base/BaseSource/BaseLayer/index.js
@@ -9,7 +9,7 @@
import Dialog from '../../../Element/Dialog';
import CoordTransform from "../../../../transform/CoordTransform";
import BaseSource from "../index";
-import { syncData } from '../../../../Global/MultiViewportMode'
+import { syncData, get2DView } from '../../../../Global/MultiViewportMode'
import { setSplitDirection, syncSplitData } from '../../../../Global/SplitScreen'
import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../Global/global'
@@ -244,8 +244,19 @@ class BaseLayer extends BaseSource {
this.originalOptions = this.deepCopyObj(this.options)
this._DialogObject.close()
this.Dialog.confirmCallBack && this.Dialog.confirmCallBack(this.originalOptions)
- syncData(this.sdk, this.options.id)
+ // syncData(this.sdk, this.options.id)
syncSplitData(this.sdk, this.options.id)
+ let sdk2D = get2DView()
+ if (sdk2D && sdk2D != this.sdk) {
+ for(let i=0;i {
this.reset()
diff --git a/src/Obj/Base/index.js b/src/Obj/Base/index.js
index 3f16db4..fedb92a 100644
--- a/src/Obj/Base/index.js
+++ b/src/Obj/Base/index.js
@@ -290,7 +290,7 @@ class Base extends Tools {
let destination = Cesium.Cartesian3.fromDegrees(lng, lat, alt)
let position = { lng: 0, lat: 0 }
- if (this.options.position) {
+ if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
position = { ...this.options.position }
}
else if (this.options.positions) {
@@ -436,7 +436,7 @@ class Base extends Tools {
let position = { lng: 0, lat: 0 }
let relativePosition = { ...cameraPosition84 }
- if (this.options.position) {
+ if (this.options.position && Object.prototype.toString.call(this.options.position) === '[object Object]') {
position = { ...this.options.position }
}
else if (this.options.positions) {
From 1ea59d0f8ae6b927f89cdf2d57e0054a1ac15c95 Mon Sep 17 00:00:00 2001
From: zh <972939975@qq.com>
Date: Fri, 22 Aug 2025 17:42:42 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BA=8C=E4=B8=89=E7=BB=B4=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5=E5=BA=95=E5=9B=BE=E9=80=8F=E6=98=8E=E5=BA=A6=EF=BC=8C?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E7=94=B5=E5=AD=90=E5=9B=B4=E5=A2=99=E4=BA=8C?=
=?UTF-8?q?=E7=BB=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Obj/Base/WallStereoscopic/index.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/Obj/Base/WallStereoscopic/index.js b/src/Obj/Base/WallStereoscopic/index.js
index 938f2c1..49a0edf 100644
--- a/src/Obj/Base/WallStereoscopic/index.js
+++ b/src/Obj/Base/WallStereoscopic/index.js
@@ -88,6 +88,10 @@ class WallStereoscopic extends Base {
}
}
+ get type() {
+ return 'wallStereoscopic'
+ }
+
static createLabel(that) {
// 标签
that.label = new LabelObject(that.sdk, {
From 18cec0d74246f7bc2bef6a962c73e00d58665f04 Mon Sep 17 00:00:00 2001
From: zh <972939975@qq.com>
Date: Fri, 22 Aug 2025 17:44:32 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9D=90?=
=?UTF-8?q?=E8=B4=A8=E9=A2=9C=E8=89=B2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Obj/Materail/WallMaterialProperty.js | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/Obj/Materail/WallMaterialProperty.js b/src/Obj/Materail/WallMaterialProperty.js
index b71c889..bda11b0 100644
--- a/src/Obj/Materail/WallMaterialProperty.js
+++ b/src/Obj/Materail/WallMaterialProperty.js
@@ -70,7 +70,7 @@ function StreamWall1() {
fragColor.rgb = color.rgb / 1.0;\n\
fragColor = czm_gammaCorrect(fragColor);\n\
material.alpha = colorImage.a * color.a;\n\
- material.diffuse = (colorImage.rgb+color.rgb)/2.0;\n\
+ material.diffuse = color.rgb/20.0;\n\
material.emission = fragColor.rgb;\n\
return material;\n\
}";
@@ -208,6 +208,14 @@ function StreamWall2() {
Property.equals(this.repeat, other._repeat) &&
Property.equals(this.repeats, other._repeats)
};
+ // let code2 = 'material.diffuse = color.rgb*1.0;'
+ // if (uniforms.is2D) {
+ // code2 = `
+ // material.diffuse = color.rgb*0.0;
+ // material.emission = color.rgb * 1.0;
+ // `
+ // }
+ // console.log(code2, uniforms.is2D)
// 将定义的材质对象添加到cesium的材质队列中
Material._materialCache.addMaterial(MaterialType, {
fabric: {
@@ -230,8 +238,8 @@ function StreamWall2() {
else {
material.alpha = 1.0;
}
- material.diffuse = colorImage.rgb*color.rgb*0.0;
- material.emission = colorImage.rgb*color.rgb * 1.4;
+ material.diffuse = color.rgb*0.0;
+ material.emission = color.rgb * 1.0;
return material;
}`,
components: {