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

Small upgrades #27

Draft
wants to merge 7 commits into
base: dev
Choose a base branch
from
Draft

Small upgrades #27

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1018fec
small packages and deps upgrades
kalwalt Jan 14, 2025
02d3f2b
output from log for p1 is always NaN NaN
kalwalt Jan 14, 2025
f3cdb8f
fixed NaN bug, but points(p1, p2, p3, p4) are almost negative
kalwalt Jan 14, 2025
5c14ee5
testing opencv 4.10.0 version
kalwalt Jan 23, 2025
1d307f4
improves to viewMatrix_GL and related code
kalwalt Feb 6, 2025
4e816d5
improved getTransformationMatrix function to be tested
kalwalt Feb 7, 2025
32c9ebe
testing getTransformationMatrix function
kalwalt Feb 8, 2025
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 emscripten/WebARKitLib
Open in desktop
Submodule WebARKitLib updated 0 files
30 changes: 18 additions & 12 deletions examples/worker_setup_advanced.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ var oHeight = window.innerHeight;
var vw = oWidth;
var vh = oHeight;

var pscale = 320 / Math.max(vw, vh / 3 * 4);
var sscale = isMobile() ? window.outerWidth / oWidth : 1;

var sw = vw * sscale;
var sh = vh * sscale;

Expand All @@ -71,11 +74,6 @@ var ph = Math.max(h, w / 4 * 3);
var ox = (pw - w) / 2;
var oy = (ph - h) / 2;


var pscale = 320 / Math.max(vw, vh / 3 * 4);
var sscale = isMobile() ? window.outerWidth / oWidth : 1;


var videoEl;
var arElem;
var grayScaleVideo;
Expand Down Expand Up @@ -131,7 +129,7 @@ window.onload = async function () {
switch (msg.type) {
case "loadedTracker": {
proj = JSON.parse(msg.cameraProjMat);
const ratioW = pw / w;
/*const ratioW = pw / w;
const ratioH = ph / h;
proj[0] *= ratioW;
proj[4] *= ratioW;
Expand All @@ -140,7 +138,7 @@ window.onload = async function () {
proj[1] *= ratioH;
proj[5] *= ratioH;
proj[9] *= ratioH;
proj[13] *= ratioH;
proj[13] *= ratioH;*/
hideLoading();
process();
break;
Expand Down Expand Up @@ -201,7 +199,7 @@ window.onload = async function () {

const overlayCtx = overlayCanvas.getContext("2d");
clearOverlayCtx();
drawCorners(JSON.parse(msg.corners));
//drawCorners(JSON.parse(msg.corners));

//var width = marker.width;
const mwidth = 1637;
Expand All @@ -212,10 +210,18 @@ window.onload = async function () {
const w = mwidth / dpi * 2.54 * 10;
const h = mheight / dpi * 2.54 * 10;

const p1 = drawpoint(0, 0, 0);
const p2 = drawpoint(w, 0, 0);
const p3 = drawpoint(w, h, 0);
const p4 = drawpoint(0, h, 0);
let p1 = drawpoint(0, 0, 0);
let p2 = drawpoint(w, 0, 0);
let p3 = drawpoint(w, h, 0);
let p4 = drawpoint(0, h, 0);

// this will draw a fixed red square, uncomment only for debugging...
/*p1 = {x:100, y: 100};
p2 = {x:200, y: 100};
p3 = {x:200, y: 200};
p4 = {x:100, y: 200};*/

console.log(p1, p2, p3, p4)
Copy link
Member Author

@kalwalt kalwalt Jan 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

the values are not in range of x y screen coords, something is wrong (form matrix_GL_RH? from proj matrix or what?)


overlayCtx.beginPath();
overlayCtx.moveTo(p1.x, p1.y);
Expand Down
Loading