Skip to content

Commit 9527e7e

Browse files
Fix getTickDirection
1 parent 1507eb6 commit 9527e7e

File tree

2 files changed

+7
-24
lines changed

2 files changed

+7
-24
lines changed

src/axes.js

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,14 @@ function toCanvasCoords(position, camera) {
2121
}
2222

2323
// i is 0, 1 or 2.
24-
function getTickDirection(i, radius, axesGeometry, boundingBox) {
25-
const tickDirection = new Vector3();
24+
function getTickDirection(i, radius) {
2625
const tickLength = 0.005 * radius;
2726

2827
if (i === 0) {
29-
if (axesGeometry[0].attributes.position.array[1] > boundingBox.position.y) {
30-
tickDirection.setY(-tickLength);
31-
} else {
32-
tickDirection.setY(tickLength);
33-
}
34-
} else if (i === 1) {
35-
if (axesGeometry[1].attributes.position.array[0] > boundingBox.position.x) {
36-
tickDirection.setX(-tickLength);
37-
} else {
38-
tickDirection.setX(tickLength);
39-
}
40-
} else {
41-
if (axesGeometry[2].attributes.position.array[0] > boundingBox.position.x) {
42-
tickDirection.setX(-tickLength);
43-
} else {
44-
tickDirection.setX(tickLength);
45-
}
28+
return new Vector3(0, -tickLength, 0);
29+
} else { // i === 1 || i === 2
30+
return new Vector3(tickLength, 0, 0);
4631
}
47-
48-
return tickDirection;
4932
}
5033

5134
export function positionTickNumbers(hasAxes, tickNumbers, ticks, camera, canvasSize, maxSize) {
@@ -77,10 +60,10 @@ export function positionTickNumbers(hasAxes, tickNumbers, ticks, camera, canvasS
7760
}
7861
}
7962

80-
export function setTicksInitialPosition(hasAxes, axes, ticks, ticksSmall, axesGeometry, boundingBox, radius, extent) {
63+
export function setTicksInitialPosition(hasAxes, axes, ticks, ticksSmall, axesGeometry, radius, extent) {
8164
for (let i = 0; i < 3; i++) {
8265
if (hasAxes[i]) {
83-
const tickDirection = getTickDirection(i, radius, axesGeometry, boundingBox);
66+
const tickDirection = getTickDirection(i, radius);
8467

8568
axes.ticks[i][0].forEach((value, j) => {
8669
const partialCoordinate = scalePartialCoordinate(value, i, extent);

src/graphics3d.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export default function (
216216
}
217217
}
218218

219-
setTicksInitialPosition(hasAxes, axes, ticks, ticksSmall, axesGeometry, boundingBox, radius, extent);
219+
setTicksInitialPosition(hasAxes, axes, ticks, ticksSmall, axesGeometry, radius, extent);
220220

221221
// axes numbering using divs
222222
const tickNumbers = new Array(3);

0 commit comments

Comments
 (0)