diff --git a/src/helpers/angleHelper.js b/src/helpers/angleHelper.js index 4430758..ddd5fe2 100644 --- a/src/helpers/angleHelper.js +++ b/src/helpers/angleHelper.js @@ -8,7 +8,7 @@ function radToDeg(angle) { return angle * (180 / Math.PI); } -function rotationDegToRad(vector) { +function vectorDegToRad(vector) { return new Vector3( degToRad(vector.x), degToRad(vector.y), @@ -16,7 +16,7 @@ function rotationDegToRad(vector) { ); } -function rotationRadToDeg(vector) { +function vectorRadToDeg(vector) { return new Vector3( radToDeg(vector.x), radToDeg(vector.y), @@ -45,8 +45,8 @@ function normalizeDegVector(vector) { const AngleHelper = { degToRad, radToDeg, - rotationDegToRad, - rotationRadToDeg, + vectorDegToRad, + vectorRadToDeg, normalizeDegAngle, normalizeDegVector } diff --git a/src/helpers/curveHelper.js b/src/helpers/curveHelper.js index b512581..4780d22 100644 --- a/src/helpers/curveHelper.js +++ b/src/helpers/curveHelper.js @@ -37,11 +37,11 @@ function calculateCurveEndStandard(radius, curveLength) { } function transformStart(globalStart, globalRotationDeg, localStart, localRotationQuat) { - const globalRotationRad = AngleHelper.rotationDegToRad(globalRotationDeg); + const globalRotationRad = AngleHelper.vectorDegToRad(globalRotationDeg); const startPos = globalStart.add(localStart.rotate(globalRotationRad)); const rotationQuat = Quaternion.fromEulerAnglesRad(globalRotationRad).multiply(localRotationQuat); const rotationRad = rotationQuat.toEulerAnglesRad(); - const rotationDeg = AngleHelper.rotationRadToDeg(rotationRad); + const rotationDeg = AngleHelper.vectorRadToDeg(rotationRad); return { startPos, diff --git a/src/model/misc-group.js b/src/model/misc-group.js index 11fffef..94d20e5 100644 --- a/src/model/misc-group.js +++ b/src/model/misc-group.js @@ -24,7 +24,7 @@ export default class MiscGroup { getQuaternion() { if (!this.quaternion) { - const rotRad = AngleHelper.rotationDegToRad(this.rot); + const rotRad = AngleHelper.vectorDegToRad(this.rot); this.quaternion = Quaternion.fromEulerAnglesRad(rotRad).normalize(); } diff --git a/src/model/misc/misc.js b/src/model/misc/misc.js index 57dc61f..d3743ca 100644 --- a/src/model/misc/misc.js +++ b/src/model/misc/misc.js @@ -49,7 +49,7 @@ export default class Misc extends SceneryObject { worldQuat = groupQuat.multiply(worldQuat).normalize(); } - const worldRot = AngleHelper.rotationRadToDeg(worldQuat.toEulerAnglesRad()); + const worldRot = AngleHelper.vectorRadToDeg(worldQuat.toEulerAnglesRad()); const yawData = worldQuat.getMiscYawData(); return [ worldPos, worldRot, yawData ]; diff --git a/src/model/switch.js b/src/model/switch.js index 9ccc11b..fbebd50 100644 --- a/src/model/switch.js +++ b/src/model/switch.js @@ -89,7 +89,7 @@ export default class Switch extends SceneryObject { this.tracks = tracks; this.def = def; - const rotRad = AngleHelper.rotationDegToRad(this.rot); + const rotRad = AngleHelper.vectorDegToRad(this.rot); this.isolation_id_pos = this.pos.add(def.isolationLabelPos.rotate(rotRad)); super.applyObject(scenery); } diff --git a/src/model/tracks/standard-track.js b/src/model/tracks/standard-track.js index 9c96550..2826a02 100644 --- a/src/model/tracks/standard-track.js +++ b/src/model/tracks/standard-track.js @@ -20,7 +20,7 @@ export default class StandardTrack extends Track { } _transformPoint(point) { - const rotRad = AngleHelper.rotationDegToRad(this.rot); + const rotRad = AngleHelper.vectorDegToRad(this.rot); return point.rotate(rotRad).add(this.points.start); }