From 62adaee3aad29388d3599ac432eeadeaa2d6b4cd Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Mon, 22 Nov 2021 16:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../model/info/mark/model-info-mark.ts | 6 +-
src/app/babylon/tool/gizmo-tool.ts | 1 +
.../view/building-window/building-window.ts | 4 +-
.../view/facility-window/facility-window.ts | 7 +-
.../babylon/view/mark-window/mark-window.ts | 4 +-
src/assets/mesh/mark/disaster/lyx/LYX.bin | Bin 4808 -> 4656 bytes
src/assets/mesh/mark/disaster/lyx/LYX.gltf | 90 +++---------------
7 files changed, 27 insertions(+), 85 deletions(-)
diff --git a/src/app/babylon/model/info/mark/model-info-mark.ts b/src/app/babylon/model/info/mark/model-info-mark.ts
index f7e62c0..1522d22 100644
--- a/src/app/babylon/model/info/mark/model-info-mark.ts
+++ b/src/app/babylon/model/info/mark/model-info-mark.ts
@@ -12,6 +12,7 @@ import { SceneManager } from "src/app/babylon/controller/scene-manager";
import { UIManager } from "src/app/babylon/controller/ui-manager";
import { BabylonTool } from "src/app/babylon/tool/babylon-tool";
import { BabylonUIStyleTool } from "src/app/babylon/tool/babylon-ui-style-tool";
+import { GizmoTool } from "src/app/babylon/tool/gizmo-tool";
import { ParticleSystemTool } from "src/app/babylon/tool/particle-system-tool";
import { TsTool } from "src/app/babylon/tool/ts-tool";
import { MarkWindow } from "src/app/babylon/view/mark-window/mark-window";
@@ -209,18 +210,21 @@ export class ModelInfo_mark extends ModelInfo {
else {
//this.pointerDragBehavior.enabled = true;
}
-
+ GizmoTool.onPickMeshInfoObservable.notifyObservers(this);
// SceneManager.Instance.defaultCamera.target = this.modelBox.absolutePosition.clone()
// SceneManager.Instance.defaultCamera.setTarget(this.modelBox.absolutePosition.clone());
}
else {
+ //GizmoTool.onPickMeshInfoObservable.notifyObservers(null);
SceneManager.Instance.removeFromHighLight(this.modelBox as Mesh)
if (this.pointerDragBehavior != null) {
//this.pointerDragBehavior.enabled = false; //停止拖拽
}
}
+
+
let eventType: MarkInfoChangeType = select ? MarkInfoChangeType.Select : MarkInfoChangeType.UnSelect;
Event_MarkInfoChange.dispatch(eventType, this);
diff --git a/src/app/babylon/tool/gizmo-tool.ts b/src/app/babylon/tool/gizmo-tool.ts
index a88eb6a..0ebea4d 100644
--- a/src/app/babylon/tool/gizmo-tool.ts
+++ b/src/app/babylon/tool/gizmo-tool.ts
@@ -177,6 +177,7 @@ export class GizmoTool {
//改变gizmo目标mesh
static onChangeGizmoAim(modelInfo: ModelInfo) {
+ // console.trace("改变目标", modelInfo);
let mesh = null;
GizmoTool.s_nowPickAim = modelInfo;
diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts
index 9285571..cbb19de 100644
--- a/src/app/babylon/view/building-window/building-window.ts
+++ b/src/app/babylon/view/building-window/building-window.ts
@@ -951,7 +951,9 @@ export class BuildingWindow extends UIBase {
*/
private findUVMat(mesh: AbstractMesh) {
let result = [];
-
+ if (mesh == null) {
+ return result;
+ }
let childMesh = mesh.getChildMeshes();
childMesh.push(mesh);
diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts
index 8d68f96..619f341 100644
--- a/src/app/babylon/view/facility-window/facility-window.ts
+++ b/src/app/babylon/view/facility-window/facility-window.ts
@@ -254,14 +254,15 @@ export class FacilityWindow extends UIBase {
return;
}
}
- if (!SceneManager.s_isPointerDrag && !ToolbarWindow.instance.isMeshAdsorb) {
- GizmoTool.onPickMeshInfoObservable.notifyObservers(null);//取消之前选择
- }
+ // if (!SceneManager.s_isPointerDrag && !ToolbarWindow.instance.isMeshAdsorb) {
+ // GizmoTool.onPickMeshInfoObservable.notifyObservers(null);//取消之前选择
+ // }
}
else { //右键取消
if (!SceneManager.s_isPointerDrag)//不是拖拽
{
instance.three.unSelectBottomIcon();
+ GizmoTool.onPickMeshInfoObservable.notifyObservers(null);//取消之前选择
}
}
diff --git a/src/app/babylon/view/mark-window/mark-window.ts b/src/app/babylon/view/mark-window/mark-window.ts
index 45cada3..aade914 100644
--- a/src/app/babylon/view/mark-window/mark-window.ts
+++ b/src/app/babylon/view/mark-window/mark-window.ts
@@ -502,11 +502,11 @@ export class MarkWindow extends UIBase {
// markInfo.markData //通知前端 最后需要其调用 selectMarkData
selectMarkDataFrom3d(markInfo: ModelInfo_mark, select: boolean) {
if (select) {
- //PlanComponent.instance.selectSandTableMark(markInfo.markData, select)
+ PlanComponent.instance.selectSandTableMark(markInfo.markData, select)
}
else {
if (markInfo != null) {
- //PlanComponent.instance.selectSandTableMark(markInfo.markData, select)
+ PlanComponent.instance.selectSandTableMark(markInfo.markData, select)
}
}
diff --git a/src/assets/mesh/mark/disaster/lyx/LYX.bin b/src/assets/mesh/mark/disaster/lyx/LYX.bin
index 5865caa94c001cf57f5b5937367173ea9baf9831..5f604842f4e18be1ffa9393ebe1070dd2d305227 100644
GIT binary patch
literal 4656
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
literal 4808
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
CIeo(b
diff --git a/src/assets/mesh/mark/disaster/lyx/LYX.gltf b/src/assets/mesh/mark/disaster/lyx/LYX.gltf
index 4ae107c..019a829 100644
--- a/src/assets/mesh/mark/disaster/lyx/LYX.gltf
+++ b/src/assets/mesh/mark/disaster/lyx/LYX.gltf
@@ -14,26 +14,19 @@
{
"name" : "Scene",
"nodes" : [
- 1
+ 0
]
}
],
"nodes" : [
{
"mesh" : 0,
- "name" : "Head",
+ "name" : "XL",
"translation" : [
0,
- 0.07907678186893463,
+ 0.05785634368658066,
0
]
- },
- {
- "children" : [
- 0
- ],
- "mesh" : 1,
- "name" : "XL"
}
],
"materials" : [
@@ -62,7 +55,7 @@
],
"meshes" : [
{
- "name" : "\u7acb\u65b9\u4f53",
+ "name" : "\u5e73\u9762.001",
"primitives" : [
{
"attributes" : {
@@ -81,30 +74,6 @@
}
},
"indices" : 3,
- "mode" : 4
- }
- ]
- },
- {
- "name" : "\u5e73\u9762",
- "primitives" : [
- {
- "attributes" : {
- "POSITION" : 4,
- "NORMAL" : 5,
- "TEXCOORD_0" : 6
- },
- "extensions" : {
- "KHR_draco_mesh_compression" : {
- "bufferView" : 1,
- "attributes" : {
- "POSITION" : 0,
- "NORMAL" : 1,
- "TEXCOORD_0" : 2
- }
- }
- },
- "indices" : 7,
"material" : 0,
"mode" : 4
}
@@ -143,48 +112,18 @@
}
],
"accessors" : [
- {
- "componentType" : 5126,
- "count" : 14,
- "max" : [
- 0.030580827966332436,
- -0.010741879232227802,
- -0.01707027480006218
- ],
- "min" : [
- 0.030580827966332436,
- -0.010741879232227802,
- -0.01707027480006218
- ],
- "type" : "VEC3"
- },
- {
- "componentType" : 5126,
- "count" : 14,
- "type" : "VEC3"
- },
- {
- "componentType" : 5126,
- "count" : 14,
- "type" : "VEC2"
- },
- {
- "componentType" : 5123,
- "count" : 36,
- "type" : "SCALAR"
- },
{
"componentType" : 5126,
"count" : 625,
"max" : [
- 0.792946457862854,
- 0.056096985936164856,
- 0.8005661368370056
+ 0.5226746797561646,
+ 0.03699751943349838,
+ 0.5276780724525452
],
"min" : [
- -0.7526898384094238,
- -0.12031548470258713,
- -0.7799251079559326
+ -0.49612128734588623,
+ -0.07930368185043335,
+ -0.5140728950500488
],
"type" : "VEC3"
},
@@ -207,13 +146,8 @@
"bufferViews" : [
{
"buffer" : 0,
- "byteLength" : 197,
+ "byteLength" : 4656,
"byteOffset" : 0
- },
- {
- "buffer" : 0,
- "byteLength" : 4608,
- "byteOffset" : 200
}
],
"samplers" : [
@@ -224,7 +158,7 @@
],
"buffers" : [
{
- "byteLength" : 4808,
+ "byteLength" : 4656,
"uri" : "LYX.bin"
}
]