Skip to content

Commit 2e1ea8f

Browse files
authored
Merge branch 'master' into 1285-fix-resetCameraScreenSpace
2 parents d8847bb + 2d4d284 commit 2e1ea8f

File tree

389 files changed

+18399
-8684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+18399
-8684
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
npx tsc -p tsconfig.esm-check.json
3636
npx tsc -p tsconfig.umd-check.json
3737
- name: Chrome and Firefox tests
38-
run: xvfb-run --auto-servernum npm run test -- --browsers Chrome,Firefox
38+
run: xvfb-run --auto-servernum npm run test -- --browsers ChromeSwiftShader,Firefox
3939
- name: Archive test results
4040
if: github.event_name != 'merge_group' && (success() || failure())
4141
uses: actions/upload-artifact@v4

.github/workflows/pr-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ jobs:
2424
- name: Tests must not use test.only
2525
run: bash .github/workflows/test-only-check.sh
2626
- name: API docs should generate without error
27-
run: npm run doc:generate-api
27+
run: npm run docs:generate-api

.github/workflows/publish.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
fetch-depth: 0
2828
- name: Setup node
29-
uses: actions/setup-node@v1
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: 22
3232
- name: Install dependencies
@@ -42,7 +42,7 @@ jobs:
4242
npx tsc -p tsconfig.esm-check.json
4343
npx tsc -p tsconfig.umd-check.json
4444
- name: Chrome and Firefox tests
45-
run: xvfb-run --auto-servernum npm run test -- --browsers Chrome,Firefox
45+
run: xvfb-run --auto-servernum npm run test -- --browsers ChromeSwiftShader,Firefox
4646
- name: Archive test results
4747
if: always()
4848
uses: actions/upload-artifact@v4
@@ -53,7 +53,8 @@ jobs:
5353
- name: Release
5454
env:
5555
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
56-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
56+
# No need to set NPM_TOKEN because of OIDC
57+
NPM_CONFIG_PROVENANCE: true
5758
run: |
5859
git config --global user.name "Github Actions"
5960
git config --global user.email "sebastien.jourdain@kitware.com"
@@ -80,13 +81,21 @@ jobs:
8081
run: npm ci
8182
- name: Build
8283
run: npm run build:release
83-
- name: Build API docs
84-
run: npm run doc:generate-api
84+
- name: Generate API docs
85+
run: npm run docs:generate-api
86+
- name: Generate docs examples
87+
run: npm run docs:generate-examples
88+
- name: Generate docs sidebar
89+
run: npm run docs:generate-sidebar
90+
- name: Generate docs gallery
91+
run: npm run docs:generate-gallery
8592
- name: Build docs
86-
run: npm run doc:minified
93+
run: npm run docs:build
94+
- name: Build docs examples
95+
run: npm run docs:build-examples
8796
- name: Upload docs as a Pages artifact
8897
uses: actions/upload-pages-artifact@v3
8998
with:
90-
path: ./Documentation/build-tmp/public/
99+
path: ./Documentation/.vitepress/dist/
91100
- name: Deploy docs
92101
uses: actions/deploy-pages@v4

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ coverage/
1010
.env
1111
Utilities/TestResults
1212
.idea
13+
Documentation/.vitepress/cache/
14+
Documentation/.vitepress/dist/
15+
Documentation/build-tmp/
16+
Documentation/content/
17+
Documentation/Examples/

BREAKING_CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## From 34.x to 35
2+
3+
- **vtkMapper**: mappers should overwrite `computeBounds()` instead of `getBounds` that now calls `computeBounds()` before returning a copy of the mapper bounds.
4+
5+
16
## From 33.x to 34
27

38
- **vtkMapper**: many properties have moved to `vtkVolumeProperty`. The full list of changed methods is: `getAnisotropy`, `getComputeNormalFromOpacity`, `getFilterMode`, `getFilterModeAsString`, `getGlobalIlluminationReach`, `getIpScalarRange`, `getIpScalarRangeByReference`, `getLAOKernelRadius`, `getLAOKernelSize`, `getLocalAmbientOcclusion`, `getPreferSizeOverAccuracy`, `getVolumetricScatteringBlending`, `setAnisotropy`, `setAverageIPScalarRange`, `setComputeNormalFromOpacity`, `setFilterMode`, `setFilterModeToNormalized`, `setFilterModeToOff`, `setFilterModeToRaw`, `setGlobalIlluminationReach`, `setIpScalarRange`, `setIpScalarRangeFrom`, `setLAOKernelRadius`, `setLAOKernelSize`, `setLocalAmbientOcclusion`, `setPreferSizeOverAccuracy`, `setVolumetricScatteringBlending`.

CONTRIBUTING.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ Please follow the coding style:
5353
$ git push origin new_feature
5454
```
5555

56-
7. Visit your fork in Github, browse to the "**Pull Requests**" link on the left, and use the
56+
10. Visit your fork in Github, browse to the "**Pull Requests**" link on the left, and use the
5757
"**New Pull Request**" button in the upper right to create a Pull Request.
5858

59-
For more information see:
59+
For more information see:
6060
[Create a Pull Request](https://help.github.com/articles/creating-a-pull-request/)
6161

6262
If committing changes to `vtk.js@next` or `vtk.js@next-major`, then set your base branch to be `next`
@@ -99,7 +99,7 @@ you are satisfied with the staging branch changes, you can then merge into eithe
9999
## Notice
100100

101101
- Don't modify the version number in `package.json`.
102-
- Your pull request will only get merged when tests passed. Don't forget to run tests before
102+
- Your pull request will only get merged when tests passed. Don't forget to run tests before
103103
submission.
104104

105105
```
@@ -116,18 +116,18 @@ To create and debug a test:
116116

117117
## Updating Documentation
118118

119-
The vtk.js documentation is part of the code repository and is entirely written in
119+
The vtk.js documentation is part of the code repository and is entirely written in
120120
[markdown](https://daringfireball.net/projects/markdown/).
121121

122122
If you create an example, please list it in the [examples landing page](Documentation/content/examples/index.md).
123123

124-
Images and GIF videos added to the [gallery](Documentation/content/docs/gallery) must be compressed as much as possible (e.g. 432px by 300px with 50% JPEG compression). You may want to use [ezgif.com](https://ezgif.com/).
124+
Images and GIF videos added to the [gallery](Documentation/public/gallery) must be compressed as much as possible (e.g. 500px by 280px with 50% JPEG compression). You may want to use [ezgif.com](https://ezgif.com/).
125125

126126
## Reporting Issues
127127

128128
If you encounter problems using vtk.js you may be able to find the solutions in the
129-
[troubleshooting docs](https://kitware.github.io/vtk-js/docs/misc_troubleshooting.html), in an
130-
existing [GitHub issue](https://github.com/kitware/vtk-js/issues), or via the
129+
[troubleshooting docs](https://kitware.github.io/vtk-js/docs/misc_troubleshooting.html), in an
130+
existing [GitHub issue](https://github.com/kitware/vtk-js/issues), or via the
131131
[mailing list](http://www.vtk.org/VTK/help/mailing.html).
132-
If you can't find the answer, please
132+
If you can't find the answer, please
133133
[report a new issue on GitHub](https://github.com/Kitware/vtk-js/issues/new).

Data/stl/spherewithholes.stl

56 KB
Binary file not shown.

Data/stl/suzanne.stl

196 KB
Binary file not shown.

Documentation/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
import { defineConfig } from 'vitepress';
2+
import llmstxt from 'vitepress-plugin-llms';
3+
import { copyOrDownloadAsMarkdownButtons } from 'vitepress-plugin-llms';
4+
5+
import { sidebar } from './sidebar';
6+
import { BASE_URL, withBase } from './utils';
7+
8+
// https://vitepress.dev/reference/site-config
9+
export default defineConfig({
10+
base: BASE_URL,
11+
lang: 'en-US',
12+
title: 'VTK.js ',
13+
description: 'VTK.js a Visualization Toolkit for the Web',
14+
lastUpdated: true,
15+
ignoreDeadLinks: true,
16+
srcExclude: ['**/scripts/**',],
17+
vite: {
18+
plugins: [
19+
llmstxt({
20+
ignoreFiles: ['examples/*', 'coverage/*', 'scripts/*'],
21+
}),
22+
],
23+
},
24+
themeConfig: {
25+
// https://vitepress.dev/reference/default-theme-config
26+
logo: '/logo-wide.svg',
27+
siteTitle: '',
28+
nav: [
29+
{ text: 'Docs', link: '/docs/' },
30+
{ text: 'API', link: '/api/' },
31+
{ text: 'Examples', link: '/examples/' },
32+
{ text: 'Datasets', link: 'https://kitware.github.io/vtk-js-datasets/' },
33+
],
34+
sidebar: sidebar,
35+
socialLinks: [
36+
{ icon: 'github', link: 'https://github.com/Kitware/vtk-js' },
37+
],
38+
outline: 'deep',
39+
search: {
40+
provider: 'local',
41+
},
42+
footer: {
43+
copyright: ${new Date().getFullYear()} <a href="https://www.kitware.com/" target="_blank">Kitware Inc</a>.`,
44+
},
45+
},
46+
markdown: {
47+
config(md) {
48+
md.use(copyOrDownloadAsMarkdownButtons);
49+
},
50+
},
51+
});

0 commit comments

Comments
 (0)