fix silly error when hover is unset

remove this.endabled from VoxelPainterControls (turn it off via dispose
if needed)
(3d still not done)
This commit is contained in:
HF 2024-01-20 19:35:07 +01:00
parent ca067fa87d
commit 18f7e14f79
2 changed files with 7 additions and 42 deletions

View File

@ -91,8 +91,6 @@ class VoxelPainterControls {
renderer; renderer;
domElement; domElement;
state; state;
// Set to false to disable this control
enabled = true;
// "target" sets the location of focus, where the object orbits around // "target" sets the location of focus, where the object orbits around
target; target;
// for reset // for reset
@ -437,9 +435,6 @@ class VoxelPainterControls {
// //
// //
onDocumentKeyDown(event) { onDocumentKeyDown(event) {
if (!this.enabled) {
return;
}
// ignore key presses if modal is open or chat is used // ignore key presses if modal is open or chat is used
if (event.target.nodeName === 'INPUT' if (event.target.nodeName === 'INPUT'
|| event.target.nodeName === 'TEXTAREA' || event.target.nodeName === 'TEXTAREA'
@ -476,9 +471,6 @@ class VoxelPainterControls {
} }
onDocumentKeyUp(event) { onDocumentKeyUp(event) {
if (!this.enabled) {
return;
}
// ignore key presses if modal is open or chat is used // ignore key presses if modal is open or chat is used
if (event.target.nodeName === 'INPUT' if (event.target.nodeName === 'INPUT'
|| event.target.nodeName === 'TEXTAREA' || event.target.nodeName === 'TEXTAREA'
@ -516,10 +508,6 @@ class VoxelPainterControls {
onMouseMove(event) { onMouseMove(event) {
if (!this.enabled) {
return;
}
event.preventDefault(); event.preventDefault();
switch (this.state) { switch (this.state) {
@ -538,10 +526,6 @@ class VoxelPainterControls {
} }
onMouseUp(event) { onMouseUp(event) {
if (!this.enabled) {
return;
}
this.handleMouseUp(event); this.handleMouseUp(event);
document.removeEventListener('mousemove', this.onMouseMove, false); document.removeEventListener('mousemove', this.onMouseMove, false);
document.removeEventListener('mouseup', this.onMouseUp, false); document.removeEventListener('mouseup', this.onMouseUp, false);
@ -549,8 +533,7 @@ class VoxelPainterControls {
} }
onMouseWheel(event) { onMouseWheel(event) {
if (!this.enabled if (!enableZoom
|| !enableZoom
|| (this.state !== STATE.NONE || (this.state !== STATE.NONE
&& this.state !== STATE.ROTATE) && this.state !== STATE.ROTATE)
) { ) {
@ -564,10 +547,6 @@ class VoxelPainterControls {
} }
onTouchStart(event) { onTouchStart(event) {
if (!this.enabled) {
return;
}
event.preventDefault(); event.preventDefault();
switch (event.touches.length) { switch (event.touches.length) {
@ -617,10 +596,6 @@ class VoxelPainterControls {
} }
onTouchMove(event) { onTouchMove(event) {
if (!this.enabled) {
return;
}
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
@ -659,27 +634,15 @@ class VoxelPainterControls {
} }
onTouchEnd(event) { onTouchEnd(event) {
if (!this.enabled) {
return;
}
this.handleTouchEnd(event); this.handleTouchEnd(event);
this.state = STATE.NONE; this.state = STATE.NONE;
} }
onContextMenu(event) { onContextMenu(event) {
if (!this.enabled) {
return;
}
event.preventDefault(); event.preventDefault();
} }
onMouseDown(event) { onMouseDown(event) {
if (!this.enabled) {
return;
}
// Prevent the browser from scrolling. // Prevent the browser from scrolling.
event.preventDefault(); event.preventDefault();

View File

@ -520,13 +520,15 @@ class Renderer3D extends Renderer {
multiTapEnd() { multiTapEnd() {
const { const {
store, store,
mouseMoveStart,
multitap, multitap,
} = this; } = this;
this.multitap = 0; this.multitap = 0;
const state = store.getState(); const state = store.getState();
const [px, py, pz] = mouseMoveStart; if (!this.mouseMoveStart || !state.canvas.hover) {
return;
}
const [px, py, pz] = this.mouseMoveStart;
const [qx, qy, qz] = state.canvas.hover; const [qx, qy, qz] = state.canvas.hover;
if (px !== qx || py !== qy || pz !== qz) { if (px !== qx || py !== qy || pz !== qz) {
return; return;
@ -614,10 +616,10 @@ class Renderer3D extends Renderer {
return; return;
} }
const [px, py, pz] = this.mouseMoveStart; if (!this.mouseMoveStart || !state.canvas.hover) {
if (!state.canvas.hover) {
return; return;
} }
const [px, py, pz] = this.mouseMoveStart;
const [qx, qy, qz] = state.canvas.hover; const [qx, qy, qz] = state.canvas.hover;
if (px !== qx || py !== qy || pz !== qz) { if (px !== qx || py !== qy || pz !== qz) {
return; return;