Skip to content

Commit

Permalink
Prepared fix for issue #614.
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsschmidt1337 committed Dec 18, 2017
1 parent 186b88b commit fda100a
Showing 1 changed file with 6 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -189,23 +189,23 @@ public Matrix getSlantingMatrix(boolean originToAxisCenter) {
Vector3d origin = new Vector3d();

if (originToAxisCenter) {
Vector3d axismidpoint1 = new Vector3d();
Vector3d axismidpoint2 = new Vector3d();
Vector3d.add(new Vector3d(axis1[0]).scaledByHalf(), new Vector3d(axis1[1]).scaledByHalf(), axismidpoint1);
Vector3d.add(new Vector3d(axis2[0]).scaledByHalf(), new Vector3d(axis2[1]).scaledByHalf(), axismidpoint2);
Vector3d.add(axismidpoint1.scaledByHalf(), axismidpoint2.scaledByHalf(), origin);
mx = mx.scaledByHalf();
my = my.scaledByHalf();
Vector3d.add(origin, zref, origin);
Vector3d.add(origin, mx, origin);
Vector3d.add(origin, my, origin);
}

// FIXME Modes needs to be tested...

switch (axisSelectionMode) {
case 0: // X,Y,Z (no adjustment)
case 1: // X,Y (no adjustment)
break;
case 2: // X,Z (swap YZ)
tmp = mz;
mz = my;
my = tmp;
my = tmp.scale(BigDecimal.ONE.negate());
break;
case 3: // Y,Z (swap XY+YZ)
tmp = mx;
Expand All @@ -220,24 +220,11 @@ public Matrix getSlantingMatrix(boolean originToAxisCenter) {
}

// Calculate matrix

// FIXME Origin and matrix needs to be corrected!

result = new Matrix(
mx.X, mx.Y, mx.Z, BigDecimal.ZERO,
my.X, my.Y, my.Z, BigDecimal.ZERO,
mz.X, mz.Y, mz.Z, BigDecimal.ZERO,
BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ZERO, BigDecimal.ONE);
/*
result = new Matrix(
mx.X, my.X, mz.X, BigDecimal.ZERO,
mx.Y, my.Y, mz.Y, BigDecimal.ZERO,
mx.Z, my.Z, mz.Z, BigDecimal.ZERO,
origin.X, origin.Y, origin.Z, BigDecimal.ONE);
*/


transformation = result;
return result;
Expand Down

0 comments on commit fda100a

Please sign in to comment.