Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
kalwalt committed Nov 25, 2023
2 parents 64fcbad + 2b60d7c commit a602005
Show file tree
Hide file tree
Showing 35 changed files with 606 additions and 322 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ or with yarn:
yarn add @webarkit/ar-nft
```

- Configuration data in an External .json file.
- Configuration data in an external .json file.

- Filtering of the matrix with the **O**ne**E**uro**F**ilter.

## Format the code with Prettier
We are using [Prettier](https://prettier.io/) as code formatter. You only need to run `yarn format` to write the formatted code with Prettier. If you want to check if the code is well formatted run instead: `yarn format-check`
Expand Down
4 changes: 2 additions & 2 deletions dist/ARnft.js

Large diffs are not rendered by default.

25 changes: 13 additions & 12 deletions dist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@webarkit/ar-nft",
"version": "0.14.5",
"version": "0.14.6",
"main": "dist/ARnft.js",
"types": "types/src/index.d.ts",
"description": "WebAR Javscript library for markerless AR",
Expand Down Expand Up @@ -38,15 +38,15 @@
"devDependencies": {
"@types/node": "^18.13.0",
"@types/stats.js": "^0.17.0",
"@types/uuid": "^9.0.1",
"prettier": "^2.8.4",
"rimraf": "^4.1.2",
"@types/uuid": "^9.0.7",
"prettier": "^3.1.0",
"rimraf": "^5.0.5",
"stats.js": "^0.17.0",
"ts-loader": "^9.4.2",
"typedoc": "^0.23.26",
"typescript": "^4.9.5",
"webpack": "^5.75.0",
"webpack-cli": "^5.0.1",
"ts-loader": "^9.5.1",
"typedoc": "^0.25.3",
"typescript": "^5.3.2",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4",
"worker-loader": "^3.0.8"
},
"scripts": {
Expand All @@ -59,8 +59,9 @@
"license": "LGPL-3.0",
"resolutions": {},
"dependencies": {
"@webarkit/jsartoolkit-nft": "^1.4.0",
"terser-webpack-plugin": "^5.3.6",
"uuid": "^9.0.0"
"@webarkit/jsartoolkit-nft": "^1.6.1",
"@webarkit/oneeurofilter-ts": "^0.1.0",
"terser-webpack-plugin": "^5.3.9",
"uuid": "^9.0.1"
}
}
4 changes: 2 additions & 2 deletions dist/src/ARnft.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/src/ARnft.js.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions dist/src/NFTWorker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/src/NFTWorker.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 28 additions & 3 deletions dist/src/Worker.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a602005

Please sign in to comment.