Skip to content

Fix zoom with measurement #33

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

Merged
JanoSlivka merged 2 commits into from
Dec 7, 2021
Merged

Fix zoom with measurement #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f6712b
Fix zoom measurement.
JanSlivka Dec 2, 2021
d72a728
Package version.
JanSlivka Dec 7, 2021
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@krosas/bimsurfer3",
"version": "0.272.21",
"version": "0.272.22",
"description": "BIMsurferV3",
"scripts": {
"remove-package": "del *.tgz",
Expand Down
43 changes: 32 additions & 11 deletions viewer/svgoverlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as mat4 from "./glmatrix/mat4.js";
import * as vec4 from "./glmatrix/vec4.js";
import * as vec3 from "./glmatrix/vec3.js";
import * as vec2 from "./glmatrix/vec2.js"
import * as mat2 from "./glmatrix/mat2.js"
Expand Down Expand Up @@ -228,7 +229,12 @@ class MeasurementNode extends SvgOverlayNode {
/*if (this.points.length < 2 || this.length <= 1) {
return "";
}*/
return "M" + this.points.map((p) => this.overlay.toString(this.overlay.transformPoint(p))).join(" L");
// return "M" + this.points.map((p) => this.overlay.toString(this.overlay.transformPoint(p))).join(" L");
return "M" + this.points
.map(this.overlay.transformPoint.bind(this.overlay))
.filter(p => p[3] > 0.)
.map(this.overlay.toString.bind(this.overlay))
.join(" L");
}

isVisible() {
Expand Down Expand Up @@ -269,20 +275,30 @@ class MeasurementNode extends SvgOverlayNode {
if (this.points.length < 2) {
return null;
} else if (this.points.length == 2) {
vec3.copy(tmp_measurement_, this.overlay.transformPoint(this.points[0]));
let t = this.overlay.transformPoint(this.points[1]);
vec2.add(tmp_measurement_, tmp_measurement_, t);
vec2.scale(tmp_measurement_, tmp_measurement_, 0.5);
let x = this.overlay.transformPoint(this.points[0]);
if (x[3] < 0.) {
tmp_measurement_.fill(-100);
} else {
vec3.copy(tmp_measurement_, x);
let t = this.overlay.transformPoint(this.points[1]);
vec2.add(tmp_measurement_, tmp_measurement_, t);
vec2.scale(tmp_measurement_, tmp_measurement_, 0.5);
}
} else {
let M = this.length / 2.;
let accum = 0.;
for (let i = 0; i < this.points.length - 1; ++i) {
vec3.subtract(tmp_measurement_, this.points[i], this.points[i + 1]);
vec3.subtract(tmp_measurement_, this.points[i], this.points[i + 1]);
let segmentLength = vec3.length(tmp_measurement_);
if (M - accum < segmentLength) {
vec3.copy(tmp_measurement_, this.overlay.transformPoint(this.points[i]));
let t = this.overlay.transformPoint(this.points[i + 1]);
vec2.lerp(tmp_measurement_, tmp_measurement_, t, (M - accum) / segmentLength);
let x = this.overlay.transformPoint(this.points[i]);
if (x[3] < 0.) {
tmp_measurement_.fill(-100);
} else {
vec3.copy(tmp_measurement_, x);
let t = this.overlay.transformPoint(this.points[i + 1]);
vec2.lerp(tmp_measurement_, tmp_measurement_, t, (M - accum) / segmentLength);
}
break;
}
accum += segmentLength;
Expand Down Expand Up @@ -461,9 +477,14 @@ export class SvgOverlay {
}

transformPoint(p) {
let t = this.tmp;
vec3.transformMat4(t, p, this.camera.viewProjMatrix);
// let t = this.tmp;
let t = vec4.create();
let x = new Float32Array(4);
x.set(p, 0);
x[3] = 1.;
vec4.transformMat4(t, x, this.camera.viewProjMatrix);
t[1] *= -1;
vec3.scale(t, t, 1. / t[3]);
vec2.multiply(t, t, this.wh);
vec2.add(t, t, this.wh);
return t;
Expand Down