Skip to content

Commit

Permalink
Rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
@xeolabs
xeolabs committed Oct 21, 2023
1 parent acc9a98 commit fd78ead
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 83 deletions.
79 changes: 46 additions & 33 deletions dist/xeokit-sdk.cjs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10894,7 +10894,7 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
}
this.angleMeasurementsPlugin;
const scene = this.scene;
const input = scene.input;
scene.input;
const canvas = scene.canvas.canvas;
const clickTolerance = 20;
const cameraControl = this.angleMeasurementsPlugin.viewer.cameraControl;
Expand Down Expand Up @@ -10964,15 +10964,21 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
break;
}
});
this._onInputMouseDown = input.on("mousedown", (coords) => {
lastMouseCanvasX = coords[0];
lastMouseCanvasY = coords[1];
canvas.addEventListener('mousedown', this._onMouseDown = (e) => {
if (e.which !== 1) {
return;
}
lastMouseCanvasX = e.clientX;
lastMouseCanvasY = e.clientY;
});
this._onInputMouseUp = input.on("mouseup", (coords) => {
if (coords[0] > lastMouseCanvasX + clickTolerance ||
coords[0] < lastMouseCanvasX - clickTolerance ||
coords[1] > lastMouseCanvasY + clickTolerance ||
coords[1] < lastMouseCanvasY - clickTolerance) {
canvas.addEventListener("mouseup", this._onMouseUp =(e) => {
if (e.which !== 1) {
return;
}
if (e.clientX > lastMouseCanvasX + clickTolerance ||
e.clientX < lastMouseCanvasX - clickTolerance ||
e.clientY > lastMouseCanvasY + clickTolerance ||
e.clientY < lastMouseCanvasY - clickTolerance) {
return;
}
switch (this._mouseState) {
Expand Down Expand Up @@ -11089,10 +11095,10 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
this.pointerLens.visible = false;
}
this.reset();
const input = this.angleMeasurementsPlugin.viewer.scene.input;
const canvas = this.scene.canvas.canvas;
canvas.removeEventListener("mousedown", this._onMouseDown);
canvas.removeEventListener("mouseup", this._onMouseUp);
const cameraControl = this.angleMeasurementsPlugin.viewer.cameraControl;
input.off(this._onInputMouseDown);
input.off(this._onInputMouseUp);
cameraControl.off(this._onMouseHoverSurface);
cameraControl.off(this._onPickedSurface);
cameraControl.off(this._onHoverNothing);
Expand Down Expand Up @@ -17079,7 +17085,7 @@ const Renderer$1 = function (scene, options) {

function gpuPickPickable(pickBuffer, canvasPos, pickViewMatrix, pickProjMatrix, params, pickResult) {

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17145,7 +17151,7 @@ const Renderer$1 = function (scene, options) {
return;
}

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17191,7 +17197,7 @@ const Renderer$1 = function (scene, options) {

return function (pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, nearAndFar, pickResult) {

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17325,7 +17331,7 @@ const Renderer$1 = function (scene, options) {
return this.pick({canvasPos, pickSurface: true});
}

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17516,7 +17522,7 @@ const Renderer$1 = function (scene, options) {

function gpuPickWorldNormal(pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult) {

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -48484,8 +48490,8 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {

this._onCameraControlHoverSnapOrSurface = null;
this._onCameraControlHoverSnapOrSurfaceOff = null;
this._onInputMouseDown = null;
this._onInputMouseUp = null;
this._onMouseDown = null;
this._onMouseUp = null;
this._onCanvasTouchStart = null;
this._onCanvasTouchEnd = null;
this._snapping = cfg.snapping !== false;
Expand Down Expand Up @@ -48563,7 +48569,7 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
const scene = this.scene;
const cameraControl = distanceMeasurementsPlugin.viewer.cameraControl;
const canvas = scene.canvas.canvas;
const input = scene.input;
scene.input;
let mouseHovering = false;
const pointerWorldPos = math.vec3();
const pointerCanvasPos = math.vec2();
Expand Down Expand Up @@ -48621,16 +48627,22 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
}
});

this._onInputMouseDown = input.on("mousedown", (coords) => {
pointerDownCanvasX = coords[0];
pointerDownCanvasY = coords[1];
canvas.addEventListener('mousedown', this._onMouseDown = (e) => {
if (e.which !== 1) {
return;
}
pointerDownCanvasX = e.clientX;
pointerDownCanvasY = e.clientY;
});

this._onInputMouseUp = input.on("mouseup", (coords) => {
if (coords[0] > pointerDownCanvasX + clickTolerance ||
coords[0] < pointerDownCanvasX - clickTolerance ||
coords[1] > pointerDownCanvasY + clickTolerance ||
coords[1] < pointerDownCanvasY - clickTolerance) {
canvas.addEventListener("mouseup", this._onMouseUp =(e) => {
if (e.which !== 1) {
return;
}
if (e.clientX > pointerDownCanvasX + clickTolerance ||
e.clientX < pointerDownCanvasX - clickTolerance ||
e.clientY > pointerDownCanvasY + clickTolerance ||
e.clientY < pointerDownCanvasY - clickTolerance) {
return;
}
if (this._currentDistanceMeasurement) {
Expand Down Expand Up @@ -48703,9 +48715,10 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
this.pointerLens.visible = false;
}
this.reset();
const input = this.distanceMeasurementsPlugin.viewer.scene.input;
input.off(this._onInputMouseDown);
input.off(this._onInputMouseUp);
this.viewer;
const canvas = this.scene.canvas.canvas;
canvas.removeEventListener("mousedown", this._onMouseDown);
canvas.removeEventListener("mouseup", this._onMouseUp);
const cameraControl = this.distanceMeasurementsPlugin.viewer.cameraControl;
cameraControl.off(this._onCameraControlHoverSnapOrSurface);
cameraControl.off(this._onCameraControlHoverSnapOrSurfaceOff);
Expand Down Expand Up @@ -186063,8 +186076,8 @@ class WebIFCLoaderPlugin extends Plugin {
const metaObjectName = (ifcElement.Name && ifcElement.Name.value !== "") ? ifcElement.Name.value : metaObjectType;
const metaObject = {
id: id,
name: metaObjectType,
type: metaObjectName,
name: metaObjectName,
type: metaObjectType,
parent: parentMetaObjectId
};
ctx.metadata.metaObjects.push(metaObject);
Expand Down
79 changes: 46 additions & 33 deletions dist/xeokit-sdk.es.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10890,7 +10890,7 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
}
this.angleMeasurementsPlugin;
const scene = this.scene;
const input = scene.input;
scene.input;
const canvas = scene.canvas.canvas;
const clickTolerance = 20;
const cameraControl = this.angleMeasurementsPlugin.viewer.cameraControl;
Expand Down Expand Up @@ -10960,15 +10960,21 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
break;
}
});
this._onInputMouseDown = input.on("mousedown", (coords) => {
lastMouseCanvasX = coords[0];
lastMouseCanvasY = coords[1];
canvas.addEventListener('mousedown', this._onMouseDown = (e) => {
if (e.which !== 1) {
return;
}
lastMouseCanvasX = e.clientX;
lastMouseCanvasY = e.clientY;
});
this._onInputMouseUp = input.on("mouseup", (coords) => {
if (coords[0] > lastMouseCanvasX + clickTolerance ||
coords[0] < lastMouseCanvasX - clickTolerance ||
coords[1] > lastMouseCanvasY + clickTolerance ||
coords[1] < lastMouseCanvasY - clickTolerance) {
canvas.addEventListener("mouseup", this._onMouseUp =(e) => {
if (e.which !== 1) {
return;
}
if (e.clientX > lastMouseCanvasX + clickTolerance ||
e.clientX < lastMouseCanvasX - clickTolerance ||
e.clientY > lastMouseCanvasY + clickTolerance ||
e.clientY < lastMouseCanvasY - clickTolerance) {
return;
}
switch (this._mouseState) {
Expand Down Expand Up @@ -11085,10 +11091,10 @@ class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
this.pointerLens.visible = false;
}
this.reset();
const input = this.angleMeasurementsPlugin.viewer.scene.input;
const canvas = this.scene.canvas.canvas;
canvas.removeEventListener("mousedown", this._onMouseDown);
canvas.removeEventListener("mouseup", this._onMouseUp);
const cameraControl = this.angleMeasurementsPlugin.viewer.cameraControl;
input.off(this._onInputMouseDown);
input.off(this._onInputMouseUp);
cameraControl.off(this._onMouseHoverSurface);
cameraControl.off(this._onPickedSurface);
cameraControl.off(this._onHoverNothing);
Expand Down Expand Up @@ -17075,7 +17081,7 @@ const Renderer$1 = function (scene, options) {

function gpuPickPickable(pickBuffer, canvasPos, pickViewMatrix, pickProjMatrix, params, pickResult) {

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17141,7 +17147,7 @@ const Renderer$1 = function (scene, options) {
return;
}

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17187,7 +17193,7 @@ const Renderer$1 = function (scene, options) {

return function (pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, nearAndFar, pickResult) {

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17321,7 +17327,7 @@ const Renderer$1 = function (scene, options) {
return this.pick({canvasPos, pickSurface: true});
}

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -17512,7 +17518,7 @@ const Renderer$1 = function (scene, options) {

function gpuPickWorldNormal(pickBuffer, pickable, canvasPos, pickViewMatrix, pickProjMatrix, pickResult) {

const resolutionScale = viewer.scene.canvas.resolutionScale;
const resolutionScale = scene.canvas.resolutionScale;

frameCtx.reset();
frameCtx.backfaces = true;
Expand Down Expand Up @@ -48480,8 +48486,8 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {

this._onCameraControlHoverSnapOrSurface = null;
this._onCameraControlHoverSnapOrSurfaceOff = null;
this._onInputMouseDown = null;
this._onInputMouseUp = null;
this._onMouseDown = null;
this._onMouseUp = null;
this._onCanvasTouchStart = null;
this._onCanvasTouchEnd = null;
this._snapping = cfg.snapping !== false;
Expand Down Expand Up @@ -48559,7 +48565,7 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
const scene = this.scene;
const cameraControl = distanceMeasurementsPlugin.viewer.cameraControl;
const canvas = scene.canvas.canvas;
const input = scene.input;
scene.input;
let mouseHovering = false;
const pointerWorldPos = math.vec3();
const pointerCanvasPos = math.vec2();
Expand Down Expand Up @@ -48617,16 +48623,22 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
}
});

this._onInputMouseDown = input.on("mousedown", (coords) => {
pointerDownCanvasX = coords[0];
pointerDownCanvasY = coords[1];
canvas.addEventListener('mousedown', this._onMouseDown = (e) => {
if (e.which !== 1) {
return;
}
pointerDownCanvasX = e.clientX;
pointerDownCanvasY = e.clientY;
});

this._onInputMouseUp = input.on("mouseup", (coords) => {
if (coords[0] > pointerDownCanvasX + clickTolerance ||
coords[0] < pointerDownCanvasX - clickTolerance ||
coords[1] > pointerDownCanvasY + clickTolerance ||
coords[1] < pointerDownCanvasY - clickTolerance) {
canvas.addEventListener("mouseup", this._onMouseUp =(e) => {
if (e.which !== 1) {
return;
}
if (e.clientX > pointerDownCanvasX + clickTolerance ||
e.clientX < pointerDownCanvasX - clickTolerance ||
e.clientY > pointerDownCanvasY + clickTolerance ||
e.clientY < pointerDownCanvasY - clickTolerance) {
return;
}
if (this._currentDistanceMeasurement) {
Expand Down Expand Up @@ -48699,9 +48711,10 @@ class DistanceMeasurementsMouseControl extends DistanceMeasurementsControl {
this.pointerLens.visible = false;
}
this.reset();
const input = this.distanceMeasurementsPlugin.viewer.scene.input;
input.off(this._onInputMouseDown);
input.off(this._onInputMouseUp);
this.viewer;
const canvas = this.scene.canvas.canvas;
canvas.removeEventListener("mousedown", this._onMouseDown);
canvas.removeEventListener("mouseup", this._onMouseUp);
const cameraControl = this.distanceMeasurementsPlugin.viewer.cameraControl;
cameraControl.off(this._onCameraControlHoverSnapOrSurface);
cameraControl.off(this._onCameraControlHoverSnapOrSurfaceOff);
Expand Down Expand Up @@ -186059,8 +186072,8 @@ class WebIFCLoaderPlugin extends Plugin {
const metaObjectName = (ifcElement.Name && ifcElement.Name.value !== "") ? ifcElement.Name.value : metaObjectType;
const metaObject = {
id: id,
name: metaObjectType,
type: metaObjectName,
name: metaObjectName,
type: metaObjectType,
parent: parentMetaObjectId
};
ctx.metadata.metaObjects.push(metaObject);
Expand Down
Loading

0 comments on commit fd78ead

Please sign in to comment.