From 81bc202e7d04fdbc3b5a86d8b7607346e53018da Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Thu, 11 Nov 2021 16:00:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../facilityinfo-ui-item.ts | 4 ++--
.../facilityinfoinscene-window.ts | 17 ++++++++++-------
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts
index 5df9528..f9126ba 100644
--- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts
+++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts
@@ -100,9 +100,9 @@ export class FacilityInfoUIItem {
this.facilityInfoInSceneWindow.selectFacilityItemToThree([this], false);
if (!this.facilityInfoInSceneWindow.getFacilityUIShowType(this.getType())) {
this.modelInfo.setIconEnable(select);
- this.facilityInfoInSceneWindow.playJYJSelectEffect(select, this.modelInfo)
- }
+ }
+ this.facilityInfoInSceneWindow.playJYJSelectEffect(select, this.modelInfo)
}
}
diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
index ec58012..91dc478 100644
--- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
+++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
@@ -165,10 +165,13 @@ export class FacilityInfoInSceneWindow extends UIBase {
if (isChecked) { //选中
this.three.beforeOnefacilityInfo = facilityInfoUIItem[0].getID();
this.three.getPropertyData(facilityInfoUIItem[0])
+ console.log("通知前端选中设备", facilityInfoUIItem[0]);
} else { //取消选中
// this.three.isShowRightNature = false
this.three.beforeOnefacilityInfo = null
+
}
+
}
}
@@ -543,14 +546,14 @@ export class FacilityInfoInSceneWindow extends UIBase {
*/
playJYJSelectEffect(play: boolean, facilityInfo: ModelInfo_facility) {
- if (play) {
- let facilityData = facilityInfo.modelData as ModelData_facility;
- if (facilityData.facilityType != FacilityType.JY_JYJ &&
- facilityData.facilityType != FacilityType.JY_YG) {
- //只有加油机和油罐有高亮显示
- return;
- }
+ //if (play) {
+ let facilityData = facilityInfo.modelData as ModelData_facility;
+ if (facilityData.facilityType != FacilityType.JY_JYJ &&
+ facilityData.facilityType != FacilityType.JY_YG) {
+ //只有加油机和油罐有高亮显示和取消
+ return;
}
+ //}
if (play) {
From bf8315c914cd3755f9df5dd91db67a5c83605680 Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Thu, 11 Nov 2021 16:49:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/babylon/controller/mode-manager.ts | 8 ++++----
src/app/babylon/controller/scene-manager.ts | 2 +-
src/app/babylon/model/info/model/model-info-building.ts | 9 ++++++++-
src/app/babylon/tool/gizmo-tool.ts | 2 +-
src/app/babylon/view/building-window/building-window.ts | 3 ---
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/app/babylon/controller/mode-manager.ts b/src/app/babylon/controller/mode-manager.ts
index 5bf14b6..4f3c9fd 100644
--- a/src/app/babylon/controller/mode-manager.ts
+++ b/src/app/babylon/controller/mode-manager.ts
@@ -15,15 +15,15 @@ export enum ModeType {
export class ModeManager {
/**
- * 当前模式的类型（编辑模式代表内部编辑人员，可新增单位、上传模型，查看模式代表交付的模式）
+ * 当前模式的类型
* 外部使用 currentMode 属性访问和修改
*/
private static s_currentMode: ModeType = ModeType.Edit;
/**
- * 高级权限，表示某些高级功能的开放
+ * 制作模式代表内部编辑人员，可新增单位、上传模型，查看模式代表交付的模式
*/
- public static highPower = true;
+ public static s_isMakeMode = true;
/**
* 调试模式
@@ -52,7 +52,7 @@ export class ModeManager {
//#endregion
/**
- * 获取当前模式的类型
+ * 获取当前模式的类型（查看或编辑，用户权限有关）
*/
static get currentMode(): ModeType {
return ModeManager.s_currentMode;
diff --git a/src/app/babylon/controller/scene-manager.ts b/src/app/babylon/controller/scene-manager.ts
index c285922..cb7899e 100644
--- a/src/app/babylon/controller/scene-manager.ts
+++ b/src/app/babylon/controller/scene-manager.ts
@@ -476,7 +476,7 @@ export class SceneManager {
) {
// console.log("准备加载");
- let defaultMesh = MeshBuilder.CreateBox(modelData.key, { size: 0.01 });
+ let defaultMesh = MeshBuilder.CreateBox(modelData.key + "Box", { size: 0.01 });
defaultMesh.scaling.y = 0.01;
defaultMesh.visibility = 0;
diff --git a/src/app/babylon/model/info/model/model-info-building.ts b/src/app/babylon/model/info/model/model-info-building.ts
index 337a043..68345d8 100644
--- a/src/app/babylon/model/info/model/model-info-building.ts
+++ b/src/app/babylon/model/info/model/model-info-building.ts
@@ -50,7 +50,7 @@ export class ModelInfo_building extends ModelInfo {
for (let i = 0; i < allTransformNode.length; i++) {
if (TsTool.stringContain(allTransformNode[i].name, "WAI")) {
this.neiRoot = allTransformNode[i];
- console.log("找到关键节点wai");
+
break;
}
}
@@ -58,6 +58,10 @@ export class ModelInfo_building extends ModelInfo {
if (this.neiRoot == null) {
+ if (!TsTool.stringContain(this.modelBox.name, "Box")) {
+ console.error("没有关键节点", this.modelBox.name);
+ }
+
this.neiRoot = this.modelBox;
}
@@ -156,6 +160,9 @@ export class ModelInfo_building extends ModelInfo {
//更新跟随UI的名称
updateName(name: string) {
this.uiIconBtn.textBlock.text = name;
+ if (!ModeManager.s_isMakeMode) {
+ this.showFollowUI(false);
+ }
}
diff --git a/src/app/babylon/tool/gizmo-tool.ts b/src/app/babylon/tool/gizmo-tool.ts
index 199d4e2..632c872 100644
--- a/src/app/babylon/tool/gizmo-tool.ts
+++ b/src/app/babylon/tool/gizmo-tool.ts
@@ -425,7 +425,7 @@ export class GizmoTool {
: UIBase.color_null;
GizmoTool.s_gizmoManager.scaleGizmoEnabled = isScaling;
- if (uiType == TransformUIType.Hide) { //隐藏选中框
+ if (uiType == TransformUIType.Hide || !ModeManager.s_isMakeMode) { //隐藏选中框
GizmoTool.s_boundingBoxGizmo.attachedMesh = null;
}
diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts
index ea2e0b7..4ef7789 100644
--- a/src/app/babylon/view/building-window/building-window.ts
+++ b/src/app/babylon/view/building-window/building-window.ts
@@ -218,8 +218,6 @@ export class BuildingWindow extends UIBase {
* @param show true表示显示
*/
showJYZInfoModel(type: JYZInfoMoudleType, show: boolean) {
- console.log("showJYZInfoModel", type, show);
-
if (this.currentJYZInfoMoudleType == type) {
if (show) {
return; //与上次显示的模块相同
@@ -875,7 +873,6 @@ export class BuildingWindow extends UIBase {
if (!isRepeat)//不重复，就添加进去
{
this.mat_UV.get(moudleType).push(l_mat);
- console.log("找到uv", l_mat);
}
}
}
From b5036c35b203bf14d1616ee1fe1720a4211e9330 Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Fri, 12 Nov 2021 09:21:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/babylon/model/data/mark/mark-plan-data.ts | 10 ++++++++++
src/app/pages/pages.module.ts | 8 ++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/app/babylon/model/data/mark/mark-plan-data.ts b/src/app/babylon/model/data/mark/mark-plan-data.ts
index 68fb3f9..1e4e751 100644
--- a/src/app/babylon/model/data/mark/mark-plan-data.ts
+++ b/src/app/babylon/model/data/mark/mark-plan-data.ts
@@ -225,6 +225,16 @@ export class MarkNodeData {
@Type(() => NatureData)
natureData: NatureData;
+ /**
+ * 描述
+ */
+ describe: string;
+
+ /**
+ * 图片（或视频？）
+ */
+ texture: string;
+
constructor(id: number, name: string) {
this.id = id;
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 470eb6a..73c0fc2 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -1,4 +1,4 @@
-import { NgModule } from '@angular/core';
+import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { CommonModule } from '@angular/common';
import { A11yModule } from '@angular/cdk/a11y';
import { DragDropModule } from '@angular/cdk/drag-drop';
@@ -37,6 +37,8 @@ import { OilStationInfoComponent } from './oil-station-info/oil-station-info.com
import { LeftDomainComponent } from './left-domain/left-domain.component';
import { AddequipmentComponent } from './equipment-info/addequipment/addequipment.component';
import { EditequipmentComponent } from './equipment-info/editequipment/editequipment.component';
+
+
@NgModule({
declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, AddequipmentComponent, EditequipmentComponent],
imports: [
@@ -67,6 +69,8 @@ import { EditequipmentComponent } from './equipment-info/editequipment/editequip
NzSpinModule,
NzTreeModule
],
- entryComponents :[AddequipmentComponent,EditequipmentComponent]
+ entryComponents: [AddequipmentComponent, EditequipmentComponent],
+ schemas: [CUSTOM_ELEMENTS_SCHEMA]
+
})
export class PagesModule { }