mirror of
https://github.com/Doodle3D/Doodle3D-Slicer.git
synced 2024-11-22 05:37:55 +01:00
disable control buttons instead of hiding them while slicing
This commit is contained in:
parent
54811b27e9
commit
d9edfe9bde
@ -139,7 +139,8 @@ class Interface extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
resetMesh = () => {
|
resetMesh = () => {
|
||||||
const { mesh, render } = this.state;
|
const { mesh, render, isSlicing } = this.state;
|
||||||
|
if (isSlicing) return;
|
||||||
if (mesh) {
|
if (mesh) {
|
||||||
mesh.position.set(0, 0, 0);
|
mesh.position.set(0, 0, 0);
|
||||||
mesh.scale.set(1, 1, 1);
|
mesh.scale.set(1, 1, 1);
|
||||||
@ -153,7 +154,8 @@ class Interface extends React.Component {
|
|||||||
scaleUp = () => this.scaleMesh(0.9);
|
scaleUp = () => this.scaleMesh(0.9);
|
||||||
scaleDown = () => this.scaleMesh(1.0 / 0.9);
|
scaleDown = () => this.scaleMesh(1.0 / 0.9);
|
||||||
scaleMesh = (factor) => {
|
scaleMesh = (factor) => {
|
||||||
const { mesh, render } = this.state;
|
const { mesh, render, isSlicing } = this.state;
|
||||||
|
if (isSlicing) return;
|
||||||
if (mesh) {
|
if (mesh) {
|
||||||
mesh.scale.multiplyScalar(factor);
|
mesh.scale.multiplyScalar(factor);
|
||||||
mesh.updateMatrix();
|
mesh.updateMatrix();
|
||||||
@ -166,7 +168,8 @@ class Interface extends React.Component {
|
|||||||
rotateY = () => this.rotate(new Vector3(1, 0, 0), Math.PI / 2.0);
|
rotateY = () => this.rotate(new Vector3(1, 0, 0), Math.PI / 2.0);
|
||||||
rotateZ = () => this.rotate(new Vector3(0, 1, 0), Math.PI / 2.0);
|
rotateZ = () => this.rotate(new Vector3(0, 1, 0), Math.PI / 2.0);
|
||||||
rotate = (axis, angle) => {
|
rotate = (axis, angle) => {
|
||||||
const { mesh, render } = this.state;
|
const { mesh, render, isSlicing } = this.state;
|
||||||
|
if (isSlicing) return;
|
||||||
if (mesh) {
|
if (mesh) {
|
||||||
mesh.rotateOnWorldAxis(axis, angle);
|
mesh.rotateOnWorldAxis(axis, angle);
|
||||||
placeOnGround(mesh);
|
placeOnGround(mesh);
|
||||||
@ -277,14 +280,14 @@ class Interface extends React.Component {
|
|||||||
<div className={classes.d3View}>
|
<div className={classes.d3View}>
|
||||||
<ReactResizeDetector handleWidth handleHeight onResize={this.onResize3dView} />
|
<ReactResizeDetector handleWidth handleHeight onResize={this.onResize3dView} />
|
||||||
<canvas className={classes.canvas} ref="canvas" />
|
<canvas className={classes.canvas} ref="canvas" />
|
||||||
{!isSlicing && <div className={classes.controlBar}>
|
<div className={classes.controlBar}>
|
||||||
<RaisedButton className={classes.controlButton} onTouchTap={this.resetMesh} label="reset" />
|
<RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.resetMesh} label="reset" />
|
||||||
<RaisedButton className={classes.controlButton} onTouchTap={this.scaleUp} label="scale down" />
|
<RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.scaleUp} label="scale down" />
|
||||||
<RaisedButton className={classes.controlButton} onTouchTap={this.scaleDown} label="scale up" />
|
<RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.scaleDown} label="scale up" />
|
||||||
<RaisedButton className={classes.controlButton} onTouchTap={this.rotateX} label="rotate x" />
|
<RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateX} label="rotate x" />
|
||||||
<RaisedButton className={classes.controlButton} onTouchTap={this.rotateY} label="rotate y" />
|
<RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateY} label="rotate y" />
|
||||||
<RaisedButton className={classes.controlButton} onTouchTap={this.rotateZ} label="rotate z" />
|
<RaisedButton disabled={isSlicing} className={classes.controlButton} onTouchTap={this.rotateZ} label="rotate z" />
|
||||||
</div>}
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user