Permalink
Browse files
Merge remote-tracking branch 'refs/remotes/origin/dev' into gh-pages
Showing
with
3 additions
and
5 deletions.
-
+3
−5
js/main.js
|
|
@@ -942,10 +942,8 @@ function updateTransformValues() { |
|
current.y = input.y;
|
|
current.y = input.y;
|
|
current.z = input.z;
|
|
current.z = input.z;
|
|
|
|
|
|
- //var currentLayer = settings.get('');
|
|
+ loadGeometry(slicer.mesh.geometry, false);
|
|
- loadGeometry(slicer.mesh.geometry);
|
|
|
|
getSlice($sliderInput.slider('getValue'));
|
|
getSlice($sliderInput.slider('getValue'));
|
|
- //viewer3d.render();
|
|
|
|
}
|
|
}
|
|
|
|
|
|
$transformButtons.on('click', function(e) {
|
|
$transformButtons.on('click', function(e) {
|
|
|
@@ -991,7 +989,7 @@ function loadGeometry(geometry, mirror) { |
|
removeShapes();
|
|
removeShapes();
|
|
|
|
|
|
// flip geometry
|
|
// flip geometry
|
|
- if (mirror || settings.get('slicer.mirror')) {
|
|
+ if (mirror) {
|
|
geometry.applyMatrix(new THREE.Matrix4().makeScale(-1, 1, 1));
|
|
geometry.applyMatrix(new THREE.Matrix4().makeScale(-1, 1, 1));
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1030,7 +1028,7 @@ function ultraMegaDirtyFix() { |
|
// On Geometry loaded
|
|
// On Geometry loaded
|
|
loader.onGeometry = function(geometry) {
|
|
loader.onGeometry = function(geometry) {
|
|
resetTransformValues();
|
|
resetTransformValues();
|
|
- loadGeometry(geometry);
|
|
+ loadGeometry(geometry, settings.get('slicer.mirror'));
|
|
ultraMegaDirtyFix();
|
|
ultraMegaDirtyFix();
|
|
};
|
|
};
|
|
|
|
|
|
|
|
0 comments on commit
9a7c56f