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.

Sign up for GitHub

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
203293b
testing new c++ wrapper implementation
kalwalt Feb 26, 2023
1ca0928
Merge branch 'dev' into feat-ARToolKitNFT-em-class
kalwalt Feb 27, 2023
3d99aa5
more methods to the ARToolKitNFT class
kalwalt Mar 29, 2023
09f2c9b
last methods and constants to the improved_ES6
kalwalt Mar 29, 2023
deefff6
Merge branch 'dev' into feat-ARToolKitNFT-em-class
kalwalt Mar 29, 2023
c4442b6
testing improved version
kalwalt Mar 29, 2023
d09e46a
testing removing default export
kalwalt Mar 29, 2023
ff09e0d
testing if is better to leave two classes or not
kalwalt Mar 29, 2023
b3824c5
continue on two classes design
kalwalt Mar 30, 2023
60b7e2c
convert properties to methods in IARToolkitNFT
kalwalt Mar 30, 2023
59a8879
restoring original names of the classes
kalwalt Mar 30, 2023
3c23e48
removing _improved version of the libs
kalwalt Apr 1, 2023
91b895d
new nftMarkers property
kalwalt Apr 1, 2023
10f06cc
upgrading packages
kalwalt Apr 1, 2023
1ccdf52
avoid warning about willReadFrequently
kalwalt Apr 1, 2023
3d9526a
added license to new files
kalwalt Apr 2, 2023
d3e95ad
libs with some -g flags
kalwalt Apr 2, 2023
176cece
initializing vars in the cpp file
kalwalt Apr 2, 2023
d8c3fc1
removing Debug flags
kalwalt Apr 2, 2023
5b252dc
adding missed destructor
kalwalt Apr 2, 2023
2debdda
lowering memory size
kalwalt Apr 4, 2023
ddb8b31
update dependencies
kalwalt Apr 4, 2023
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
2 changes: 1 addition & 1 deletion dist/ARToolkitNFT_im.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/ARToolkitNFT_im.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
4 changes: 2 additions & 2 deletions src/index_improved.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@

import ARControllerNFT from "./ARControllerNFT_improved";

export default {
kalwalt marked this conversation as resolved.
Show resolved Hide resolved
export {
ARControllerNFT,
};
}
5 changes: 1 addition & 4 deletions types/src/index_improved.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
import ARControllerNFT from "./ARControllerNFT_improved";
declare const _default: {
ARControllerNFT: typeof ARControllerNFT;
};
export default _default;
export { ARControllerNFT, };
2 changes: 1 addition & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module.exports = (env, argv) => {
library: "ARToolkitNFT",
libraryTarget: "umd",
// @see: https://github.com/webpack/webpack/issues/3929
libraryExport: "default",
///libraryExport: "default",
// @see: https://github.com/webpack/webpack/issues/6522
globalObject: "typeof self !== 'undefined' ? self : this",
},
Expand Down