Skip to content
2 changes: 1 addition & 1 deletion build/artoolkitplus_em_ES6_debug.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/trackerMM_ES6.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/trackerSM_ES6.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/trackerSM_ES6_debug.js

Large diffs are not rendered by default.

701 changes: 700 additions & 1 deletion dist/ARToolKitPlus.js

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion emscripten/trackerMM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@ void TrackerMM::setup(string camParamFile, string multiFile, int maxImagePattern

// Initialize a Single Marker Tracker with
// Camera and near and far clipping values for the OpenGL projection matrix
if (!tracker->init(camParamFile.c_str(), multiFile.c_str(), 1.0f, 1000.0f)) {
/*if (!tracker->init(camParamFile.c_str(), multiFile.c_str(), 1.0f, 1000.0f)) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i had troble loading both files, now i will develop my init function:
in this commit only load the camera but we can load the multi file and calib file separately.


printf("ERROR: init() failed\n");
tracker = nullptr;

return;
}*/
if (!tracker->loadCameraFile(camParamFile.c_str(), 1.0f, 1000.0f)) {
printf("ERROR: loadCameraFile() failed\n");
tracker = nullptr;

return;
}
tracker->getCamera()->printSettings();
Expand Down
Loading