Skip to content

Commit 11abc79

Browse files
thkruzthkruz
authored
Merge pull request #1303 from thkruz/develop
v12.1.3
2 parents d744b80 + 088bebd commit 11abc79

18 files changed

Lines changed: 38 additions & 22 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Latest Version](https://img.shields.io/badge/version-12.1.2-darkgreen?style=flat-square) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/thkruz/keeptrack.space?style=flat-square) ![language](https://img.shields.io/github/languages/top/thkruz/keeptrack.space?style=flat-square) ![Languages](https://img.shields.io/github/languages/count/thkruz/keeptrack.space?style=flat-square) ![GitHub issues](https://img.shields.io/github/issues/thkruz/keeptrack.space?style=flat-square) ![License](https://img.shields.io/github/license/thkruz/keeptrack.space?style=flat-square)
1+
![Latest Version](https://img.shields.io/badge/version-12.1.3-darkgreen?style=flat-square) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/thkruz/keeptrack.space?style=flat-square) ![language](https://img.shields.io/github/languages/top/thkruz/keeptrack.space?style=flat-square) ![Languages](https://img.shields.io/github/languages/count/thkruz/keeptrack.space?style=flat-square) ![GitHub issues](https://img.shields.io/github/issues/thkruz/keeptrack.space?style=flat-square) ![License](https://img.shields.io/github/license/thkruz/keeptrack.space?style=flat-square)
22

33
<picture>
44
<source media="(prefers-color-scheme: dark)" srcset="./public/img/logo.png">

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "keeptrack.space",
3-
"version": "12.1.2",
3+
"version": "12.1.3",
44
"type": "module",
55
"description": "Complex astrodynamics tools designed for non-engineers to make learning about orbital mechanics and satellite operations more accessible.",
66
"author": "Theodore Kruczek",

‎src/engine/rendering/draw-manager/celestial-bodies/celestial-body.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { SphereGeometry } from '@app/engine/rendering/sphere-geometry';
1616
import { glsl } from '@app/engine/utils/development/formatter';
1717
import { errorManagerInstance } from '@app/engine/utils/errorManager';
1818
import { SelectSatManager } from '@app/plugins/select-sat-manager/select-sat-manager';
19-
import { DEG2RAD, TemeVec3, EpochUTC, J2000, Kilometers, KilometersPerSecond, Seconds, SpaceObjectType, TEME, Vector3D } from '@ootk/src/main';
19+
import { DEG2RAD, EpochUTC, J2000, Kilometers, KilometersPerSecond, Seconds, SpaceObjectType, TEME, TemeVec3, Vector3D } from '@ootk/src/main';
2020
import { Body, KM_PER_AU, BackdatePosition as backdatePosition, RotationAxis as rotationAxis } from 'astronomy-engine';
2121
import { mat3, mat4, vec3 } from 'gl-matrix';
2222
import { DepthManager } from '../../depth-manager';
@@ -28,7 +28,7 @@ export const PlanetColors = {
2828
MERCURY: [0.59, 0.4, 0.6, 0.95] as rgbaArray,
2929
VENUS: [0.69, 0.47, 0.1, 0.95] as rgbaArray,
3030
EARTH: [0, 0.6, 0.8, 0.95] as rgbaArray,
31-
MOON: [0, 0.6, 0.8, 0.7] as rgbaArray,
31+
MOON: [1.0, 1.0, 1.0, 0.7] as rgbaArray,
3232
MARS: [0.6, 0.3, 0.1, 0.95] as rgbaArray,
3333
JUPITER: [0.95, 0.71, 0.64, 0.7] as rgbaArray,
3434
SATURN: [0.72, 0.65, 0.52, 0.7] as rgbaArray,
@@ -411,7 +411,7 @@ export abstract class CelestialBody {
411411
if (this.fullOrbitPathEarthCentered) {
412412
this.fullOrbitPathEarthCentered.isGarbage = true;
413413
}
414-
this.fullOrbitPathEarthCentered = lineManager.createOrbitPath(orbitPositions, this.color, SolarBody.Sun);
414+
this.fullOrbitPathEarthCentered = lineManager.createOrbitPath(orbitPositions, this.color, SolarBody.Earth);
415415
}
416416

417417
protected calculateRelativeSatPos() {

‎src/plugins-pro‎

‎src/plugins/draw-lines/draw-lines.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
import { MissileObject } from '@app/app/data/catalog-manager/MissileObject';
33
import { OemSatellite } from '@app/app/objects/oem-satellite';
44
import { SolarBody } from '@app/engine/core/interfaces';
5+
import { PluginRegistry } from '@app/engine/core/plugin-registry';
6+
import { ServiceLocator } from '@app/engine/core/service-locator';
57
import { EventBus } from '@app/engine/events/event-bus';
68
import { EventBusEvent } from '@app/engine/events/event-bus-events';
79
import { ReferenceFrame } from '@app/engine/math/reference-frames';
@@ -11,11 +13,9 @@ import { html } from '@app/engine/utils/development/formatter';
1113
import { errorManagerInstance } from '@app/engine/utils/errorManager';
1214
import { hideEl } from '@app/engine/utils/get-el';
1315
import { t7e } from '@app/locales/keys';
14-
import { Satellite, Kilometers } from '@ootk/src/main';
16+
import { Kilometers, Satellite } from '@ootk/src/main';
1517
import { KeepTrackPlugin } from '../../engine/plugins/base-plugin';
1618
import { SelectSatManager } from '../select-sat-manager/select-sat-manager';
17-
import { PluginRegistry } from '@app/engine/core/plugin-registry';
18-
import { ServiceLocator } from '@app/engine/core/service-locator';
1919

2020
export class DrawLinesPlugin extends KeepTrackPlugin {
2121
readonly id = 'DrawLinesPlugin';
@@ -51,6 +51,7 @@ export class DrawLinesPlugin extends KeepTrackPlugin {
5151
<li id="line-sat-sat-rmb"><a href="#">${m('satelliteToSatellite')}</a></li>
5252
<li id="line-sat-sun-rmb"><a href="#">${m('satelliteToSun')}</a></li>
5353
<li id="line-sat-moon-rmb"><a href="#">${m('satelliteToMoon')}</a></li>
54+
<li id="line-moon-orbit-rmb"><a href="#">${m('moonOrbit')}</a></li>
5455
</ul>
5556
`;
5657
}
@@ -133,6 +134,9 @@ export class DrawLinesPlugin extends KeepTrackPlugin {
133134
case 'line-sat-moon-rmb':
134135
lineManagerInstance.createSat2CelestialBody(clickSatObj, SolarBody.Moon);
135136
break;
137+
case 'line-moon-orbit-rmb':
138+
ServiceLocator.getScene().moons?.Moon?.drawFullOrbitPathRelativeToEarth();
139+
break;
136140
default:
137141
break;
138142
}

‎src/plugins/draw-lines/locales/cs.src.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"sensorToSatellite": "Senzor – satelit",
1515
"satelliteToSatellite": "Satelit – satelit",
1616
"satelliteToSun": "Satelit – Slunce",
17-
"satelliteToMoon": "Satelit – Měsíc"
17+
"satelliteToMoon": "Satelit – Měsíc",
18+
"moonOrbit": "Nakreslit oběžnou dráhu Měsíce"
1819
},
1920
"errorMsgs": {
2021
"noPrimarySat": "Nebyl vybrán primární satelit pro linii satelit–satelit."

‎src/plugins/draw-lines/locales/de.src.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"sensorToSatellite": "Sensor zu Satellit",
1515
"satelliteToSatellite": "Satellit zu Satellit",
1616
"satelliteToSun": "Satellit zur Sonne",
17-
"satelliteToMoon": "Satellit zum Mond"
17+
"satelliteToMoon": "Satellit zum Mond",
18+
"moonOrbit": "Mondumlaufbahn zeichnen"
1819
},
1920
"errorMsgs": {
2021
"noPrimarySat": "Kein Primärsatellit für die Satellit-zu-Satellit-Linie ausgewählt."

‎src/plugins/draw-lines/locales/en.src.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"sensorToSatellite": "Sensor to Satellite",
1515
"satelliteToSatellite": "Satellite to Satellite",
1616
"satelliteToSun": "Satellite to Sun",
17-
"satelliteToMoon": "Satellite to Moon"
17+
"satelliteToMoon": "Satellite to Moon",
18+
"moonOrbit": "Draw Moon's Orbit"
1819
},
1920
"errorMsgs": {
2021
"noPrimarySat": "No primary satellite selected for Satellite to Satellite line."

‎src/plugins/draw-lines/locales/es.src.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"sensorToSatellite": "Sensor a satélite",
1515
"satelliteToSatellite": "Satélite a satélite",
1616
"satelliteToSun": "Satélite al Sol",
17-
"satelliteToMoon": "Satélite a la Luna"
17+
"satelliteToMoon": "Satélite a la Luna",
18+
"moonOrbit": "Dibujar órbita de la Luna"
1819
},
1920
"errorMsgs": {
2021
"noPrimarySat": "No se ha seleccionado un satélite primario para la línea de satélite a satélite."

0 commit comments

Comments
 (0)