From 22675945b90bf0c276dd0f8091ec3e2ca1adf9e6 Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Thu, 11 Nov 2021 14:21:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E5=AF=B9=E6=8E=A5=E8=AE=BE?= =?UTF-8?q?=E5=A4=87UI=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/babylon/controller/config-manager.ts | 3 ++ .../babylon/model/info/model/model-info.ts | 42 +++++++++++++++++- .../facilityinfo-ui-item.ts | 12 +++++ src/assets/images/facility/in/JY_JYJ.png | Bin 0 -> 2239 bytes src/assets/images/facility/in/JY_YG.png | Bin 0 -> 2500 bytes 5 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/facility/in/JY_JYJ.png create mode 100644 src/assets/images/facility/in/JY_YG.png diff --git a/src/app/babylon/controller/config-manager.ts b/src/app/babylon/controller/config-manager.ts index e724c8d..b136957 100644 --- a/src/app/babylon/controller/config-manager.ts +++ b/src/app/babylon/controller/config-manager.ts @@ -43,7 +43,10 @@ export class ConfigManager { case FacilityType.QY: case FacilityType.TPBZ: case FacilityType.DWBZ: + case FacilityType.JY_JYJ://临时 + case FacilityType.JY_YG://临时 result = true; + break; } diff --git a/src/app/babylon/model/info/model/model-info.ts b/src/app/babylon/model/info/model/model-info.ts index f89684a..eeea1de 100644 --- a/src/app/babylon/model/info/model/model-info.ts +++ b/src/app/babylon/model/info/model/model-info.ts @@ -5,6 +5,7 @@ import { EventState, Mesh, PointerDragBehavior, + Vector2, Vector3, } from '@babylonjs/core'; import { Button, Rectangle, Vector2WithInfo } from '@babylonjs/gui'; @@ -14,6 +15,8 @@ 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 { TsTool } from 'src/app/babylon/tool/ts-tool'; +import { isRegularExpressionLiteral } from 'typescript'; import { ModelData } from '../../data/model-data/model-data'; @@ -26,6 +29,11 @@ export class ModelInfo { * 所有子节点 */ _models: AbstractMesh[]; + + /** + * 头部所在位置（并不是都有） + */ + head: AbstractMesh; /** * 包装盒、根节点 ，请使用modelBox 属性进行访问 */ @@ -251,8 +259,23 @@ export class ModelInfo { if (this.uiFollowRoot != null) { - this.uiFollowRoot.linkWithMesh(this.modelBox); - this.uiFollowRoot.linkOffsetY = '-50px'; + + for (let i = 0; i < this.models.length; i++) { + let l_mesh = this.models[i]; + if (TsTool.stringContain(l_mesh.name, "Head")) { + this.head = l_mesh; + break; + } + } + + if (this.head == null) { + this.uiFollowRoot.linkWithMesh(this.modelBox); + this.uiFollowRoot.linkOffsetY = '-50px'; + } + else { + this.uiFollowRoot.linkWithMesh(this.head); + } + } } @@ -285,6 +308,21 @@ export class ModelInfo { } + + + /** + * 获取头部跟随的ui所在的位置 + */ + getHeadUIPos() { + let result: Vector2 = null; + if (this.uiFollowRoot != null) { + result.x = this.uiFollowRoot.leftInPixels; + result.y = this.uiFollowRoot.topInPixels; + } + + return result; + } + } 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 8acf483..96c3b87 100644 --- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts +++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item.ts @@ -134,5 +134,17 @@ export class FacilityInfoUIItem { } + /** + * 获取头部UI的位置（像素） + */ + getHeadUIPos() { + if (this.modelInfo != null) { + return this.modelInfo.getHeadUIPos(); + } + else { + return null; + } + } + } \ No newline at end of file diff --git a/src/assets/images/facility/in/JY_JYJ.png b/src/assets/images/facility/in/JY_JYJ.png new file mode 100644 index 0000000000000000000000000000000000000000..199063a26f65e9ad3eabd8473b8b7fc693513398 GIT binary patch literal 2239 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 N002ovPDHLkV1h8FRu%vN literal 0 HcmV?d00001 diff --git a/src/assets/images/facility/in/JY_YG.png b/src/assets/images/facility/in/JY_YG.png new file mode 100644 index 0000000000000000000000000000000000000000..f377b06ea5fcf47261a2e27475efbc353ba9b238 GIT binary patch literal 2500 zcmV;#2|M58`1cEmDmoeoo`S{=ta{?$=h zEljavm8n9ZMJ?2#AS#O#X$8s}Ado;v$V&FNFV64gyf@e6y}Wl{5|Y$@XWr!9oBMwE zcfR-h&h|T(Pw{^aQ&{}n*awpdD{wt9510jv2F3vsffV2pPz5vsr-8k|VW4ZUCUiTl z$ixN%W}pPP6PORo5uwdG(oMSWQ-I0xJp=@S4&WHD2iOLj0K5Y|*MZakC0sgiGw@wt zi5w3U4ghO_U7{KO{){`28ejuP0k;580!!uGK;u^V90c9~{tUE$NRlM_OF+J?>t}!k zgCKM?%$1L_6|VvBiVX=RGnhHaN!Vn~J`ZfXhQjMH9e4?NMYJ!e<(7;FC}VM(sQV&0 z9x9}WttkT50`CD=2a|wo;0|ClaMK`q5hGCAI2#xvpUtu)5`qx{3W5896+jta8B(!( z<2vA3(S~0E<%#?#Q3A3>_*HVF;Rurm|ESDO*@lbp=9!2Qw2RuW7{tr= zcX2!dtm5WYi`tJAsO9<{;BFwRKLn_7cBMpj!)?vS!}vtz-WLJ+!s4P4D0~pA%Vi6El{U?Xm&-WKriCLBd8PUdyML>>(w*#5X3>B=R$%WChAQ}Pc+>9X#ZwCu1 zKzcZu+m99p*u{86U^1IA*{ooSx{QV|f+2!_pY|7cTmq!Jcm&Ll_*#QGC580qWn_Kk zMog)xBTIgli?%}_;;y_%$nRG%%+tUN`fGX;V3xHX$>;48ODX-)3*;=AkEgblpxblJ z1n3W}jx18g7E$;6x47_wALFfWP@_E|8DwjC=$-_G%UBUubFxXhZUU`)_EP=wt9Tol zhQIVC6X}yDQu4#+NuM$qOM1kX7l?Lm44>#pz@1Uuo(Z~6mecajeGp2j?r_cFJb8*S z4?jT4m|oHFJ$eFqdV%>dC#nP=A;P0gH|Bij=pVA40IU4-la4V`g^mav#tl-sHVl)= zMC$nQ*e8`@PPgN4ZN+uI3SUD*_mda^m~1xer6r^lPrz)m;caThdHM|gjt--Pn`Li8 zmE8Y_fO*N(2$h!@`@~~p&6){*KLM8;v)xXxvy-MBf2C>L`}mrYH=K%G$DG*|Jaiu! zWn~1t9_>CBM;88;RvNdzPs7`P&|F@kL(0R}peNw7u@Z(@Q1QXkH7{W+7)|Z#Z_sh{ z7$J`b>!?xWF8mVXSFRwfxR}f9*5m7TLx$m)JDcL~J*Nd@^&2()~zQL3?@pzv}gnvQh#%53MH#oVaw0s>@%zAJbaXZ)7gCovze~b<@j1! zDY*A;Too6n-?Ui;BZlNpEh?huTaOTEYp42`>*zdof}qEv88>y0&XcEbU%E`;qswtu zRnhd`jzovfj>w@qInIa%WX-%qQ~QeNzEAtXLlNN>)RRzw$Ccl_Nz2~-5<`}C<=t`Ku_Rx9?>Qi4tw-r6gP z4y{2wbS~4@qnmGgS)fU{<)rk%tm4HSg6Kvam0E^wunEUU=meX6k z)lo zcZiw|mK)Ikwf^hg+{D;#J_1$?ExZ1%t#{?7EEyT3mrbEy**#ih*!b@Da5`!TZU6c} z3#9UwEYb{K`@cWbEPp8A*L=Ty@LL&*U8gV|Lhf_IIjNr}ijc>Px30dw!yMHc!JbZhTdZFxW2UVB zNP#UoJJx)+>koQrzzONbx;1=4#oQ{?&0F#n&9(U&40+3;fmziAC*hbgi_YUG^fd_; zjlJC$0qTO6^#r&sRMN0zE2F=97nwI)A2;+JHXNj-(RJpm=0$Y%2qk>2{<>&=f~w{1 zFVcynv1zfVOV~TYHbz20{GFZMA#y0xCY7Lb#OV|4l0Lj{0)ipUs;kck$2&l;SUFlI zKut|gfvV0>1LySxI+Y&yi>3?mf_PQ(N57z(p{kJaOSGZils(b)^8~CZd%zO>u zl&Aif