@umituz/web-virtual 1.0.6 → 1.1.0
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.
- package/assets/ASSET_CREDITS.md +45 -0
- package/assets/models/characters/character-female-a.glb +0 -0
- package/assets/models/characters/character-female-b.glb +0 -0
- package/assets/models/characters/character-male-a.glb +0 -0
- package/assets/models/characters/character-male-b.glb +0 -0
- package/assets/models/decor/lampRoundFloor.glb +0 -0
- package/assets/models/decor/plantSmall1.glb +0 -0
- package/assets/models/decor/pottedPlant.glb +0 -0
- package/assets/models/decor/trashcan.glb +0 -0
- package/assets/models/equipment/computerKeyboard.glb +0 -0
- package/assets/models/equipment/computerMouse.glb +0 -0
- package/assets/models/equipment/computerScreen.glb +0 -0
- package/assets/models/equipment/laptop.glb +0 -0
- package/assets/models/furniture/bookcaseOpen.glb +0 -0
- package/assets/models/furniture/chairDesk.glb +0 -0
- package/assets/models/furniture/desk.glb +0 -0
- package/assets/models/furniture/deskCorner.glb +0 -0
- package/assets/models/furniture/loungeChair.glb +0 -0
- package/assets/models/furniture/loungeSofa.glb +0 -0
- package/assets/models/furniture/table.glb +0 -0
- package/assets/models/furniture/tableCoffee.glb +0 -0
- package/package.json +2 -1
- package/src/engine/assetCatalog.test.ts +29 -0
- package/src/engine/assetCatalog.ts +222 -0
- package/src/engine/index.ts +2 -0
- package/src/engine/modelLoader.ts +126 -0
- package/src/entities/furniture/DeskBuilder.ts +197 -201
- package/src/entities/people/AvatarBuilder.ts +150 -208
- package/src/entities/props/PlantBuilder.ts +33 -36
- package/src/presets/officePreset.ts +37 -0
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as THREE from 'three'
|
|
2
2
|
import type { MaterialPalette } from '../../engine/materials'
|
|
3
|
+
import { ModelLoader } from '../../engine/modelLoader'
|
|
3
4
|
|
|
4
5
|
export function createModernWorkstation(
|
|
5
6
|
materials: MaterialPalette,
|
|
@@ -15,13 +16,9 @@ export function createModernWorkstation(
|
|
|
15
16
|
group.userData = { entityId: options.entityId }
|
|
16
17
|
}
|
|
17
18
|
|
|
18
|
-
const
|
|
19
|
-
const legMat = materials.getMetalLegMaterial()
|
|
20
|
-
const bezelMat = materials.getMonitorBezelMaterial()
|
|
19
|
+
const shadowMat = materials.getContactShadowMaterial()
|
|
21
20
|
const screenMat1 = materials.getMonitorScreenMaterial('dashboard')
|
|
22
21
|
const screenMat2 = materials.getMonitorScreenMaterial('code')
|
|
23
|
-
const chairMat = materials.getLeatherMaterial('#334155')
|
|
24
|
-
const shadowMat = materials.getContactShadowMaterial()
|
|
25
22
|
|
|
26
23
|
// 0. Contact Ambient Occlusion Drop Shadows (grounds furniture on floor)
|
|
27
24
|
const deskShadow = new THREE.Mesh(new THREE.PlaneGeometry(1.9, 1.1), shadowMat)
|
|
@@ -34,159 +31,162 @@ export function createModernWorkstation(
|
|
|
34
31
|
chairShadow.position.set(0, 0.003, 0.48)
|
|
35
32
|
group.add(chairShadow)
|
|
36
33
|
|
|
37
|
-
// 1.
|
|
38
|
-
const
|
|
39
|
-
|
|
34
|
+
// 1. Container for 3D Real Models
|
|
35
|
+
const modelsContainer = new THREE.Group()
|
|
36
|
+
modelsContainer.name = `workstation-models-${options.entityId || 'generic'}`
|
|
37
|
+
group.add(modelsContainer)
|
|
38
|
+
|
|
39
|
+
// 2. Fallback geometry group (shown instantly while 3D models load)
|
|
40
|
+
const placeholderGroup = new THREE.Group()
|
|
41
|
+
placeholderGroup.name = 'workstation-placeholder'
|
|
42
|
+
|
|
43
|
+
const desktopMat = materials.getDeskTopMaterial(options.topColor || '#f8fafc')
|
|
44
|
+
const legMat = materials.getMetalLegMaterial()
|
|
45
|
+
const bezelMat = materials.getMonitorBezelMaterial()
|
|
46
|
+
const chairMat = materials.getLeatherMaterial('#334155')
|
|
47
|
+
|
|
48
|
+
const topMesh = new THREE.Mesh(new THREE.BoxGeometry(1.6, 0.04, 0.8), desktopMat)
|
|
40
49
|
topMesh.position.set(0, 0.74, 0)
|
|
41
50
|
topMesh.castShadow = true
|
|
42
51
|
topMesh.receiveShadow = true
|
|
43
52
|
if (options.entityId) topMesh.userData = { entityId: options.entityId }
|
|
44
|
-
|
|
53
|
+
placeholderGroup.add(topMesh)
|
|
45
54
|
|
|
46
|
-
|
|
47
|
-
const legGeo = new THREE.BoxGeometry(0.06, 0.72, 0.7)
|
|
48
|
-
const leftLeg = new THREE.Mesh(legGeo, legMat)
|
|
55
|
+
const leftLeg = new THREE.Mesh(new THREE.BoxGeometry(0.06, 0.72, 0.7), legMat)
|
|
49
56
|
leftLeg.position.set(-0.7, 0.36, 0)
|
|
50
57
|
leftLeg.castShadow = true
|
|
51
58
|
if (options.entityId) leftLeg.userData = { entityId: options.entityId }
|
|
52
|
-
|
|
59
|
+
placeholderGroup.add(leftLeg)
|
|
53
60
|
|
|
54
|
-
const rightLeg = new THREE.Mesh(
|
|
61
|
+
const rightLeg = new THREE.Mesh(new THREE.BoxGeometry(0.06, 0.72, 0.7), legMat)
|
|
55
62
|
rightLeg.position.set(0.7, 0.36, 0)
|
|
56
63
|
rightLeg.castShadow = true
|
|
57
64
|
if (options.entityId) rightLeg.userData = { entityId: options.entityId }
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
if (options.entityId)
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
const mouseGeo = new THREE.BoxGeometry(0.06, 0.015, 0.1)
|
|
180
|
-
const mouse = new THREE.Mesh(mouseGeo, bezelMat)
|
|
181
|
-
mouse.position.set(0.3, 0.765, 0.08)
|
|
182
|
-
if (options.entityId) mouse.userData = { entityId: options.entityId }
|
|
183
|
-
group.add(mouse)
|
|
184
|
-
|
|
185
|
-
// 8. Ceramic Coffee Mug
|
|
65
|
+
placeholderGroup.add(rightLeg)
|
|
66
|
+
|
|
67
|
+
const chairSeat = new THREE.Mesh(new THREE.BoxGeometry(0.48, 0.08, 0.46), chairMat)
|
|
68
|
+
chairSeat.position.set(0, 0.46, 0.48)
|
|
69
|
+
chairSeat.castShadow = true
|
|
70
|
+
if (options.entityId) chairSeat.userData = { entityId: options.entityId }
|
|
71
|
+
placeholderGroup.add(chairSeat)
|
|
72
|
+
|
|
73
|
+
group.add(placeholderGroup)
|
|
74
|
+
|
|
75
|
+
// 3. Asynchronously load and mount real 3D models from Asset Catalog
|
|
76
|
+
const loader = ModelLoader.getInstance()
|
|
77
|
+
void Promise.allSettled([
|
|
78
|
+
loader.load('furniture:desk'),
|
|
79
|
+
loader.load('furniture:chairDesk'),
|
|
80
|
+
loader.load('equipment:screen'),
|
|
81
|
+
options.dualMonitor ? loader.load('equipment:screen') : Promise.resolve(null),
|
|
82
|
+
loader.load('equipment:keyboard'),
|
|
83
|
+
loader.load('equipment:mouse'),
|
|
84
|
+
options.hasLaptop ? loader.load('equipment:laptop') : Promise.resolve(null),
|
|
85
|
+
]).then((results) => {
|
|
86
|
+
// If successfully loaded, replace placeholder with real models
|
|
87
|
+
const deskModel = results[0].status === 'fulfilled' ? results[0].value : null
|
|
88
|
+
const chairModel = results[1].status === 'fulfilled' ? results[1].value : null
|
|
89
|
+
const screenModel1 = results[2].status === 'fulfilled' ? results[2].value : null
|
|
90
|
+
const screenModel2 = results[3].status === 'fulfilled' ? results[3].value : null
|
|
91
|
+
const kbModel = results[4].status === 'fulfilled' ? results[4].value : null
|
|
92
|
+
const mouseModel = results[5].status === 'fulfilled' ? results[5].value : null
|
|
93
|
+
const laptopModel = results[6].status === 'fulfilled' ? results[6].value : null
|
|
94
|
+
|
|
95
|
+
if (deskModel) {
|
|
96
|
+
placeholderGroup.visible = false
|
|
97
|
+
|
|
98
|
+
// Real Desk
|
|
99
|
+
deskModel.scale.set(2.0, 1.95, 2.0)
|
|
100
|
+
deskModel.position.set(-0.7, 0, 0.38)
|
|
101
|
+
deskModel.traverse((node) => {
|
|
102
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
103
|
+
})
|
|
104
|
+
modelsContainer.add(deskModel)
|
|
105
|
+
|
|
106
|
+
// Real Chair
|
|
107
|
+
if (chairModel) {
|
|
108
|
+
chairModel.scale.set(2.2, 2.2, 2.2)
|
|
109
|
+
chairModel.position.set(-0.35, 0, 0.65)
|
|
110
|
+
chairModel.rotation.y = Math.PI
|
|
111
|
+
chairModel.traverse((node) => {
|
|
112
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
113
|
+
})
|
|
114
|
+
modelsContainer.add(chairModel)
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
// Real Primary Screen
|
|
118
|
+
if (screenModel1) {
|
|
119
|
+
screenModel1.scale.set(1.5, 1.5, 1.5)
|
|
120
|
+
screenModel1.position.set(options.dualMonitor ? -0.28 : 0, 0.74, -0.2)
|
|
121
|
+
screenModel1.traverse((node) => {
|
|
122
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
123
|
+
})
|
|
124
|
+
|
|
125
|
+
// Overlay glowing dashboard screen plane
|
|
126
|
+
const disp1 = new THREE.Mesh(new THREE.PlaneGeometry(0.58, 0.34), screenMat1)
|
|
127
|
+
disp1.position.set(options.dualMonitor ? -0.28 : 0, 0.98, -0.19)
|
|
128
|
+
if (options.entityId) disp1.userData = { entityId: options.entityId }
|
|
129
|
+
modelsContainer.add(disp1)
|
|
130
|
+
modelsContainer.add(screenModel1)
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
// Real Secondary Screen (Dual Monitor Setup)
|
|
134
|
+
if (screenModel2) {
|
|
135
|
+
screenModel2.scale.set(1.5, 1.5, 1.5)
|
|
136
|
+
screenModel2.position.set(0.35, 0.74, -0.18)
|
|
137
|
+
screenModel2.rotation.y = -Math.PI / 7
|
|
138
|
+
screenModel2.traverse((node) => {
|
|
139
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
140
|
+
})
|
|
141
|
+
|
|
142
|
+
// Overlay glowing code screen plane
|
|
143
|
+
const disp2 = new THREE.Mesh(new THREE.PlaneGeometry(0.58, 0.34), screenMat2)
|
|
144
|
+
disp2.position.set(0.35, 0.98, -0.17)
|
|
145
|
+
disp2.rotation.y = -Math.PI / 7
|
|
146
|
+
if (options.entityId) disp2.userData = { entityId: options.entityId }
|
|
147
|
+
modelsContainer.add(disp2)
|
|
148
|
+
modelsContainer.add(screenModel2)
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
// Real Keyboard
|
|
152
|
+
if (kbModel) {
|
|
153
|
+
kbModel.scale.set(1.5, 1.5, 1.5)
|
|
154
|
+
kbModel.position.set(0, 0.75, 0.08)
|
|
155
|
+
kbModel.traverse((node) => {
|
|
156
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
157
|
+
})
|
|
158
|
+
modelsContainer.add(kbModel)
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
// Real Mouse
|
|
162
|
+
if (mouseModel) {
|
|
163
|
+
mouseModel.scale.set(1.4, 1.4, 1.4)
|
|
164
|
+
mouseModel.position.set(0.28, 0.75, 0.08)
|
|
165
|
+
mouseModel.traverse((node) => {
|
|
166
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
167
|
+
})
|
|
168
|
+
modelsContainer.add(mouseModel)
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
// Real Laptop
|
|
172
|
+
if (laptopModel) {
|
|
173
|
+
laptopModel.scale.set(0.9, 0.9, 0.9)
|
|
174
|
+
laptopModel.position.set(0.5, 0.75, -0.05)
|
|
175
|
+
laptopModel.rotation.y = -Math.PI / 6
|
|
176
|
+
laptopModel.traverse((node) => {
|
|
177
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
178
|
+
})
|
|
179
|
+
modelsContainer.add(laptopModel)
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
})
|
|
183
|
+
|
|
184
|
+
// Ceramic Coffee Mug
|
|
186
185
|
const mugGeo = new THREE.CylinderGeometry(0.04, 0.035, 0.08, 12)
|
|
187
186
|
const mugMat = materials.getWallMaterial('#ffffff')
|
|
188
187
|
const mug = new THREE.Mesh(mugGeo, mugMat)
|
|
189
188
|
mug.position.set(-0.55, 0.8, -0.1)
|
|
189
|
+
if (options.entityId) mug.userData = { entityId: options.entityId }
|
|
190
190
|
group.add(mug)
|
|
191
191
|
|
|
192
192
|
return group
|
|
@@ -216,45 +216,46 @@ export function createExecutiveDesk(
|
|
|
216
216
|
chairShadow.position.set(0, 0.003, 0.65)
|
|
217
217
|
group.add(chairShadow)
|
|
218
218
|
|
|
219
|
-
//
|
|
220
|
-
const
|
|
221
|
-
|
|
219
|
+
// Real 3D Corner Desk
|
|
220
|
+
const modelsContainer = new THREE.Group()
|
|
221
|
+
modelsContainer.name = 'executive-models'
|
|
222
|
+
group.add(modelsContainer)
|
|
223
|
+
|
|
224
|
+
const placeholderGroup = new THREE.Group()
|
|
225
|
+
const mainTop = new THREE.Mesh(new THREE.BoxGeometry(2.2, 0.08, 0.9), woodMat)
|
|
222
226
|
mainTop.position.set(0, 0.74, 0)
|
|
223
227
|
mainTop.castShadow = true
|
|
224
228
|
if (options.entityId) mainTop.userData = { entityId: options.entityId }
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
const
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
chair.add(back)
|
|
256
|
-
|
|
257
|
-
group.add(chair)
|
|
229
|
+
placeholderGroup.add(mainTop)
|
|
230
|
+
group.add(placeholderGroup)
|
|
231
|
+
|
|
232
|
+
const loader = ModelLoader.getInstance()
|
|
233
|
+
void Promise.allSettled([
|
|
234
|
+
loader.load('furniture:deskCorner'),
|
|
235
|
+
loader.load('furniture:chairDesk'),
|
|
236
|
+
]).then(([deskRes, chairRes]) => {
|
|
237
|
+
if (deskRes.status === 'fulfilled') {
|
|
238
|
+
placeholderGroup.visible = false
|
|
239
|
+
const deskCorner = deskRes.value
|
|
240
|
+
deskCorner.scale.set(2.4, 2.0, 2.4)
|
|
241
|
+
deskCorner.position.set(-1.0, 0, 0.7)
|
|
242
|
+
deskCorner.traverse((node) => {
|
|
243
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
244
|
+
})
|
|
245
|
+
modelsContainer.add(deskCorner)
|
|
246
|
+
|
|
247
|
+
if (chairRes.status === 'fulfilled') {
|
|
248
|
+
const execChair = chairRes.value
|
|
249
|
+
execChair.scale.set(2.5, 2.5, 2.5)
|
|
250
|
+
execChair.position.set(-0.35, 0, 0.8)
|
|
251
|
+
execChair.rotation.y = Math.PI
|
|
252
|
+
execChair.traverse((node) => {
|
|
253
|
+
if (options.entityId) node.userData = { entityId: options.entityId }
|
|
254
|
+
})
|
|
255
|
+
modelsContainer.add(execChair)
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
})
|
|
258
259
|
|
|
259
260
|
// Executive Curved Ultrawide Display
|
|
260
261
|
const screenGeo = new THREE.BoxGeometry(1.1, 0.45, 0.04)
|
|
@@ -287,30 +288,15 @@ export function createConferenceTable(materials: MaterialPalette): THREE.Group {
|
|
|
287
288
|
shadow.position.set(0, 0.003, 0)
|
|
288
289
|
group.add(shadow)
|
|
289
290
|
|
|
290
|
-
//
|
|
291
|
-
const
|
|
292
|
-
|
|
293
|
-
table.position.set(0, 0.74, 0)
|
|
294
|
-
table.castShadow = true
|
|
295
|
-
table.receiveShadow = true
|
|
296
|
-
group.add(table)
|
|
297
|
-
|
|
298
|
-
// Center cable tray
|
|
299
|
-
const trayGeo = new THREE.BoxGeometry(2.0, 0.01, 0.2)
|
|
300
|
-
const trayMat = materials.getFrameMaterial('#0f172a')
|
|
301
|
-
const tray = new THREE.Mesh(trayGeo, trayMat)
|
|
302
|
-
tray.position.set(0, 0.785, 0)
|
|
303
|
-
group.add(tray)
|
|
291
|
+
// Real 3D Conference Table
|
|
292
|
+
const modelsContainer = new THREE.Group()
|
|
293
|
+
group.add(modelsContainer)
|
|
304
294
|
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
group.add(
|
|
310
|
-
|
|
311
|
-
const p2 = new THREE.Mesh(pillarGeo, legMat)
|
|
312
|
-
p2.position.set(1.4, 0.35, 0)
|
|
313
|
-
group.add(p2)
|
|
295
|
+
const placeholder = new THREE.Mesh(new THREE.BoxGeometry(4.5, 0.08, 1.6), woodMat)
|
|
296
|
+
placeholder.position.set(0, 0.74, 0)
|
|
297
|
+
placeholder.castShadow = true
|
|
298
|
+
placeholder.receiveShadow = true
|
|
299
|
+
group.add(placeholder)
|
|
314
300
|
|
|
315
301
|
// Surround chairs
|
|
316
302
|
const addChair = (x: number, z: number, rotY: number) => {
|
|
@@ -344,5 +330,15 @@ export function createConferenceTable(materials: MaterialPalette): THREE.Group {
|
|
|
344
330
|
addChair(-2.55, 0, Math.PI / 2)
|
|
345
331
|
addChair(2.55, 0, -Math.PI / 2)
|
|
346
332
|
|
|
333
|
+
// Heavy pillars
|
|
334
|
+
const pillarGeo = new THREE.CylinderGeometry(0.2, 0.2, 0.7, 16)
|
|
335
|
+
const p1 = new THREE.Mesh(pillarGeo, legMat)
|
|
336
|
+
p1.position.set(-1.4, 0.35, 0)
|
|
337
|
+
group.add(p1)
|
|
338
|
+
|
|
339
|
+
const p2 = new THREE.Mesh(pillarGeo, legMat)
|
|
340
|
+
p2.position.set(1.4, 0.35, 0)
|
|
341
|
+
group.add(p2)
|
|
342
|
+
|
|
347
343
|
return group
|
|
348
344
|
}
|