Skip to content

Commit

Permalink
Rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
@xeolabs
xeolabs committed Mar 29, 2024
1 parent 42d035e commit 61e525b
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 64 deletions.
71 changes: 40 additions & 31 deletions dist/xeokit-bim-viewer.es.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109901,22 +109901,6 @@ class SectionTool extends Controller { // XX
return;
}
if (e.target === this._menuButtonElement || e.target.parentNode === this._menuButtonElement) {
return;
}
const active = this.getActive();
this.setActive(!active);
e.preventDefault();
});

document.addEventListener("mousedown", (e) => {

if (e.target.classList.contains("xeokit-context-menu-item")) {
// Allow click on menu item
return;
}

if (e.target === this._menuButtonElement || e.target.parentNode === this._menuButtonElement) {
e.preventDefault();
if (this._sectionToolContextMenu.shown) {
this._sectionToolContextMenu.hide();
} else {
Expand All @@ -109930,9 +109914,11 @@ class SectionTool extends Controller { // XX

this._sectionToolContextMenu.show(rect.left, rect.bottom + 5);
}
} else {
this._sectionToolContextMenu.hide();
return;
}
const active = this.getActive();
this.setActive(!active);
e.preventDefault();
});

this._sectionToolContextMenu.on("shown", () => {
Expand Down Expand Up @@ -109963,25 +109949,30 @@ class SectionTool extends Controller { // XX

_initSectionMode() {

this.viewer.scene.input.on("mouseclicked", (coords) => {
document.addEventListener('mouseup', (e) => {

if (!this.getActive() || !this.getEnabled()) {
return;
}
if (e.which === 1) {

const pickResult = this.viewer.scene.pick({
canvasPos: coords,
pickSurface: true // <<------ This causes picking to find the intersection point on the entity
});
const coords = getMouseCanvasPos(e);

if (pickResult) {
if (!this.getActive() || !this.getEnabled()) {
return;
}

const sectionPlane = this._sectionPlanesPlugin.createSectionPlane({
pos: pickResult.worldPos,
dir: math.mulVec3Scalar(pickResult.worldNormal, -1)
const pickResult = this.viewer.scene.pick({
canvasPos: coords,
pickSurface: true // <<------ This causes picking to find the intersection point on the entity
});

this._sectionPlanesPlugin.showControl(sectionPlane.id);
if (pickResult) {

const sectionPlane = this._sectionPlanesPlugin.createSectionPlane({
pos: pickResult.worldPos,
dir: math.mulVec3Scalar(pickResult.worldNormal, -1)
});

this._sectionPlanesPlugin.showControl(sectionPlane.id);
}
}
});

Expand Down Expand Up @@ -110034,6 +110025,24 @@ class SectionTool extends Controller { // XX
}
}

function getMouseCanvasPos(event) {
if (!event) {
event = window.event;
this.mouseCanvasPos[0] = event.x;
this.mouseCanvasPos[1] = event.y;
} else {
let element = event.target;
let totalOffsetLeft = 0;
let totalOffsetTop = 0;
while (element.offsetParent) {
totalOffsetLeft += element.offsetLeft;
totalOffsetTop += element.offsetTop;
element = element.offsetParent;
}
return [event.pageX - totalOffsetLeft, event.pageY - totalOffsetTop];
}
}

/** @private */
class NavCubeMode extends Controller {

Expand Down
2 changes: 1 addition & 1 deletion dist/xeokit-bim-viewer.min.es.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/xeokit-bim-viewer.min.umd.js
View file

Large diffs are not rendered by default.

71 changes: 40 additions & 31 deletions dist/xeokit-bim-viewer.umd.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109907,22 +109907,6 @@
return;
}
if (e.target === this._menuButtonElement || e.target.parentNode === this._menuButtonElement) {
return;
}
const active = this.getActive();
this.setActive(!active);
e.preventDefault();
});

document.addEventListener("mousedown", (e) => {

if (e.target.classList.contains("xeokit-context-menu-item")) {
// Allow click on menu item
return;
}

if (e.target === this._menuButtonElement || e.target.parentNode === this._menuButtonElement) {
e.preventDefault();
if (this._sectionToolContextMenu.shown) {
this._sectionToolContextMenu.hide();
} else {
Expand All @@ -109936,9 +109920,11 @@

this._sectionToolContextMenu.show(rect.left, rect.bottom + 5);
}
} else {
this._sectionToolContextMenu.hide();
return;
}
const active = this.getActive();
this.setActive(!active);
e.preventDefault();
});

this._sectionToolContextMenu.on("shown", () => {
Expand Down Expand Up @@ -109969,25 +109955,30 @@

_initSectionMode() {

this.viewer.scene.input.on("mouseclicked", (coords) => {
document.addEventListener('mouseup', (e) => {

if (!this.getActive() || !this.getEnabled()) {
return;
}
if (e.which === 1) {

const pickResult = this.viewer.scene.pick({
canvasPos: coords,
pickSurface: true // <<------ This causes picking to find the intersection point on the entity
});
const coords = getMouseCanvasPos(e);

if (pickResult) {
if (!this.getActive() || !this.getEnabled()) {
return;
}

const sectionPlane = this._sectionPlanesPlugin.createSectionPlane({
pos: pickResult.worldPos,
dir: math.mulVec3Scalar(pickResult.worldNormal, -1)
const pickResult = this.viewer.scene.pick({
canvasPos: coords,
pickSurface: true // <<------ This causes picking to find the intersection point on the entity
});

this._sectionPlanesPlugin.showControl(sectionPlane.id);
if (pickResult) {

const sectionPlane = this._sectionPlanesPlugin.createSectionPlane({
pos: pickResult.worldPos,
dir: math.mulVec3Scalar(pickResult.worldNormal, -1)
});

this._sectionPlanesPlugin.showControl(sectionPlane.id);
}
}
});

Expand Down Expand Up @@ -110040,6 +110031,24 @@
}
}

function getMouseCanvasPos(event) {
if (!event) {
event = window.event;
this.mouseCanvasPos[0] = event.x;
this.mouseCanvasPos[1] = event.y;
} else {
let element = event.target;
let totalOffsetLeft = 0;
let totalOffsetTop = 0;
while (element.offsetParent) {
totalOffsetLeft += element.offsetLeft;
totalOffsetTop += element.offsetTop;
element = element.offsetParent;
}
return [event.pageX - totalOffsetLeft, event.pageY - totalOffsetTop];
}
}

/** @private */
class NavCubeMode extends Controller {

Expand Down

0 comments on commit 61e525b

Please sign in to comment.