Skip to content

WIP restoring multi marker #27

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

Open
kalwalt wants to merge 6 commits into
base: master
Choose a base branch
from
Open

WIP restoring multi marker #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
106fd56
restoring _parseMultiFile
kalwalt Sep 11, 2019
bc60cce
map files outside but error: Promise.map is not a constructor
kalwalt Sep 11, 2019
3ee9d81
this maybe is not necessary
kalwalt Sep 11, 2019
5c7a39e
if the func is async it is not necessary to return a new Promise
kalwalt Sep 11, 2019
33e1c84
simplyfing the code
kalwalt Sep 11, 2019
a982434
set log level
kalwalt Dec 20, 2019
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 Examples/simple_video-multi-patt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
});

try {
arController.setLogLevel(0);
//arController.setLogLevel(0);
arController.start().then( () => {
console.log("start done");
var trackableId = arController.addTrackable(trackable);
Expand Down
85 changes: 45 additions & 40 deletions Source/artoolkitX.api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,7 @@ const _loadCameraParam = Symbol('_loadCameraParam')
const _loadMultiTrackable = Symbol('_loadMultiTrackable')
const _ajaxDependencies = Symbol('_ajaxDependencies')
const _parseMultiFile = Symbol('_parseMultiFile')
const _mapFiles = Symbol('_mapFiles')

// Eg.
// ajax('../bin/Data2/markers.dat', '/Data2/markers.dat', callback);
Expand Down Expand Up @@ -1171,7 +1172,7 @@ ARController[_loadMultiTrackable] = async (url) => {
const filename = '/multi_trackable_' + ARController._multi_marker_count++
try {
const bytes = await ARController[_ajax](url, filename)
let files = ARController[_parseMultiFile](bytes)
let files = await ARController[_parseMultiFile](bytes)

// function ok() {
// var markerID = Module._addMultiMarker(arId, filename);
Expand All @@ -1180,11 +1181,8 @@ ARController[_loadMultiTrackable] = async (url) => {
// }

// if (!files.length) return ok();

const path = url.split('/').slice(0, -1).join('/')
files = files.map(function (file) {
return [path + '/' + file, file]
})
//console.log(files);
files = await ARController[_mapFiles](url, files)

await ARController[_ajaxDependencies](files)
return filename
Expand All @@ -1193,6 +1191,13 @@ ARController[_loadMultiTrackable] = async (url) => {
}
}

ARController[_mapFiles] = async (url, files) => {
const path = url.split('/').slice(0, -1).join('/');
return files.map(function(file) {
return [path + '/' + file, file]
})
}

ARController[_ajaxDependencies] = async (files) => {
var next = files.pop()
if (next) {
Expand All @@ -1201,40 +1206,40 @@ ARController[_ajaxDependencies] = async (files) => {
}
}

// ARController[_parseMultiFile] = (bytes) => {
// const str = String.fromCharCode.apply(String, bytes) // basically bytesToString
// const lines = str.split('\n')
// const files = []

// let state = 0 // 0 - read,
// let markers = 0

// lines.forEach(function (line) {
// line = line.trim()
// if (!line || line.startsWith('#')) return // FIXME: Should probably be `if (line.indexOf('#') === 0) { return; }`

// switch (state) {
// case 0:
// markers = +line
// state = 1
// return
// case 1: // filename or barcode
// if (!line.match(/^\d+$/)) {
// files.push(line)
// }
// return
// case 2: // width
// case 3: // matrices
// case 4:
// state++
// return
// case 5:
// state = 1
// }
// })

// return files
// }
ARController[_parseMultiFile] = async (bytes) => {
const str = String.fromCharCode.apply(String, bytes) // basically bytesToString
const lines = str.split('\n')
const files = []

let state = 0 // 0 - read,
let markers = 0

lines.forEach(function (line) {
line = line.trim()
if (!line || line.startsWith('#')) return // FIXME: Should probably be `if (line.indexOf('#') === 0) { return; }`

switch (state) {
case 0:
markers = +line
state = 1
return
case 1: // filename or barcode
if (!line.match(/^\d+$/)) {
files.push(line)
}
return
case 2: // width
case 3: // matrices
case 4:
state++
return
case 5:
state = 1
}
})

return files
}

ARController._marker_count = 0
ARController._camera_count = 0
Expand Down