Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature upgrade three.js #397

Merged
merged 27 commits into from
Oct 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
dae41b5
fix for issue https://github.com/webarkit/jsartoolkitNFT/issues/363
kalwalt Oct 23, 2024
0c53dc3
upgraded emcc to 3.1.69
kalwalt Oct 23, 2024
a7d5f28
updated node.js version to 20 and improved github actions
kalwalt Oct 23, 2024
fe6c861
upgrade emsdk to 3.1.69 in the github action
kalwalt Oct 23, 2024
16f7ce1
upgrading node packages and re-build of .ts libs
kalwalt Oct 23, 2024
b008e25
upgrading examples loading three.js with module import
kalwalt Oct 24, 2024
799ccfd
upgrading basic and basic_embed_ES6 examples
kalwalt Oct 24, 2024
1ebbac6
upgrading basic_threading and ARToolkitNFT_ES6_threading_example exam…
kalwalt Oct 24, 2024
bb6eb43
gltf example with brave_robot model
kalwalt Oct 24, 2024
fab5265
multi example upgrade
kalwalt Oct 24, 2024
2c24bb5
missed brave_robot model
kalwalt Oct 24, 2024
e6a1135
use THREE.PerspectiveCamera instead of THREE.Camera
kalwalt Oct 24, 2024
0ac0413
convert variables type var to let or const
kalwalt Oct 24, 2024
524a510
better makem.js file
kalwalt Oct 25, 2024
e1379ef
useful commands for building libs with docker
kalwalt Oct 25, 2024
f7b1f83
testing issue with gltf example
kalwalt Oct 25, 2024
c3ed1fd
fix issue with gltf example
kalwalt Oct 25, 2024
bae3288
Add USE_ZLIB flag to makem.js
kalwalt Oct 25, 2024
4261c33
using local three.js files with importmap
kalwalt Oct 25, 2024
0cf1f21
formatting code with prettier
kalwalt Oct 25, 2024
6848743
upgrading typescript and other npm packages
kalwalt Oct 25, 2024
0973f55
updated threaded file for examples
kalwalt Oct 25, 2024
9d3de9a
revert to typescript 5.5.4 for typedoc issue
kalwalt Oct 25, 2024
250f57f
improving gltf excample
kalwalt Oct 26, 2024
3de80bc
updated readme
kalwalt Oct 26, 2024
2978de5
formatting brave_robot code with prettier
kalwalt Oct 26, 2024
b717997
updated WebARKitLib
kalwalt Oct 26, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ jobs:
strategy:
matrix:
node:
- 16.x
- 20.x

# Packages 'firefox' and 'chromium' are pre-installed.
#
# https://github.com/actions/virtual-environments/blob/ubuntu20/20210302.0/images/linux/Ubuntu2004-README.md
runs-on: ubuntu-20.04
name: Node.js ${{ matrix.node }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -34,7 +34,7 @@ jobs:
run: |
echo $RELEASE_VERSION
echo ${{ steps.vars.outputs.tag }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: build
path: |
Expand All @@ -43,9 +43,9 @@ jobs:
!build/libar_simd.bc
- run: git submodule update --init
- run: npm install
- run: docker run -dit --name emscripten -v $(pwd):/src emscripten/emsdk:3.1.40 bash
- run: docker run -dit --name emscripten -v $(pwd):/src emscripten/emsdk:3.1.69 bash
- run: docker exec emscripten npm run build
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: dist
path: dist
Expand All @@ -58,17 +58,15 @@ jobs:
message: new build files from action
add: '["build", "dist"]'
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
build/artoolkitNFT_embed_ES6_wasm.js
build/artoolkitNFT_ES6_wasm.js
build/artoolkitNFT_ES6_wasm_td.js
build/artoolkitNFT_ES6_wasm_td.worker.js
build/artoolkitNFT_ES6_wasm.simd.js
build/artoolkitNFT_thread.js
build/artoolkitNFT_thread.worker.js
build/artoolkitNFT_wasm.js
build/artoolkitNFT_wasm.simd.js
build/artoolkitNFT.debug.js
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build/*.bc
build/*.o
node_modules
docs/*
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.18.1
20.18.0
5 changes: 3 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ emscripten
dist
docs
node_modules
examples
examples/*/*/*/*.js
examples/*/*/*.js
types
*.html
#*.html
*.json
build/*.js
js/*.api.js
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ then:
```javascript
import { ARToolkitNFT, ARControllerNFT } from '@webarkit/jsartoolkit-nft'
```

**Note**: All the examples in the repository are running the code inside a Worker (don't use it in the main thread!). So i you need to import the library in a worker you need to use the `importScripts` function.

```javascript
// example of import in a worker with the wasm code lib
importScripts("../build/artoolkitNFT_wasm.js");
// or the dist lib
importScripts("../dist/ARToolkitNFT.js");
```

## Downloads

You can download the build libs in the [releases page](https://github.com/webarkit/jsartoolkitNFT/releases). Starting from version 0.8.0 it is possible to download `dist` or `build` zip packages and from 0.9.6 version only single libs (no zipped).
Expand Down
Loading