Skip to content

fix: update version to 11.0.3 and adjust color handling for OemSatellite #1259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thkruz merged 1 commit into from
Nov 25, 2025
Merged

fix: update version to 11.0.3 and adjust color handling for OemSatellite #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Latest Version](https://img.shields.io/badge/version-11.0.1-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)
![Latest Version](https://img.shields.io/badge/version-11.0.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)

<img src="./public/img/logo.png" width='100%' alt="KeepTrack.Space" align="center">

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "keeptrack.space",
"version": "11.0.2",
"version": "11.0.3",
"type": "module",
"description": "Complex astrodynamics tools designed for non-engineers to make learning about orbital mechanics and satellite operations more accessible.",
"author": "Theodore Kruczek",
Expand Down Expand Up @@ -173,4 +173,4 @@
"volta": {
"node": "25.0.0"
}
}
}
8 changes: 6 additions & 2 deletions src/app/objects/oem-satellite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { SolarBody } from '@app/engine/core/interfaces';
import { rgbaArray, SolarBody } from '@app/engine/core/interfaces';
import { ServiceLocator } from '@app/engine/core/service-locator';
import { EventBus } from '@app/engine/events/event-bus';
import { EventBusEvent } from '@app/engine/events/event-bus-events';
import { LagrangeInterpolator } from '@app/engine/ootk/src/interpolator/LagrangeInterpolator';
import { LineColors } from '@app/engine/rendering/line-manager/line';
import { OrbitPathLine } from '@app/engine/rendering/line-manager/orbit-path';
import { BaseObject, J2000, Kilometers, Seconds, SpaceObjectType, TEME } from '@ootk/src/main';
import { vec4 } from 'gl-matrix';
import { SatelliteModels } from '../rendering/mesh/model-resolver';

export interface OemHeader {
Expand Down Expand Up @@ -74,6 +75,9 @@ export class OemSatellite extends BaseObject {
pointsJ2000: [number, number, number, number][] = [];
moonPositionCache_: { [key: number]: { position: { x: number; y: number; z: number } } } = {};

orbitColor: vec4 = LineColors.GREEN;
dotColor: rgbaArray = [0, 255, 0, 1];
Copy link

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dotColor values appear to be in 0-255 range, but rgbaArray is typically expected to be normalized floats between 0.0-1.0 based on the removed hardcoded value [1.0, 0.5, 0.0, 1.0]. This should be [0.0, 1.0, 0.0, 1.0] to match the expected format.

Suggested change
dotColor: rgbaArray = [0, 255, 0, 1];
dotColor: rgbaArray = [0.0, 1.0, 0.0, 1.0];

Copilot uses AI. Check for mistakes.

eci(date: Date): { position: { x: number; y: number; z: number }; velocity: { x: number; y: number; z: number } } | null {
const posAndVel = this.updatePosAndVel(date.getTime() / 1000 as Seconds);

Expand Down Expand Up @@ -526,7 +530,7 @@ export class OemSatellite extends BaseObject {
this.orbitHistoryLine.isGarbage = true;
}

this.orbitHistoryLine = lineManager.createOrbitPath(points, LineColors.GREEN, SolarBody.Earth);
this.orbitHistoryLine = lineManager.createOrbitPath(points, this.orbitColor ?? LineColors.GREEN, SolarBody.Earth);
}

removeOrbitHistory(): void {
Expand Down
8 changes: 7 additions & 1 deletion src/app/rendering/orbit-manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,13 @@ export class OrbitManager {

if (hoverId !== -1 && hoverId !== this.currentSelectId_ && !ServiceLocator.getCatalogManager().getObject(hoverId, GetSatType.EXTRA_ONLY)?.isStatic()) {
OrbitManager.checkColorBuffersValidity_(hoverId, colorSchemeManagerInstance.colorData);
this.lineManagerInstance_.setColorUniforms(settingsManager.orbitHoverColor);
const sat = ServiceLocator.getCatalogManager().getObject(hoverId, GetSatType.EXTRA_ONLY);

if (sat instanceof OemSatellite) {
this.lineManagerInstance_.setColorUniforms(sat.dotColor ?? settingsManager.orbitHoverColor);
} else {
this.lineManagerInstance_.setColorUniforms(settingsManager.orbitHoverColor);
}
this.writePathToGpu_(hoverId);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/rendering/color-schemes/celestrak-color-scheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class CelestrakColorScheme extends ColorScheme {

if (((obj as OemSatellite).source ?? '') === 'OEM Import') {
return {
color: [1.0, 0.5, 0.0, 1.0],
color: (obj as OemSatellite).dotColor,
pickable: Pickable.Yes,
};
}
Expand Down
4 changes: 2 additions & 2 deletions src/engine/rendering/color-schemes/object-type-color-scheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { MissileObject } from '@app/app/data/catalog-manager/MissileObject';
import { OemSatellite } from '@app/app/objects/oem-satellite';
import { Planet } from '@app/app/objects/planet';
import { ColorInformation, Pickable, rgbaArray } from '@app/engine/core/interfaces';
import { ServiceLocator } from '@app/engine/core/service-locator';
import { EventBus } from '@app/engine/events/event-bus';
import { EventBusEvent } from '@app/engine/events/event-bus-events';
import { html } from '@app/engine/utils/development/formatter';
Expand All @@ -11,7 +12,6 @@ import { BaseObject, DetailedSatellite, SpaceObjectType, Star } from '@ootk/src/
import { CameraType } from '../../camera/camera';
import { errorManagerInstance } from '../../utils/errorManager';
import { ColorScheme, ColorSchemeColorMap } from './color-scheme';
import { ServiceLocator } from '@app/engine/core/service-locator';

export interface ObjectTypeColorSchemeColorMap extends ColorSchemeColorMap {
payload: rgbaArray;
Expand Down Expand Up @@ -104,7 +104,7 @@ export class ObjectTypeColorScheme extends ColorScheme {

if (((obj as OemSatellite).source ?? '') === 'OEM Import') {
return {
color: [1.0, 0.5, 0.0, 1.0],
color: (obj as OemSatellite).dotColor,
pickable: Pickable.Yes,
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins-pro
Open in desktop
Submodule plugins-pro updated from afc1f2 to d57f2e
2 changes: 1 addition & 1 deletion src/settings/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
/**
* The current application version
*/
export const VERSION = '11.0.1';
export const VERSION = '11.0.3';
Loading