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

New ARToolKitNFT class in the C++ Emscripten code #301

Merged
merged 22 commits into from
Apr 4, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
adding missed destructor
kalwalt committed Apr 2, 2023
commit 5b252dc7e9c1035e460c36b099b56d12b211c43d
2 changes: 1 addition & 1 deletion build/artoolkitNFT_ES6_wasm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/artoolkitNFT_ES6_wasm.simd.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions emscripten/ARToolKitNFT_js.cpp
Original file line number Diff line number Diff line change
@@ -16,6 +16,10 @@ ARToolKitNFT::ARToolKitNFT()
webarkitLOGi("init ARToolKitNFT constructor...");
}

ARToolKitNFT::~ARToolKitNFT() {
teardown();
}

void matrixLerp(ARdouble src[3][4], ARdouble dst[3][4],
float interpolationFactor) {
for (int i = 0; i < 3; i++) {
2 changes: 1 addition & 1 deletion emscripten/ARToolKitNFT_js.h
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ class ARToolKitNFT
{
public:
ARToolKitNFT();
//~ARToolKitNFT();
~ARToolKitNFT();
int passVideoData(emscripten::val videoFrame, emscripten::val videoLuma);
emscripten::val getNFTMarkerInfo(int markerIndex);
int detectNFTMarker();