feat(a380x): TERR on ND for A380X

.gitignore

@@ -152,3 +152,4 @@ lerna-debug.log*
 
 # Secrets
 /secrets
+tools/output/

.vscode/settings.json

@@ -30,8 +30,8 @@
 		"editor.formatOnSave": true
 	  },
 	  "editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
-	  },
+			"source.fixAll.eslint": "explicit"
+		},
 	  "files.trimTrailingWhitespace": true,
 	  "files.insertFinalNewline": true,
 	  "files.trimFinalNewlines": true,

apps/server/src/terrain/processing/generic/constants.ts

@@ -16,14 +16,31 @@ export const DefaultTileSize = 300;
 // navigation display parameters
 export const NavigationDisplayMapStartOffsetY = 128;
 export const NavigationDisplayMaxPixelWidth = 768;
-export const NavigationDisplayArcModePixelHeight = 492;
-export const NavigationDisplayRoseModePixelHeight = 250;
+export const NavigationDisplayArcModePixelHeightA32NX = 492;
+export const NavigationDisplayRoseModePixelHeightA32NX = 250;
+export const NavigationDisplayArcModePixelHeightA380X = 592;
+export const NavigationDisplayRoseModePixelHeightA380X = 592;
 export const NavigationDisplayMaxPixelHeight = Math.max(
-  NavigationDisplayArcModePixelHeight,
-  NavigationDisplayRoseModePixelHeight,
+  NavigationDisplayArcModePixelHeightA32NX,
+  NavigationDisplayRoseModePixelHeightA32NX,
+  NavigationDisplayArcModePixelHeightA380X,
+  NavigationDisplayRoseModePixelHeightA380X,
 );
+export const NavigationDisplayCenterOffsetYA32NX = 0;
+export const NavigationDisplayArcModeCenterOffsetYA380X = 100;
+export const NavigationDisplayRoseModeCenterOffsetYA380X = 342;
+
+// vertical display parameters
+export const VerticalDisplayMapStartOffsetY = 800;
+export const VerticalDisplayMapStartOffsetX = 150;
 
 // rendering parameters
 export const RenderingMapTransitionDeltaTime = 40;
-export const RenderingMapTransitionDuration = 1000;
-export const RenderingMapUpdateTimeout = 1500;
+export const RenderingMapTransitionDurationArcMode = 1500;
+export const RenderingMapUpdateTimeoutArcMode = 1000;
+export const RenderingMapTransitionDurationScanlineMode = 600;
+export const RenderingMapUpdateTimeoutScanlineMode = 500;
+export const RenderingMapFrameValidityTimeArcMode =
+  RenderingMapTransitionDurationArcMode + RenderingMapUpdateTimeoutArcMode;
+export const RenderingMapFrameValidityTimeScanlineMode =
+  RenderingMapTransitionDurationScanlineMode + RenderingMapUpdateTimeoutScanlineMode;

apps/server/src/terrain/processing/gpu/elevationmap.ts

@@ -22,14 +22,16 @@ export function createLocalElevationMap(
   ndHeight: number,
   meterPerPixel: number,
   arcMode: boolean,
+  centerOffsetY: number,
 ): number {
   const centerX = ndWidth / 2.0;
-  const delta = [this.thread.x - centerX, ndHeight - this.thread.y];
+  const delta = [this.thread.x - centerX, ndHeight - this.thread.y - centerOffsetY];
   if (this.thread.x >= ndWidth || this.thread.y >= ndHeight) return this.constants.invalidElevation;
 
   // calculate distance and bearing for the projection
   const distancePixels = Math.sqrt(delta[0] ** 2 + delta[1] ** 2);
-  if (arcMode === true && distancePixels > ndHeight) return this.constants.invalidElevation;
+  // Cut off ARC shape when in A32NX and arc mode
+  if (centerOffsetY === 0 && arcMode === true && distancePixels > ndHeight) return this.constants.invalidElevation;
 
   const distance = distancePixels * (meterPerPixel / 2.0);
   const angle = rad2deg(Math.acos(delta[1] / distancePixels));

apps/server/src/terrain/processing/gpu/patterns/index.ts

@@ -0,0 +1,2 @@
+export * from './arcmode';
+export * from './scanlinemode';

apps/server/src/terrain/processing/gpu/rendering/navigationdisplay.ts

@@ -83,7 +83,7 @@ export function drawDensityPixel(
   if (Math.round(patternValue % patternIndex) === 0) {
     return color;
   }
-  return [4, 4, 5, 255];
+  return [4, 4, 5, 0];
 }
 
 export function renderNormalMode(
@@ -163,7 +163,7 @@ export function renderNormalMode(
     return drawDensityPixel(patternMapValue, 5, [255, 148, 255, 255]);
   }
 
-  return [4, 4, 5, 255];
+  return [4, 4, 5, 0];
 }
 
 export function renderPeaksMode(
@@ -227,7 +227,7 @@ export function renderPeaksMode(
     return drawDensityPixel(patternMapValue, 5, [255, 148, 255, 255]);
   }
 
-  return [4, 4, 5, 255];
+  return [4, 4, 5, 0];
 }
 
 export function renderNavigationDisplay(
@@ -311,30 +311,28 @@ export function renderNavigationDisplay(
   let patternValue = 0;
 
   // check the corner cases only for pixels inside the real rendering area
-  if (this.thread.y < this.constants.maxImageHeight) {
-    if (this.thread.y < height) {
-      // find highest elevation in 8x8 patch to simulate the lower resolution of the real system
-      const patchXStart = pixelX - (pixelX % 8);
-      const patchXEnd = Math.min(width, patchXStart + 8);
-      const patchYStart = this.thread.y - (this.thread.y % 8);
-      const patchYEnd = Math.min(height, patchYStart + 8);
-
-      for (let y = patchYStart; y < patchYEnd; ++y) {
-        for (let x = patchXStart; x < patchXEnd; ++x) {
-          const currentElevation = elevationGrid[y][x];
-          if (currentElevation > pixelElevation && currentElevation !== this.constants.invalidElevation) {
-            pixelElevation = currentElevation;
-          }
+  if (this.thread.y < height) {
+    // find highest elevation in 8x8 patch to simulate the lower resolution of the real system
+    const patchXStart = pixelX - (pixelX % 8);
+    const patchXEnd = Math.min(width, patchXStart + 8);
+    const patchYStart = this.thread.y - (this.thread.y % 8);
+    const patchYEnd = Math.min(height, patchYStart + 8);
+
+    for (let y = patchYStart; y < patchYEnd; ++y) {
+      for (let x = patchXStart; x < patchXEnd; ++x) {
+        const currentElevation = elevationGrid[y][x];
+        if (currentElevation > pixelElevation && currentElevation !== this.constants.invalidElevation) {
+          pixelElevation = currentElevation;
         }
       }
-
-      patternValue = patternMap[this.thread.y][pixelX];
     }
 
-    // the pixel is disabled at all or the ROSE mode is active and the areas are clipped
-    if (patternValue === 0 || this.thread.y >= height) {
-      return [4, 4, 5, 255][colorChannel];
-    }
+    patternValue = patternMap[this.thread.y][pixelX];
+  }
+
+  // the pixel is disabled at all or the areas are clipped. Be sure not to overdraw the metadata line though
+  if (patternValue === 0 && this.thread.y !== height) {
+    return [4, 4, 5, 0][colorChannel];
   }
 
   if (maxElevation >= referenceAltitude - gearDownAltitudeOffset) {

apps/server/src/terrain/processing/gpu/rendering/verticaldisplay.ts

@@ -10,7 +10,7 @@ export function renderVerticalDisplay(
   const colorChannel = this.thread.x % 4;
 
   if (pixelX >= this.constants.elevationProfileEntryCount) {
-    return [4, 4, 5, 255][colorChannel];
+    return [0, 0, 0, 0][colorChannel];
   }
 
   const elevation = elevationProfile[pixelX];
@@ -23,17 +23,17 @@ export function renderVerticalDisplay(
 
   // altitude is above the elevation -> draw the background
   if (altitude > elevation) {
-    return [4, 4, 5, 255][colorChannel];
+    return [0, 0, 0, 0][colorChannel];
   }
 
   // elevation is water -> check if we draw the water until 0
   if (elevation === this.constants.waterElevation) {
     if (altitude <= 0) {
       return [0, 255, 255, 255][colorChannel];
     }
-    return [4, 4, 5, 255][colorChannel];
+    return [0, 0, 0, 0][colorChannel];
   }
 
   // draw the obstacle
-  return [59, 21, 0, 255][colorChannel];
+  return [160, 83, 34, 255][colorChannel];
 }

apps/server/src/terrain/processing/maphandler.ts

@@ -186,6 +186,7 @@ export class MapHandler {
         mapOffsetX: 0,
         mapWidth: NavigationDisplayMaxPixelWidth,
         mapHeight: NavigationDisplayMaxPixelHeight,
+        centerOffsetY: 0,
       };
       const startupStatus: AircraftStatus = {
         adiruDataValid: true,
@@ -379,7 +380,7 @@ export class MapHandler {
       this.extractLocalElevationMap = this.extractLocalElevationMap.setOutput([config.mapWidth, config.mapHeight]);
     }
 
-    let metresPerPixel = Math.round((config.range * NauticalMilesToMetres) / config.mapHeight);
+    let metresPerPixel = Math.round((config.range * NauticalMilesToMetres) / (config.mapHeight - config.centerOffsetY));
     if (config.arcMode) metresPerPixel *= 2.0;
 
     // create the local elevation map
@@ -402,6 +403,7 @@ export class MapHandler {
       config.mapHeight,
       metresPerPixel,
       config.arcMode,
+      config.centerOffsetY,
     ) as Texture;
 
     // some GPU drivers require the flush call to release internal memory
@@ -412,6 +414,12 @@ export class MapHandler {
 
   public createElevationProfile(profile: ElevationProfile, profileWidth: number): Texture {
     if (this.cachedElevationData.gpuData === null) return null;
+    if (profile.waypointsLatitudes === undefined || profile.waypointsLongitudes === undefined) return null;
+    if (
+      profile.waypointsLatitudes.length === 0 ||
+      profile.waypointsLatitudes.length !== profile.waypointsLongitudes.length
+    )
+      return null;
 
     if (this.extractElevationProfile.output === null || this.extractElevationProfile.output[0] !== profileWidth) {
       this.extractElevationProfile = this.extractElevationProfile.setOutput([profileWidth]);