huweili-cesium 1.2.97 → 1.2.98

package/js/glbInfoBadge.js

@@ -9,7 +9,10 @@ import { getDroneLabelBatchManager } from './cardPool'
 
 const STYLE_ID = 'glb-info-badge-style'
 const DEFAULT_LABEL_OFFSET = 1
-const DEFAULT_PIXEL_GAP = 2
+const DEFAULT_PIXEL_GAP = 0
+const DEFAULT_HEIGHT_SCALE = 0.72
+/** 包围球半径折算到车顶的系数（中心点已在模型中部，无需再加整颗半径） */
+const BOUNDING_SPHERE_TOP_FACTOR = 0.22
 
 const scratchBoundingSphere = new Cesium.BoundingSphere()
 const scratchEnu = new Cesium.Matrix4()
@@ -174,8 +177,11 @@ const resolveModelTopWorldPosition = (map, entity, basePos, fallbackOffset) => {
   if (entity && dataSourceDisplay?.getBoundingSphere) {
     const ok = dataSourceDisplay.getBoundingSphere(entity, true, scratchBoundingSphere)
     if (ok && scratchBoundingSphere.radius > 0) {
-      Cesium.Cartesian3.multiplyByScalar(scratchUp, scratchBoundingSphere.radius, scratchOffset)
-      return Cesium.Cartesian3.add(scratchBoundingSphere.center, scratchOffset, scratchTop)
+      Cesium.Cartesian3.subtract(scratchBoundingSphere.center, basePos, scratchOffset)
+      const centerAlongUp = Math.max(0, Cesium.Cartesian3.dot(scratchOffset, scratchUp))
+      const topAlongUp = centerAlongUp + scratchBoundingSphere.radius * BOUNDING_SPHERE_TOP_FACTOR
+      Cesium.Cartesian3.multiplyByScalar(scratchUp, topAlongUp, scratchOffset)
+      return Cesium.Cartesian3.add(basePos, scratchOffset, scratchTop)
     }
   }
 
@@ -190,28 +196,37 @@ const resolveModelTopWorldPosition = (map, entity, basePos, fallbackOffset) => {
  * @param {Cesium.Cartesian3} topWorldPos
  * @param {number} minPixelSize
  * @param {number} pixelGap
+ * @param {number} heightScale
  * @returns {{ x: number, y: number }|null}
  */
-const resolveBadgeScreenPosition = (scene, basePos, topWorldPos, minPixelSize, pixelGap) => {
+const resolveBadgeScreenPosition = (scene, basePos, topWorldPos, minPixelSize, pixelGap, heightScale) => {
   const anchorWin = scene.cartesianToCanvasCoordinates(basePos)
   if (!anchorWin || Number.isNaN(anchorWin.x) || Number.isNaN(anchorWin.y)) {
     return null
   }
 
-  const topWin = scene.cartesianToCanvasCoordinates(topWorldPos)
+  const topWin = topWorldPos ? scene.cartesianToCanvasCoordinates(topWorldPos) : null
   let offsetY = 0
 
   if (topWin && !Number.isNaN(topWin.y)) {
-    offsetY = anchorWin.y - topWin.y
+    offsetY = (anchorWin.y - topWin.y) * heightScale
+  }
+
+  // 包围球常大于实际 mesh，对过大偏移做软压缩
+  if (offsetY > 0 && minPixelSize > 0 && offsetY > minPixelSize * 0.5) {
+    const base = minPixelSize * 0.3
+    offsetY = base + (offsetY - base) * 0.35
   }
 
-  // minimumPixelSize 会让远景模型在屏幕上被抬高，仅用世界高度会产生“飘”感
   if (minPixelSize > 0) {
-    offsetY = Math.max(offsetY, minPixelSize * 0.55)
+    const visualRoofOffset = minPixelSize * 0.28
+    if (offsetY <= 0 || offsetY < visualRoofOffset) {
+      offsetY = visualRoofOffset
+    }
   }
 
   if (offsetY <= 0) {
-    offsetY = minPixelSize > 0 ? minPixelSize * 0.55 : 28
+    offsetY = minPixelSize > 0 ? minPixelSize * 0.28 : 16
   }
 
   return {
@@ -230,7 +245,8 @@ const resolveBadgeScreenPosition = (scene, basePos, topWorldPos, minPixelSize, p
  * @param {Function} [options.getVisible] 是否显示信息牌
  * @param {boolean} [options.isOffline=false] true=离线，false=在线
  * @param {number} [options.labelOffset=1] 模型未加载完成时的兜底高度（米）
- * @param {number} [options.pixelGap=2] 信息牌与车顶之间的像素间距
+ * @param {number} [options.pixelGap=0] 信息牌与车顶之间的像素间距
+ * @param {number} [options.heightScale=0.72] 屏幕偏移收紧系数（越小越贴近车顶）
  */
 export function createGlbInfoBadge(options = {}) {
   const {
@@ -242,6 +258,7 @@ export function createGlbInfoBadge(options = {}) {
     isOffline = false,
     labelOffset = DEFAULT_LABEL_OFFSET,
     pixelGap = DEFAULT_PIXEL_GAP,
+    heightScale = DEFAULT_HEIGHT_SCALE,
   } = options
 
   if (!map || typeof getPosition !== 'function') {
@@ -302,7 +319,8 @@ export function createGlbInfoBadge(options = {}) {
         basePos,
         topWorldPos,
         minPixelSize,
-        pixelGap
+        pixelGap,
+        heightScale
       )
 
       if (!screenPos) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "huweili-cesium",
-  "version": "1.2.97",
+  "version": "1.2.98",
   "description": "基于 Cesium 的地图工具库（无人机态势、轨迹、围栏、工具栏等）",
   "type": "module",
   "main": "./index.js",