Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
04bf978
to be able to use in uptool iframe
Apr 23, 2025
30d4f5d
readme
Apr 23, 2025
6ec1fe8
remove jpg
Apr 23, 2025
06ac630
undo remove jpg
Apr 23, 2025
fc62899
recover embed.html
Apr 23, 2025
633909f
remove doc
Apr 23, 2025
4117b07
polish
Apr 23, 2025
8e1648a
hide title
Apr 23, 2025
8c71843
hide cookie consent
Apr 23, 2025
224abbe
npm install new package-lock.json after merging from upsteam
yangcshen Nov 5, 2025
212085b
use mesh name and comments
yangcshen Nov 5, 2025
4e2a5ff
run lint
yangcshen Nov 5, 2025
29f76ed
update comments
yangcshen Nov 5, 2025
de6be5d
Merge pull request #3 from uptoolapp/ut-989-merge-from-upstream
yangcshen Nov 5, 2025
f1de12a
Merge pull request #4 from uptoolapp/ut-990-display-mesh-name
yangcshen Nov 6, 2025
933f89f
POC
zigomir Nov 7, 2025
3bfce5e
Unit conversion for volume and surface area
zigomir Nov 10, 2025
d38110b
Add unit conversion for distance measurement in MeasureTool
zigomir Nov 10, 2025
adeba4f
Expose both unit and their values in single line
zigomir Nov 13, 2025
cca4ef5
Merge pull request #5 from uptoolapp/ziga/UT-765-both-units
zigomir Nov 13, 2025
0b4fbe8
use z up axis
yangcshen Dec 22, 2025
e077ef6
change to y axis up
yangcshen Dec 24, 2025
0584978
change default camera eye position
yangcshen Dec 24, 2025
dafdf04
add docker file and workflow
yangcshen Dec 29, 2025
7457348
Merge pull request #6 from uptoolapp/ut-1150-camera-orientation-and-e…
yangcshen Dec 29, 2025
ab68f6b
copy src and dockerignore
yangcshen Dec 29, 2025
e8b1617
Merge pull request #7 from uptoolapp/ut-1150-dockerfile-push-image
yangcshen Dec 29, 2025
08ab4b9
Merge remote-tracking branch 'upstream/master' into merge_from_upstream
yangcshen Dec 29, 2025
8cf12c6
revert build_website change
yangcshen Dec 29, 2025
58141e5
add git workflow for publish as a npm package
yangcshen Dec 30, 2025
f2acdda
add website into package
yangcshen Dec 30, 2025
c9eca12
disable original publish
yangcshen Dec 30, 2025
00d14b8
update version in package.json
yangcshen Dec 30, 2025
6d963ab
fix version
yangcshen Dec 30, 2025
1529b5a
Merge pull request #9 from uptoolapp/merge_from_upstream
yangcshen Dec 30, 2025
06ceb02
Bump handlebars from 4.7.8 to 4.7.9
dependabot[bot] Apr 12, 2026
6b46b5f
Bump o3dv version to 0.0.6
alex-varlahanov-uptool Apr 12, 2026
8d886e6
Merge pull request #10 from uptoolapp/dependabot/npm_and_yarn/handleb…
alex-varlahanov-uptool Apr 12, 2026
17b97da
Fix dependabot reported vulnerabilities via npm audit fix
alex-varlahanov-uptool Apr 13, 2026
8e7bb28
Merge pull request #11 from uptoolapp/ut-1878-fix-dependabot-vulnerab…
alex-varlahanov-uptool Apr 13, 2026
0504037
Bump o3dv version to 0.0.7
alex-varlahanov-uptool Apr 13, 2026
861a8d7
Merge pull request #12 from uptoolapp/ut-1878-fix-dependabot-vulnerab…
alex-varlahanov-uptool Apr 13, 2026
611a44b
Prevent loading three libraries from CDN
zigomir Apr 13, 2026
35cf45f
Load occt-import-js lib from "vendor-ized" dir
zigomir Apr 13, 2026
ae2b00d
Remove not used import
zigomir Apr 13, 2026
5d155a8
Merge pull request #13 from uptoolapp/ziga/UT-1880-eliminate-cdn-pack…
alex-varlahanov-uptool Apr 15, 2026
d1c6566
Addressed vulnerabilities in dependencies.
alex-varlahanov-uptool Apr 15, 2026
6fa38ac
Bumped o3dv version to 0.0.8
alex-varlahanov-uptool Apr 15, 2026
9bf4593
Merge pull request #14 from uptoolapp/UT-1902-Fix-remaining-vulnerabi…
alex-varlahanov-uptool Apr 15, 2026
1b5a6e8
Copy vendor files for dev and package mode
zigomir Apr 15, 2026
fe5d92b
Try 2
zigomir Apr 15, 2026
524d849
Revert "UT-1902: Addressed remaining vulnerabilities in o3dv dependen…
zigomir Apr 15, 2026
b7fa932
Merge pull request #16 from uptoolapp/revert-14-UT-1902-Fix-remaining…
alex-varlahanov-uptool Apr 15, 2026
66901b0
Merge pull request #15 from uptoolapp/ziga/UT-1880-fixup
alex-varlahanov-uptool Apr 15, 2026
3664fa9
Bump version before tagging
zigomir Apr 15, 2026
9a64126
Merge pull request #17 from uptoolapp/UT-1880-bump-version
alex-varlahanov-uptool Apr 15, 2026
3ebf594
Export SetExternalLibLocation
zigomir Apr 15, 2026
77b72cf
Merge pull request #18 from uptoolapp/UT-1880-take-3
zigomir Apr 20, 2026
3c193b7
Bump version
zigomir Apr 20, 2026
19ca7dd
Merge pull request #19 from uptoolapp/bump-version
zigomir Apr 20, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
build
.git
40 changes: 40 additions & 0 deletions .github/workflows/docker-online3dviewer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Build And Push Online3DViewer Image

on:
push:
branches: [uptool]
workflow_dispatch:

permissions:
contents: read
packages: write

jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: docker/setup-buildx-action@v3

- uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- uses: docker/metadata-action@v5
id: meta
with:
images: ghcr.io/uptoolapp/online3dviewer
tags: |
type=ref,event=branch
type=sha

- uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile.online3dviewer
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
9 changes: 4 additions & 5 deletions .github/workflows/npm_publish.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: NPM Publish

on:
push:
tags:
- '*'
# disable it
workflow_dispatch: {}

jobs:
build:
Expand All @@ -12,8 +11,8 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
node-version: "18.x"
registry-url: "https://registry.npmjs.org"
- run: npm install
- run: npm run create_dist
- run: npm publish
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/publish-github-packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Publish to GitHub Packages

on:
push:
tags:
- "*"

permissions:
contents: read
packages: write

jobs:
publish:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
registry-url: https://npm.pkg.github.com
scope: "@${{ github.repository_owner }}"
always-auth: true

- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: "3.x"

- name: Install dependencies
run: npm ci

- name: Build package
run: npm run create_package

- name: Publish
run: npm publish --access=restricted
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10 changes: 4 additions & 6 deletions .github/workflows/release_publish.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
name: Release Publish

on:
push:
tags:
- '*'
# disable it
workflow_dispatch: {}

jobs:

build:
runs-on: windows-latest
permissions:
Expand All @@ -15,8 +13,8 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'
node-version: "18.x"
registry-url: "https://registry.npmjs.org"
- run: npm install
- run: npm run create_dist
- uses: ncipollo/release-action@v1
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.online3dviewer
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM node:24 AS online3dviewer-builder
WORKDIR /Online3DViewer
COPY . .
RUN npm install && npm run build_engine && npm run build_engine_module && npm run build_website && npm pack
Loading