Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
kalwalt committed Jun 5, 2024
2 parents a278dd4 + 6b6f09a commit 85a493f
Show file tree
Hide file tree
Showing 19 changed files with 1,519 additions and 1,357 deletions.
90 changes: 88 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,92 @@
"array": "cpp",
"any": "cpp",
"string_view": "cpp",
"regex": "cpp"
}
"regex": "cpp",
"bitset": "cpp",
"deque": "cpp",
"initializer_list": "cpp",
"list": "cpp",
"queue": "cpp",
"random": "cpp",
"stack": "cpp",
"type_traits": "cpp",
"valarray": "cpp",
"vector": "cpp",
"xhash": "cpp",
"xstring": "cpp",
"xtree": "cpp",
"xutility": "cpp",
"algorithm": "cpp",
"atomic": "cpp",
"bit": "cpp",
"cctype": "cpp",
"cfenv": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"coroutine": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"exception": "cpp",
"format": "cpp",
"forward_list": "cpp",
"fstream": "cpp",
"functional": "cpp",
"future": "cpp",
"iomanip": "cpp",
"ios": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"iterator": "cpp",
"limits": "cpp",
"locale": "cpp",
"map": "cpp",
"memory": "cpp",
"mutex": "cpp",
"new": "cpp",
"numeric": "cpp",
"optional": "cpp",
"ostream": "cpp",
"ratio": "cpp",
"set": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"string": "cpp",
"system_error": "cpp",
"thread": "cpp",
"tuple": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"utility": "cpp",
"xfacet": "cpp",
"xiosbase": "cpp",
"xlocale": "cpp",
"xlocbuf": "cpp",
"xlocinfo": "cpp",
"xlocmes": "cpp",
"xlocmon": "cpp",
"xlocnum": "cpp",
"xloctime": "cpp",
"xmemory": "cpp",
"xstddef": "cpp",
"xtr1common": "cpp"
},
"cmake.configureOnOpen": false
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ This is a repository testing for [**WebARKit**](https://github.com/webarkit). Th

### Pre-requisites

You need emscripten `3.1.26` because openCV may be built with this version.
You need emscripten `3.1.26` because OpenCV may be built with this version. We are using our OpenCV (4.7.0) forked version.

### Instructions

Expand All @@ -33,6 +33,6 @@ It is possible to build a debug version of the library with `npm run build-debug
## Examples

Go in examples folder try one of the examples... point the camera to the pinball.jpg image and you will see some messages.
At the moment it support Akaze or Orb, when the pinball image is detected and tracked it should display a colored image and blue rect border around.
At the moment it support Akaze, Orb, Freak and Teblid. When the pinball image is detected and tracked it should display a colored image with a blue rect border around. Consider that the examples are not optimized for Mobile devices yet, best to try on desktop PC.

Try the live examples at https://kalwalt.github.io/webarkit-testing/
Try the live examples at https://webarkit.github.io/webarkit-testing/
44 changes: 22 additions & 22 deletions build/webarkit_ES6_wasm.js

Large diffs are not rendered by default.

113 changes: 59 additions & 54 deletions build/webarkit_ES6_wasm.simd.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/GrayScale.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/SpeedyVisionSinkImageData.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/WebARKit.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/WebARKit.js.LICENSE.txt

This file was deleted.

Loading

0 comments on commit 85a493f

Please sign in to comment.