Skip to content

Commit 02ac3e5

Browse files
committed
feat: release obc
1 parent 1cf1afe commit 02ac3e5

File tree

20 files changed

+113
-123
lines changed

20 files changed

+113
-123
lines changed

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@
6060
"vite": "5.1.6",
6161
"vite-plugin-dts": "3.7.3"
6262
}
63-
}
63+
}

packages/obc/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@thatopen/ui-obc",
33
"description": "Collection of web components (UI components) implementations to use with @thatopen/components.",
4-
"version": "3.1.6",
4+
"version": "3.2.0",
55
"author": "That Open Company",
66
"contributors": [
77
"Juan Hoyos (https://github.com/HoyosJuan)"
@@ -39,13 +39,13 @@
3939
"access": "public"
4040
},
4141
"dependencies": {
42-
"@thatopen/ui": "~3.1.0",
42+
"@thatopen/ui": "~3.2.0",
4343
"lit": "3.1.2"
4444
},
4545
"devDependencies": {
46-
"@thatopen/components": "~3.1.0",
47-
"@thatopen/components-front": "~3.1.0",
48-
"@thatopen/fragments": "~3.1.0",
46+
"@thatopen/components": "~3.2.0",
47+
"@thatopen/components-front": "~3.2.0",
48+
"@thatopen/fragments": "~3.2.0",
4949
"@types/node": "20.11.30",
5050
"@types/three": "0.175.0",
5151
"@typescript-eslint/eslint-plugin": "7.2.0",
@@ -63,13 +63,13 @@
6363
"typescript": "5.4.2",
6464
"vite": "5.1.6",
6565
"vite-plugin-dts": "3.7.3",
66-
"web-ifc": "0.0.71"
66+
"web-ifc": "0.0.72"
6767
},
6868
"peerDependencies": {
69-
"@thatopen/components": "~3.1.0",
70-
"@thatopen/components-front": "~3.1.0",
71-
"@thatopen/fragments": "~3.1.0",
69+
"@thatopen/components": "~3.2.0",
70+
"@thatopen/components-front": "~3.2.0",
71+
"@thatopen/fragments": "~3.2.0",
7272
"three": ">=0.175.0",
73-
"web-ifc": ">=0.0.71"
73+
"web-ifc": ">=0.0.72"
7474
}
75-
}
75+
}

packages/obc/src/components/buttons/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ export const buttons = {
55
...loadIfc,
66
...loadFrag,
77
};
8+
9+
export * from "./load-frag/src/types"
10+
export * from "./load-ifc/src/types"

packages/obc/src/components/buttons/load-ifc/example.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,9 @@ CUI.Manager.init();
88

99
const components = new OBC.Components();
1010
const fragments = components.get(OBC.FragmentsManager);
11-
const githubUrl =
12-
"https://thatopen.github.io/engine_fragment/resources/worker.mjs";
13-
const fetchedUrl = await fetch(githubUrl);
14-
const workerBlob = await fetchedUrl.blob();
15-
const workerFile = new File([workerBlob], "worker.mjs", {
16-
type: "text/javascript",
17-
});
18-
const workerUrl = URL.createObjectURL(workerFile);
19-
fragments.init(workerUrl);
11+
fragments.init(
12+
"/node_modules/@thatopen-platform/fragments-beta/dist/Worker/worker.mjs",
13+
);
2014

2115
const worldElementA = document.createElement("bim-world");
2216
document.body.append(worldElementA);

packages/obc/src/components/forms/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ import * as topic from "./TopicForm";
22

33
export const forms = {
44
...topic,
5-
};
5+
};

packages/obc/src/components/sections/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const sections = {
1212
// ...specificationInformation,
1313
};
1414

15-
export * from "./TopicInformation/src";
16-
export * from "./TopicComments/src";
17-
export * from "./TopicRelations/src";
18-
export * from "./TopicViewpoints/src";
15+
export * from "./TopicInformation/src/types";
16+
export * from "./TopicComments/src/types";
17+
export * from "./TopicRelations/src/types";
18+
export * from "./TopicViewpoints/src/types";

packages/obc/src/components/tables/ItemsData/example.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,9 @@ await ifcLoader.setup();
8484
*/
8585

8686
const fragments = components.get(OBC.FragmentsManager);
87-
const githubUrl =
88-
"https://thatopen.github.io/engine_fragment/resources/worker.mjs";
89-
const fetchedUrl = await fetch(githubUrl);
90-
const workerBlob = await fetchedUrl.blob();
91-
const workerFile = new File([workerBlob], "worker.mjs", {
92-
type: "text/javascript",
93-
});
94-
const workerUrl = URL.createObjectURL(workerFile);
95-
fragments.init(workerUrl);
87+
fragments.init(
88+
"/node_modules/@thatopen-platform/fragments-beta/dist/Worker/worker.mjs",
89+
);
9690

9791
world.camera.controls.addEventListener("update", () =>
9892
fragments.core.update(true),

packages/obc/src/components/tables/ModelsList/example.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,9 @@ await ifcLoader.setup();
7575
*/
7676

7777
const fragments = components.get(OBC.FragmentsManager);
78-
const githubUrl =
79-
"https://thatopen.github.io/engine_fragment/resources/worker.mjs";
80-
const fetchedUrl = await fetch(githubUrl);
81-
const workerBlob = await fetchedUrl.blob();
82-
const workerFile = new File([workerBlob], "worker.mjs", {
83-
type: "text/javascript",
84-
});
85-
const workerUrl = URL.createObjectURL(workerFile);
86-
fragments.init(workerUrl);
78+
fragments.init(
79+
"/node_modules/@thatopen-platform/fragments-beta/dist/Worker/worker.mjs",
80+
);
8781

8882
world.camera.controls.addEventListener("rest", () =>
8983
fragments.core.update(true),

packages/obc/src/components/tables/ModelsList/src/set-defaults.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export const setDefaults = (
2020
table.noIndentation = true;
2121
table.dataTransform = {
2222
Name: (value, row) => {
23+
if (!fragments.initialized) return value
2324
const { modelId, metadata } = row;
2425
if (!modelId) return value;
2526
const model = fragments.list.get(modelId);

packages/obc/src/components/tables/ModelsList/src/template.ts

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,23 @@ export const modelsListTemplate = (state: ModelsListState) => {
2121
if (!e) return;
2222
const table = e as BUI.Table<ModelsListTableData>;
2323
const rowGroups: BUI.TableGroupData<ModelsListTableData>[] = [];
24-
for (const [, model] of fragments.list) {
25-
if (!model) continue;
26-
const metadata = await model.getMetadata();
27-
const rowGroup: BUI.TableGroupData<ModelsListTableData> = {
28-
data: {
29-
Name: model.modelId,
30-
modelId: model.modelId,
31-
metadata: JSON.stringify(metadata),
32-
},
33-
};
34-
rowGroups.push(rowGroup);
24+
25+
if (fragments.initialized) {
26+
for (const [, model] of fragments.list) {
27+
if (!model) continue;
28+
const metadata = await model.getMetadata();
29+
const rowGroup: BUI.TableGroupData<ModelsListTableData> = {
30+
data: {
31+
Name: model.modelId,
32+
modelId: model.modelId,
33+
metadata: JSON.stringify(metadata),
34+
},
35+
};
36+
rowGroups.push(rowGroup);
37+
}
3538
}
3639

40+
3741
table.data = rowGroups;
3842
};
3943

0 commit comments

Comments
 (0)