gs-bim-air 1.6.1-beta.42 → 1.6.1-beta.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/README.md +12 -0
  2. package/demo//346/250/241/345/236/213/346/225/210/346/236/234//346/260/264/351/235/242/346/225/210/346/236/234.html +2 -1
  3. package/demo//347/201/214/346/265/206/347/263/273/347/273/237/346/216/245/345/217/243ByMCA.html +189 -0
  4. package/demo//347/201/214/346/265/206/347/263/273/347/273/237/346/216/245/345/217/243Demo.html +74 -0
  5. package/docs/classes/Animation.WaterEffectConfig.md +13 -3
  6. package/docs/classes/Longan.LonganCore.Viewer.md +24 -0
  7. package/docs/classes/Longan.Viewer.md +32 -0
  8. package/docs/classes/Viewer.md +58 -0
  9. package/docs/enums/Longan.LonganCore.ObjectType.md +7 -0
  10. package/docs/interfaces/ToolbarVisible.md +7 -0
  11. package/lib/BimAir.common-report.html +2 -2
  12. package/lib/BimAir.common.js +117 -13
  13. package/lib/BimAir.css +906 -458
  14. package/lib/BimAir.umd-report.html +2 -2
  15. package/lib/BimAir.umd.js +117 -13
  16. package/lib/BimAir.umd.min-report.html +2 -2
  17. package/lib/BimAir.umd.min.js +117 -13
  18. package/lib/fonts/iconfont.c790d09a.woff2 +0 -0
  19. package/lib/fonts/iconfont.dd8781d3.woff +0 -0
  20. package/lib/fonts/iconfont.dde03252.ttf +0 -0
  21. package/lib/undefined.gzundefined +0 -0
  22. package/package.json +1 -1
  23. package/public/js/longan/longan/longan.js +6009 -0
  24. package/public/js/longan/longan/longan.wasm +0 -0
  25. package/public/js/longan/longan/longan.worker.js +176 -0
  26. package/public/js/longan/longan.js +6009 -6009
  27. package/public/js/longan/longanWithoutShareArrayBuffer/longan.js +1 -0
  28. package/public/js/longan/longanWithoutShareArrayBuffer/longan.wasm +0 -0
  29. package/public/js/longan.zip +0 -0
  30. package/lib/fonts/iconfont.6f9f8b97.woff2 +0 -0
  31. package/lib/fonts/iconfont.b729ac50.ttf +0 -0
  32. package/lib/fonts/iconfont.d1fcc80d.woff +0 -0
package/README.md CHANGED
@@ -1,4 +1,16 @@
1
1
  ## 更新日志
2
+ ### 1.6.1-beta.44
3
+ - feat: 平面投影命令添加加载动画
4
+ -
5
+ ### 1.6.1-beta.43
6
+
7
+ > 更新 public/js 里的内核文件，安装此版本需替换 js 文件夹
8
+
9
+ - feat: 添加投影平面功能
10
+ ---
11
+ - fix: 图片透明通道与透明度合并，修复无法修改贴图透明度问题
12
+ - fix: 修复水面贴图效果闪光问题，添加水面贴图默认放缩为[1,1]
13
+
2
14
 
3
15
  ### 1.6.1-beta.42
4
16
 
package/demo//346/250/241/345/236/213/346/225/210/346/236/234//346/260/264/351/235/242/346/225/210/346/236/234.html CHANGED
@@ -59,7 +59,8 @@
59
59
  let waterEffectConfig = new BimAir.Animation.WaterEffectConfig(
60
60
  viewer,
61
61
  lightModels[0],
62
- ["3"]
62
+ ["3"],
63
+ [1,1]
63
64
  );
64
65
  let waterEffect = new BimAir.Animation.WaterEffect(waterEffectConfig);
65
66
  waterEffect.createPlane().then(() => {
package/demo//347/201/214/346/265/206/347/263/273/347/273/237/346/216/245/345/217/243ByMCA.html ADDED
@@ -0,0 +1,189 @@
1
+ <!-- <!DOCTYPE html>
2
+ <html lang="en">
3
+
4
+ <head>
5
+ <meta charset="utf-8">
6
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
7
+ <meta name="viewport" content="width=device-width,initial-scale=1.0">
8
+ <link rel="icon" href="<%= BASE_URL %>favicon.ico">
9
+ <title>NWH-BIMCloud</title>
10
+ </head>
11
+ <style>
12
+ body {
13
+ height: 100vh;
14
+ margin: 0;
15
+ padding: 0;
16
+ }
17
+ </style>
18
+
19
+ <body>
20
+ <noscript>
21
+ <strong>We're sorry but typescript-test doesn't work properly without JavaScript enabled. Please enable it to
22
+ continue.</strong>
23
+ </noscript>
24
+ <style>
25
+ #viewerWrapper {
26
+ height: 100vh;
27
+ position: relative;
28
+ }
29
+ </style>
30
+ <div id="viewerWrapper"></div>
31
+ <script src="http://8.134.85.254:8017/index.js"></script>
32
+ <script>
33
+ window.onload = function () {
34
+ let BimAir = window.BimAir;
35
+ if (window.BimAir) {
36
+ window.BimAir.InitProjectViewerWrapper("#viewerWrapper");
37
+
38
+ window.BimAirSDKLoader.onReady().then(() => {
39
+ let toolbarVisibleConfig = {
40
+ property: false,
41
+ structureTree: false,
42
+ crash: false,
43
+ modelCompare: false,
44
+ floorPlan: false,
45
+ twoDDrawing: false,
46
+ resetPerspective: false,
47
+ setting: false,
48
+ proExplosion: false
49
+ };
50
+ let viewer = new window.BimAir.ProjectViewer(
51
+ "618f92b27a3a282614a7a1b2",
52
+ toolbarVisibleConfig
53
+ );
54
+
55
+ this.viewer = viewer;
56
+ this.viewer.loadGroutModel();
57
+ let longanViewer = this.viewer.viewer;
58
+
59
+ longanViewer.backgroundColor = [3, 22, 48, 0];
60
+ longanViewer.process.persistenceManager.modelLoaded.add(() => {
61
+
62
+ //获取结构树
63
+ let data =
64
+ longanViewer.process.persistenceManager.getRenderObjectStructure(true);
65
+
66
+
67
+ let Longan = window.Longan
68
+ longanViewer.setViewMode(BimAir.ProjectViewer.ViewMode.Iso, true);
69
+ longanViewer.fitWorld();
70
+ longanViewer.updateDisplay()
71
+
72
+ //通过segment name修改颜色.
73
+ viewer.property.setColorByName("体积.404", [255,0,0]);
74
+ viewer.property.setColorByName("体积.777", [255,0,0]);
75
+ //通过segment name修改透明度.
76
+ viewer.property.setTransparencyByName("体积.404", 0.5);
77
+ //取消所有的修改.
78
+ viewer.property.unsetAllChanged();
79
+ })
80
+
81
+ })
82
+ }
83
+ }
84
+ </script>
85
+ </body> -->
86
+
87
+ </html>
88
+
89
+ <!DOCTYPE html>
90
+ <html>
91
+ <head>
92
+ <meta charset="UTF-8" />
93
+ <title>加载服务器模型</title>
94
+ <!-- demo的样式 -->
95
+ <link rel="stylesheet" href="https://static.belife-bim.com/demo.css" />
96
+ <link
97
+ rel="stylesheet"
98
+ href="https://static.belife-bim.com/bimAir/BimAir.css"
99
+ />
100
+ <script src="https://static.belife-bim.com/vue.min.js"></script>
101
+ <script src="https://cdn.bootcdn.net/ajax/libs/axios/1.3.6/axios.js"></script>
102
+ <script src="https://static.belife-bim.com/bimAir/BimAir.umd.min.js"></script>
103
+ </head>
104
+
105
+ <body>
106
+ <div id="app">
107
+ <div class="button-group">
108
+ <button onclick="changeColor()">设置构件颜色</button>
109
+ </div>
110
+ <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
111
+ </div>
112
+
113
+ <script type="text/javascript">
114
+ new Vue({
115
+ el: "#app",
116
+ });
117
+ let viewer
118
+ let options = {
119
+ elementId: "viewer",
120
+ viewerType: BimAir.ViewerType.Project,
121
+ tag: "project",
122
+ modelService: "https://dsx.aicp.site:8020/",
123
+ fileService: "https://dsx.aicp.site:8020/",
124
+ };
125
+ BimAir.Loader({
126
+ url: "https://static.belife-bim.com/bimAir",
127
+ }).then(() => {
128
+ viewer = new BimAir.Viewer(options);
129
+ // viewer.isUpdateTt = true;
130
+ viewer.isCache = true;
131
+
132
+ viewer.instanceObjectSegment.renderingOptions.logarithmicDepthBuffer =
133
+ true;
134
+
135
+ viewer.viewSegment.shader.setName("blinn phong double face");
136
+ viewer.viewSegment.color.ambient = [60, 60, 60];
137
+ let id = "618f92b27a3a282614a7a1b2";
138
+ // let id = "62b68e5a3a591513fe17ba08";
139
+
140
+ axios(
141
+ viewer.options.modelService + `/model-service/projects/${id}/data`
142
+ ).then((res) => {
143
+ let structureTree = res.data.data
144
+
145
+ this.traverseTree(structureTree);
146
+ structureTree.visible = true;
147
+ let mca = structureTree
148
+ viewer.loadModelByMCA(mca, true).then(() => {
149
+ viewer.fitWorld()
150
+
151
+
152
+ })
153
+
154
+ });
155
+ });
156
+
157
+ function traverseTree(tree) {
158
+ const treeNodeNames = ["DSX水利枢纽工程BIM中心","施工图设计模型","DSX水利枢纽工程","大坝工程","面板砂砾石坝工程","高趾墩基础固结灌浆孔"];
159
+ if (treeNodeNames.indexOf(tree.name) === -1) {
160
+ tree.visible = false
161
+ } else {
162
+ tree.visible = true;
163
+ }
164
+
165
+
166
+ if (tree.childObjects) {
167
+ for (let i = 0; i < tree.childObjects.length; i++) {
168
+
169
+ traverseTree(tree.childObjects[i]);
170
+ }
171
+
172
+ }
173
+ }
174
+
175
+ function changeColor(){
176
+ //通过结构树上的节点名称获取节点对象
177
+ let node = viewer.structureTreeManager.getTreeNodesByName(
178
+ "体积.404"
179
+ );
180
+ let material = new BimAir.Material(viewer, "changeColor", 3);
181
+ material.setColor(127, 0, 0, 0.5);
182
+ material.setTransparency(0.5);
183
+
184
+ node.items[0].segmentObject.setMaterial(material)
185
+ viewer.updateDisplay()
186
+ }
187
+ </script>
188
+ </body>
189
+ </html>
package/demo//347/201/214/346/265/206/347/263/273/347/273/237/346/216/245/345/217/243Demo.html ADDED
@@ -0,0 +1,74 @@
1
+ </html>
2
+
3
+ <!DOCTYPE html>
4
+ <html>
5
+ <head>
6
+ <meta charset="UTF-8" />
7
+ <title>加载服务器模型</title>
8
+ <!-- demo的样式 -->
9
+ <link rel="stylesheet" href="https://static.belife-bim.com/demo.css" />
10
+ <link
11
+ rel="stylesheet"
12
+ href="https://static.belife-bim.com/bimAir/BimAir.css"
13
+ />
14
+ <script src="https://static.belife-bim.com/vue.min.js"></script>
15
+ <script src="https://static.belife-bim.com/bimAir/BimAir.umd.min.js"></script>
16
+ </head>
17
+
18
+ <body>
19
+ <div id="app">
20
+ <div class="button-group">
21
+ <button onclick="changeColor()">设置构件颜色</button>
22
+ </div>
23
+ <viewer-wrapper elementId="viewer" style="height: 100%; width: 100%" />
24
+ </div>
25
+
26
+ <script type="text/javascript">
27
+ new Vue({
28
+ el: "#app",
29
+ });
30
+ let viewer
31
+ let options = {
32
+ elementId: "viewer",
33
+ modelService: "https://dsx.aicp.site:8020",
34
+ fileService: "https://dsx.aicp.site:8020",
35
+ };
36
+ BimAir.Loader({
37
+ url: "https://static.belife-bim.com/bimAir",
38
+ }).then(() => {
39
+ viewer = new BimAir.Viewer(options);
40
+ // viewer.isUpdateTt = true;
41
+ viewer.isCache = true;
42
+
43
+ viewer.instanceObjectSegment.renderingOptions.logarithmicDepthBuffer =
44
+ true;
45
+
46
+ viewer.viewSegment.shader.setName("blinn phong double face");
47
+ viewer.viewSegment.color.ambient = [60, 60, 60];
48
+ let id = "619a1278f0c9cc6095b9b6a1"
49
+
50
+
51
+ viewer.loadModels(id, true).then(() => {
52
+ viewer.fitWorld()
53
+
54
+
55
+ })
56
+
57
+
58
+ });
59
+
60
+ function changeColor(){
61
+ //通过结构树上的节点名称获取节点对象
62
+ let node = viewer.structureTreeManager.getTreeNodesByName(
63
+ "体积.404"
64
+ );
65
+ let material = new BimAir.Material(viewer, "changeColor", 3);
66
+ material.setColor(127, 0, 0, 0.5);
67
+ material.setTransparency(0.5);
68
+
69
+ node.items[0].segmentObject.setMaterial(material)
70
+ viewer.updateDisplay()
71
+ }
72
+ </script>
73
+ </body>
74
+ </html>
package/docs/classes/Animation.WaterEffectConfig.md CHANGED
@@ -14,21 +14,25 @@
14
14
 
15
15
  - [componentIds](Animation.WaterEffectConfig.md#componentids)
16
16
  - [lightModel](Animation.WaterEffectConfig.md#lightmodel)
17
+ - [scale](Animation.WaterEffectConfig.md#scale)
17
18
  - [viewer](Animation.WaterEffectConfig.md#viewer)
18
19
 
19
20
  ## Constructors
20
21
 
21
22
  ### constructor
22
23
 
23
- • **new WaterEffectConfig**(`viewer`, `lightModel`, `componentIds`)
24
+ • **new WaterEffectConfig**(`viewer`, `lightModel`, `componentIds`, `scale?`)
25
+
26
+ 水面效果配置
24
27
 
25
28
  #### Parameters
26
29
 
27
30
  | Name | Type | Description |
28
31
  | :------ | :------ | :------ |
29
32
  | `viewer` | [`Viewer`](Viewer.md) | 需要创建在哪个视图下 |
30
- | `lightModel` | [`LightModel`](LightModel.md) | - |
31
- | `componentIds` | `string`[] | - |
33
+ | `lightModel` | [`LightModel`](LightModel.md) | 需要创建在哪个模型下 |
34
+ | `componentIds` | `string`[] | 构件id数组 |
35
+ | `scale` | [`number`, `number`] | 放缩比例，默认[1,1] |
32
36
 
33
37
  ## Properties
34
38
 
@@ -44,6 +48,12 @@ ___
44
48
 
45
49
  ___
46
50
 
51
+ ### scale
52
+
53
+ • **scale**: [`number`, `number`]
54
+
55
+ ___
56
+
47
57
  ### viewer
48
58
 
49
59
  • **viewer**: [`Viewer`](Viewer.md)
package/docs/classes/Longan.LonganCore.Viewer.md CHANGED
@@ -471,6 +471,18 @@ ___
471
471
 
472
472
  `number`
473
473
 
474
+ • `set` **height**(`value`): `void`
475
+
476
+ #### Parameters
477
+
478
+ | Name | Type |
479
+ | :------ | :------ |
480
+ | `value` | `number` |
481
+
482
+ #### Returns
483
+
484
+ `void`
485
+
474
486
  ___
475
487
 
476
488
  ### isBusy
@@ -817,6 +829,18 @@ ___
817
829
 
818
830
  `number`
819
831
 
832
+ • `set` **width**(`value`): `void`
833
+
834
+ #### Parameters
835
+
836
+ | Name | Type |
837
+ | :------ | :------ |
838
+ | `value` | `number` |
839
+
840
+ #### Returns
841
+
842
+ `void`
843
+
820
844
  ## Methods
821
845
 
822
846
  ### asynBatchSetSegmentsDataFromCache
package/docs/classes/Longan.Viewer.md CHANGED
@@ -957,6 +957,22 @@ ___
957
957
 
958
958
  LonganCoreViewer.height
959
959
 
960
+ • `set` **height**(`value`): `void`
961
+
962
+ #### Parameters
963
+
964
+ | Name | Type |
965
+ | :------ | :------ |
966
+ | `value` | `number` |
967
+
968
+ #### Returns
969
+
970
+ `void`
971
+
972
+ #### Inherited from
973
+
974
+ LonganCoreViewer.height
975
+
960
976
  ___
961
977
 
962
978
  ### highlightManager
@@ -1627,6 +1643,22 @@ ___
1627
1643
 
1628
1644
  LonganCoreViewer.width
1629
1645
 
1646
+ • `set` **width**(`value`): `void`
1647
+
1648
+ #### Parameters
1649
+
1650
+ | Name | Type |
1651
+ | :------ | :------ |
1652
+ | `value` | `number` |
1653
+
1654
+ #### Returns
1655
+
1656
+ `void`
1657
+
1658
+ #### Inherited from
1659
+
1660
+ LonganCoreViewer.width
1661
+
1630
1662
  ## Methods
1631
1663
 
1632
1664
  ### asynBatchSetSegmentsDataFromCache
package/docs/classes/Viewer.md CHANGED
@@ -136,6 +136,7 @@
136
136
 
137
137
  - [addAdits](Viewer.md#addadits)
138
138
  - [addBoreholes](Viewer.md#addboreholes)
139
+ - [addCompass](Viewer.md#addcompass)
139
140
  - [addPoint](Viewer.md#addpoint)
140
141
  - [appendMatrix](Viewer.md#appendmatrix)
141
142
  - [asynBatchSetSegmentsDataFromCache](Viewer.md#asynbatchsetsegmentsdatafromcache)
@@ -201,6 +202,7 @@
201
202
  - [makeContextCurrent](Viewer.md#makecontextcurrent)
202
203
  - [pixelPointToWorldPoint](Viewer.md#pixelpointtoworldpoint)
203
204
  - [rebind](Viewer.md#rebind)
205
+ - [removeCompass](Viewer.md#removecompass)
204
206
  - [removeEnsureGeometries](Viewer.md#removeensuregeometries)
205
207
  - [reset](Viewer.md#reset)
206
208
  - [selectByArea](Viewer.md#selectbyarea)
@@ -1238,6 +1240,22 @@ ___
1238
1240
 
1239
1241
  LonganViewer.height
1240
1242
 
1243
+ • `set` **height**(`value`): `void`
1244
+
1245
+ #### Parameters
1246
+
1247
+ | Name | Type |
1248
+ | :------ | :------ |
1249
+ | `value` | `number` |
1250
+
1251
+ #### Returns
1252
+
1253
+ `void`
1254
+
1255
+ #### Inherited from
1256
+
1257
+ LonganViewer.height
1258
+
1241
1259
  ___
1242
1260
 
1243
1261
  ### highlightManager
@@ -2018,6 +2036,22 @@ ___
2018
2036
 
2019
2037
  LonganViewer.width
2020
2038
 
2039
+ • `set` **width**(`value`): `void`
2040
+
2041
+ #### Parameters
2042
+
2043
+ | Name | Type |
2044
+ | :------ | :------ |
2045
+ | `value` | `number` |
2046
+
2047
+ #### Returns
2048
+
2049
+ `void`
2050
+
2051
+ #### Inherited from
2052
+
2053
+ LonganViewer.width
2054
+
2021
2055
  ## Methods
2022
2056
 
2023
2057
  ### addAdits
@@ -2064,6 +2098,18 @@ ___
2064
2098
 
2065
2099
  ___
2066
2100
 
2101
+ ### addCompass
2102
+
2103
+ ▸ **addCompass**(): `void`
2104
+
2105
+ 添加指南针
2106
+
2107
+ #### Returns
2108
+
2109
+ `void`
2110
+
2111
+ ___
2112
+
2067
2113
  ### addPoint
2068
2114
 
2069
2115
  ▸ **addPoint**(`points`, `point`): `number`[]
@@ -3325,6 +3371,18 @@ ___
3325
3371
 
3326
3372
  ___
3327
3373
 
3374
+ ### removeCompass
3375
+
3376
+ ▸ **removeCompass**(): `void`
3377
+
3378
+ 移除指南针
3379
+
3380
+ #### Returns
3381
+
3382
+ `void`
3383
+
3384
+ ___
3385
+
3328
3386
  ### removeEnsureGeometries
3329
3387
 
3330
3388
  ▸ **removeEnsureGeometries**(): `void`
package/docs/enums/Longan.LonganCore.ObjectType.md CHANGED
@@ -27,6 +27,7 @@
27
27
  - [TYPE\_Marker](Longan.LonganCore.ObjectType.md#type_marker)
28
28
  - [TYPE\_Mesh](Longan.LonganCore.ObjectType.md#type_mesh)
29
29
  - [TYPE\_ModellingMatrix](Longan.LonganCore.ObjectType.md#type_modellingmatrix)
30
+ - [TYPE\_ParametricGeometries](Longan.LonganCore.ObjectType.md#type_parametricgeometries)
30
31
  - [TYPE\_ParametricGeometry](Longan.LonganCore.ObjectType.md#type_parametricgeometry)
31
32
  - [TYPE\_PointCloud](Longan.LonganCore.ObjectType.md#type_pointcloud)
32
33
  - [TYPE\_PolyCylinder](Longan.LonganCore.ObjectType.md#type_polycylinder)
@@ -160,6 +161,12 @@ ___
160
161
 
161
162
  ___
162
163
 
164
+ ### TYPE\_ParametricGeometries
165
+
166
+ • **TYPE\_ParametricGeometries** = ``125``
167
+
168
+ ___
169
+
163
170
  ### TYPE\_ParametricGeometry
164
171
 
165
172
  • **TYPE\_ParametricGeometry** = ``123``
package/docs/interfaces/ToolbarVisible.md CHANGED
@@ -19,6 +19,7 @@
19
19
  - [modelCompare](ToolbarVisible.md#modelcompare)
20
20
  - [pathRoam](ToolbarVisible.md#pathroam)
21
21
  - [proExplosion](ToolbarVisible.md#proexplosion)
22
+ - [projection](ToolbarVisible.md#projection)
22
23
  - [property](ToolbarVisible.md#property)
23
24
  - [resetPerspective](ToolbarVisible.md#resetperspective)
24
25
  - [rightToolbar](ToolbarVisible.md#righttoolbar)
@@ -110,6 +111,12 @@ ___
110
111
 
111
112
  ___
112
113
 
114
+ ### projection
115
+
116
+ • `Optional` **projection**: `boolean`
117
+
118
+ ___
119
+
113
120
  ### property
114
121
 
115
122
  • `Optional` **property**: `boolean`