* chore(merge): resolve conflicts, fix mockWs error, and apply refactor standards * Potential fix for pull request finding 'CodeQL / Incomplete URL substring sanitization' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Potential fix for pull request finding 'CodeQL / Incomplete URL substring sanitization' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Potential fix for pull request finding 'CodeQL / Incomplete URL substring sanitization' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * fix(ci): Stabilize github actions and resolve test failures - fix(tests): update WsClient mock to use standard function for Vitest constructor compatibility - fix(db): correct PrismaClient import path to use generated output directory - fix(e2e): add predev database boot step to playwright CI workflow - chore: sync pnpm-lock.yaml after merge conflict resolution * refactor(plugins): decouple GeoJSON plugin and implement data bus lifecycle - feat(sdk): [Minor] Added dynamicPluginCreate, dynamicPluginRemove, and pluginUnregistered to DataBusEvents. - feat(core): [Minor] Implemented unregisterPlugin in PluginManager.ts for automated IndexedDB caching cleanup and polling teardown. - feat(core): [Minor] Added removeLayer to layersSlice.ts to support safe removal of plugin states. - refactor(plugins): [Patch] Refactored useGeoJsonImport.ts and ImportedLayerList.tsx to decouple from direct manager imports, utilizing DataBus for lifecycle events. - refactor(core): [Patch] Added pluginUnregistered listener to DataBusSubscriber.tsx to handle state and cache cleanup synchronously via event. * fix(types): resolve PluginManager type errors * refactor(core): decouple PluginManager and fix rendering invariants - refactor(core): Replace Zustand mutations in PluginManager with DataBus events (Patch) - refactor(sdk): Add layerLoadingChanged, pluginError, pluginUnregistered to DataBusEvents (Patch) - refactor(ui): Subscribe to new DataBus events in DataBusSubscriber (Patch) - fix(plugins): Remove size from BaseAviationPlugin to fix model rendering clipping (Patch) - fix(plugins): Migrate BaseIncidentPlugin from size to iconScale to fix billboard clipping (Patch) * chore: resolve lockfile conflict * fix: restore BottomPanelManager in AppShell and fix vitest config * fix(layout): restore bottom panel positioning and transition styling This commit corrects the missing bottom panel issue by resolving CSS aggregation errors and fixing transition logic. The version is bumped to 2.15.5. * refactor(core): harden typescript and fix linting violations This commit addresses the remaining any types and linting errors across the core engine. * fix(eslint): resolve react-hook immutability and cascading render violations --------- Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
218 lines
8.6 KiB
TypeScript
218 lines
8.6 KiB
TypeScript
/**
|
|
* stackAnimation — Per-frame lerping of spider offsets and hub badge management.
|
|
*
|
|
* Called from the AnimationLoop every frame. Smoothly interpolates
|
|
* pixelOffset towards the target (expand) or back to zero (collapse).
|
|
* Uses a dedicated persistent Billboard per stack for the textual hub badge.
|
|
*/
|
|
import {
|
|
Cartesian2, Cartesian3, HorizontalOrigin, VerticalOrigin, NearFarScalar, Color
|
|
} from "cesium";
|
|
import type { LabelCollection, BillboardCollection } from "cesium";
|
|
import {
|
|
getStacks, getSpiderOffset, isAnyStackExpanded,
|
|
type EntityStack,
|
|
} from "./StackManager";
|
|
import { FADED_OPACITY } from "./animationHelpers";
|
|
|
|
/** Scale hub icons down when zooming out. */
|
|
const hubScaleByDistance = new NearFarScalar(2.0e6, 1.0, 1.5e7, 0.5);
|
|
|
|
/** Duration of expand/collapse animation in ms. */
|
|
const ANIM_DURATION_MS = 220;
|
|
|
|
/**
|
|
* Radius of the cluster hub background circle.
|
|
* Adjust this to scale the black half-transparent badge.
|
|
*/
|
|
const HUB_BG_RADIUS = 14;
|
|
|
|
/** Reusable scratch Cartesian2 to avoid allocation. */
|
|
const scratchOffset = new Cartesian2();
|
|
|
|
/** Tracks the dedicated textual badge primitive for each stack. */
|
|
const hubBillboards = new Map<string, any>();
|
|
const clusterIconCache = new Map<string, string>();
|
|
|
|
/** Generates a base64 encoded SVG for the cluster hub icon. */
|
|
function getClusterIcon(count: number, hexColor: string): string {
|
|
const cacheKey = `${count}_${hexColor}`;
|
|
let cached = clusterIconCache.get(cacheKey);
|
|
if (cached) return cached;
|
|
|
|
const size = 36;
|
|
const center = size / 2;
|
|
const textStr = count > 99 ? '99+' : count.toString();
|
|
const fillValue = "rgba(15, 23, 42, 0.95)";
|
|
const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="${size}" height="${size}">
|
|
<circle cx="${center}" cy="${center}" r="${HUB_BG_RADIUS}" fill="${fillValue}" stroke="${hexColor}" stroke-width="2.5"/>
|
|
<text x="${center}" y="${center + 1}" font-family="Inter, sans-serif" font-size="14px" font-weight="bold" fill="#ffffff" text-anchor="middle" dominant-baseline="middle">${textStr}</text>
|
|
</svg>`;
|
|
|
|
cached = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`;
|
|
clusterIconCache.set(cacheKey, cached);
|
|
return cached;
|
|
}
|
|
|
|
/** Lerp a single value. */
|
|
function lerp(a: number, b: number, t: number): number { return a + (b - a) * t; }
|
|
|
|
/**
|
|
* Run one animation tick for all stacks.
|
|
* Returns true if ANY stack is currently animating (requiring a continuous render).
|
|
*/
|
|
export function tickStackAnimation(labels: LabelCollection | null, billboards: BillboardCollection | null): boolean {
|
|
const now = Date.now();
|
|
const activeStacks = getStacks();
|
|
let needsRender = false;
|
|
|
|
// 1. Garbage Collect abandoned hub billboards
|
|
for (const [stackId, bb] of hubBillboards.entries()) {
|
|
if (!activeStacks.has(stackId)) {
|
|
if (billboards) billboards.remove(bb);
|
|
hubBillboards.delete(stackId);
|
|
needsRender = true;
|
|
}
|
|
}
|
|
|
|
// 2. Tick active stacks
|
|
for (const stack of activeStacks.values()) {
|
|
const running = tickSingle(stack, now, billboards);
|
|
if (running) needsRender = true;
|
|
}
|
|
|
|
return needsRender;
|
|
}
|
|
|
|
function tickSingle(stack: EntityStack, now: number, billboards: BillboardCollection | null): boolean {
|
|
const { state, stateStartMs, children } = stack;
|
|
const elapsed = now - stateStartMs;
|
|
const t = Math.min(elapsed / ANIM_DURATION_MS, 1.0);
|
|
|
|
const isOpen = state === "expanding" || state === "expanded";
|
|
const isClosed = state === "collapsed" || state === "collapsing";
|
|
const isAnimating = state === "expanding" || state === "collapsing";
|
|
|
|
// Transition end
|
|
if (state === "expanding" && t >= 1) stack.state = "expanded";
|
|
if (state === "collapsing" && t >= 1) {
|
|
stack.state = "collapsed";
|
|
|
|
// Final pass to ensure everything hidden completely
|
|
for (let i = 0; i < children.length; i++) {
|
|
const prim = children[i].primitive;
|
|
if (prim && !prim.isDestroyed?.() && prim.show) prim.show = false;
|
|
}
|
|
}
|
|
|
|
// Optimization: If it's collapsed, we don't need to recalculate or apply offsets and visibility
|
|
const isRestingCollapsed = stack.state === "collapsed";
|
|
|
|
if (!isRestingCollapsed) {
|
|
(stack as any)._enforcedHidden = false;
|
|
// Animate ALL children (no one is left behind!)
|
|
for (let i = 0; i < children.length; i++) {
|
|
const item = children[i];
|
|
const prim = item.primitive;
|
|
if (!prim || prim.isDestroyed?.()) continue;
|
|
|
|
const offset = getSpiderOffset(item.entity.id);
|
|
if (!offset) continue;
|
|
|
|
// Animate pixel offset
|
|
if (state === "expanding") {
|
|
offset.currentX = lerp(0, offset.targetX, easeOut(t));
|
|
offset.currentY = lerp(0, offset.targetY, easeOut(t));
|
|
} else if (state === "collapsing") {
|
|
offset.currentX = lerp(offset.targetX, 0, easeOut(t));
|
|
offset.currentY = lerp(offset.targetY, 0, easeOut(t));
|
|
} else if (state === "expanded") {
|
|
offset.currentX = offset.targetX;
|
|
offset.currentY = offset.targetY;
|
|
}
|
|
|
|
// Apply pixel offset
|
|
if (prim.pixelOffset !== undefined) {
|
|
Cartesian2.fromElements(offset.currentX, offset.currentY, scratchOffset);
|
|
prim.pixelOffset = scratchOffset;
|
|
}
|
|
|
|
// Show/hide child items
|
|
if (isOpen || state === "collapsing") {
|
|
const shouldShow = !item._occluded;
|
|
if (prim.show !== shouldShow) prim.show = shouldShow;
|
|
}
|
|
}
|
|
} else {
|
|
// Enforce the collapsed hidden state exactly once to catch newly clustered primitives
|
|
if (!(stack as any)._enforcedHidden) {
|
|
for (let i = 0; i < children.length; i++) {
|
|
const prim = children[i].primitive;
|
|
if (prim && !prim.isDestroyed?.() && prim.show) prim.show = false;
|
|
}
|
|
(stack as any)._enforcedHidden = true;
|
|
}
|
|
}
|
|
|
|
// Manage the dedicated central Hub Billboard
|
|
if (billboards && stack.children.length > 1) {
|
|
manageDedicatedHub(stack, billboards);
|
|
}
|
|
|
|
return isAnimating;
|
|
}
|
|
|
|
function manageDedicatedHub(stack: EntityStack, billboards: BillboardCollection) {
|
|
let bb = hubBillboards.get(stack.id);
|
|
const count = stack.children.length;
|
|
|
|
// Check if the hubItem's baseColor has changed since we last cached it
|
|
const currentBaseColor = stack.hubItem.baseColor?.toCssColorString() ?? "#ffffff";
|
|
if ((stack.hubItem as any)._cachedCssColor !== currentBaseColor) {
|
|
(stack.hubItem as any)._cachedCssColor = currentBaseColor;
|
|
}
|
|
|
|
const cssColor = (stack.hubItem as any)._cachedCssColor;
|
|
const expectedImage = getClusterIcon(count, cssColor);
|
|
|
|
const anyExpanded = isAnyStackExpanded();
|
|
const isExpanded = stack.state === "expanded" || stack.state === "expanding";
|
|
const isFaded = anyExpanded && !isExpanded;
|
|
// Set opacity for unexpanded hubs when a spiderifier is active
|
|
const targetColor = isFaded ? new Color(1.0, 1.0, 1.0, FADED_OPACITY) : Color.WHITE;
|
|
const isVisible = !stack.hubItem._occluded;
|
|
|
|
if (!bb || bb.isDestroyed?.()) {
|
|
bb = billboards.add({
|
|
position: stack.hubItem.posRef,
|
|
image: expectedImage,
|
|
color: targetColor,
|
|
horizontalOrigin: HorizontalOrigin.CENTER,
|
|
verticalOrigin: VerticalOrigin.CENTER,
|
|
pixelOffset: new Cartesian2(0, 0),
|
|
scaleByDistance: hubScaleByDistance,
|
|
show: isVisible,
|
|
// WARNING: Do NOT use heightReference: HeightReference.CLAMP_TO_GROUND here.
|
|
// It causes severe lag/performance drops with thousands of dynamic entities.
|
|
disableDepthTestDistance: stack.hubItem.options.disableDepthTestDistance ?? Number.POSITIVE_INFINITY,
|
|
// Tag with same ID as top entity! So clicking it triggers interaction/selection.
|
|
id: { _wwvEntity: stack.hubItem.entity }
|
|
});
|
|
hubBillboards.set(stack.id, bb);
|
|
} else {
|
|
// Update position if moved
|
|
if (!Cartesian3.equals(bb.position, stack.hubItem.posRef)) {
|
|
bb.position = stack.hubItem.posRef;
|
|
}
|
|
if (bb.image !== expectedImage) bb.image = expectedImage;
|
|
if (!Color.equals(bb.color, targetColor)) bb.color = targetColor;
|
|
// Always ensure it's shown, it persists even when expanded!
|
|
if (bb.show !== isVisible) bb.show = isVisible;
|
|
}
|
|
}
|
|
|
|
/** Ease-out cubic for smooth deceleration. */
|
|
function easeOut(t: number): number {
|
|
return 1 - (1 - t)**3;
|
|
}
|