Skip to content

Commit 7b0b38c

Browse files
committed
providing loadARParam with video sizes
- more debugging couts
1 parent 0d38724 commit 7b0b38c

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

build/webarkit_ES6_wasm.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/WebARKit.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

emscripten/WebARKitJS.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ void WebARKit::initialize_w(int videoWidth, int videoHeight, webarkit::TRACKER_T
3131
}
3232
}
3333

34-
void WebARKit::loadARParam(std::string paramName, webarkit::TRACKER_TYPE trackerType) {
35-
m_tracker->loadARParam(paramName, trackerType);
34+
void WebARKit::loadARParam(std::string paramName, webarkit::TRACKER_TYPE trackerType, size_t xsize, size_t ysize) {
35+
m_tracker->loadARParam(paramName, trackerType, xsize, ysize);
3636
}
3737

3838
void WebARKit::addMarker(emscripten::val data_buffer, std::string filename, int width, int height, int markerID,

emscripten/WebARKitJS.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class WebARKit {
3939

4040
void initialize_w(int videoWidth, int videoHeight, webarkit::TRACKER_TYPE trackerType);
4141

42-
void loadARParam(std::string paramName, webarkit::TRACKER_TYPE trackerType);
42+
void loadARParam(std::string paramName, webarkit::TRACKER_TYPE trackerType, size_t xsize, size_t ysize);
4343

4444
void addMarker(emscripten::val data_buffer, std::string filename, int width, int height, int markerID, float scale);
4545

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"build-no-libar": "node tools/makem.js --no-libar; echo Built at `date`",
4444
"build-all-dev": "node tools/makem.js --no-libar; echo Built at `date` && webpack --mode development --progress --watch",
4545
"build-docker": "docker exec emscripten-webarkit npm run build",
46+
"build-docker-debug": "docker exec emscripten-webarkit npm run build --debug",
4647
"build-docker-no-libar": "docker exec emscripten-webarkit npm run build-no-libar",
4748
"watch": "./node_modules/.bin/watch 'npm run build' ./js/"
4849
},

src/WebARKitController.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ export default class WebARKitController {
142142
let matrix = [];
143143
this.processFrame_w(imageData);
144144

145-
let pose = this.updatePose(1);
146-
//console.log(pose);
145+
let pose = this.updatePose(0);
146+
console.log(pose);
147147

148148
if (this.isValid()) {
149149

@@ -173,7 +173,7 @@ export default class WebARKitController {
173173
const buffer = new Uint8Array(data);
174174
this.instance.FS.writeFile(filename, buffer, { encoding: "binary" });
175175
console.info('loaded camera');
176-
return this.webarkit.loadARParam(filename, this.trackerType)
176+
return this.webarkit.loadARParam(filename, this.trackerType, this.videoWidth, this.videoHeight)
177177
}
178178

179179
async loadTrackerGrayImage(imgData, width, height) {

0 commit comments

Comments
 (0)