@yangyongtao/gaea 1.1.22 → 1.1.24

package/src/GaeaMethods.js

@@ -137,7 +137,7 @@ const defaultConfig = {
   /** 天地图 token（在线模式使用） */
   tiandituToken: '63201cfd7df1e1bff7d88bb8baa32151',
   /** 天地图最小/最大层级 */
-  tiandituLevelRange: [0, 18],
+  tiandituLevelRange: [0, 21],
   /** 默认加载的影像图层（服务平台模式生效） */
   defaultLayers: [
     { layerName: 'earthland', forMat: 'image/png', min: 0, max: 18, transparency: 0.3 },
@@ -164,6 +164,8 @@ const defaultConfig = {
   dataHubApiUrl: '',
   /** 是否显示图层树按钮（右上角重置按钮旁边） */
   showLayerTreeBtn: false,
+  /** 默认隐藏的分类 key 列表，如 ['rainStations', 'rescue'] */
+  defaultHiddenCategories: [],
   /** 图层树分类数据（默认数据，接口数据会合并进来） */
   layerCategories: [
     { key: 'seawall',             text: '海塘',       visible: true,  children: [
@@ -401,6 +403,14 @@ export class GaeaApp {
       // 8. 初始化屏幕图标
       this._initScreenIcons();
 
+      // 应用默认隐藏的分类
+      const hiddenCats = this.config.defaultHiddenCategories || []
+      hiddenCats.forEach(key => {
+        const cat = this.layerCategories.find(c => c.key === key)
+        if (cat) cat.visible = false
+        this.setCategoryVisible(key, false)
+      })
+
       console.log('[GaeaApp] 后台资源加载完成');
     } catch (e) {
       console.error('[GaeaApp] 后台资源加载出错:', e);
@@ -603,13 +613,8 @@ export class GaeaApp {
       { name: 'YPDP0+750',            position: { x: 27.220289, y: 120.459753, z: -44 }, rotate: [0, 226, 0], size: [1, 1, 1], show: true,  url: 'gltf/大坝断面750.gltf' },
       { name: 'YPDP0+100',            position: { x: 27.223027, y: 120.454653, z: -44 }, rotate: [0, 222, 0], size: [1, 1, 1], show: true,  url: 'gltf/大坝断面100.gltf' },
       { name: 'YPDP0+200',            position: { x: 27.222541, y: 120.455453, z: -44 }, rotate: [0, 246, 0], size: [1, 1, 1], show: true,  url: 'gltf/大坝断面200.gltf' },
-      { name: '沿浦水闸',             position: { x: 27.222866, y: 120.453113, z: 13.25 }, rotate: [0, -30, 0], size: [1, 1, 1], show: false, url: 'gltf/沿浦水闸.gltf',      enablePick: true },
       { name: '沿浦泵站',             position: { x: 27.222001, y: 120.452509, z: 17 },    rotate: [0, -38, 0], size: [1, 1, 1], show: true,  url: 'gltf/沿浦泵站.gltf',      enablePick: true },
-      { name: '下在水闸',             position: { x: 27.221816, y: 120.445182, z: 20 },    rotate: [0, 0, 0],  size: [1, 1, 1], show: false, url: 'gltf/下在水闸.gltf',      enablePick: true },
       { name: '下在海塘纳排闸',       position: { x: 27.219978, y: 120.445672, z: 15 },    rotate: [0, 0, 0],  size: [1, 1, 1], show: true,  url: 'gltf/下在海塘纳排闸.gltf',  enablePick: true },
-      { name: '联盟水闸',             position: { x: 27.200462, y: 120.465635, z: 20 },    rotate: [0, 0, 0],  size: [1, 1, 1], show: false, url: 'gltf/联盟水闸.gltf',      enablePick: true },
-      { name: '岭尾水闸',             position: { x: 27.215762, y: 120.462235, z: 30 },    rotate: [0, -63, 0], size: [1, 1, 1], show: false, url: 'gltf/岭尾水闸.gltf', enablePick: true },
-      { name: '岭尾新闸',             position: { x: 27.210369, y: 120.458532, z: 0.5 },   rotate: [0, -153, 0], size: [1, 1, 1], show: false, url: 'gltf/岭尾新闸.gltf' },
       { name: '盒子模型',             position: { x: 27.241836, y: 120.462750, z: 50 },    rotate: [0, 90, 0],  size: [10, 10, 10], show: true, url: 'gltf/box.gltf' },
       { name: 'YPDP0+600游览模型',    position: { x: 27.217433, y: 120.461448, z: 32 },    rotate: [0, 90, 0],  size: [1, 1, 1], show: true,  url: 'gltf/box.gltf' },
       { name: 'YPDP0+750游览模型',    position: { x: 27.220072, y: 120.459602, z: 30 },    rotate: [0, 90, 0],  size: [1, 1, 1], show: true,  url: 'gltf/box.gltf' },
@@ -1488,7 +1493,14 @@ export class GaeaApp {
       position: { x: lat, y: lng, z },
       method,
       offset,
-      onClick,
+      onClick: (clickedName, data) => {
+        // 派发全局自定义事件，父组件可通过 document.addEventListener 监听
+        document.dispatchEvent(new CustomEvent('gaea-marker-click', {
+          detail: { name: clickedName, text: data.text, position: data.position, category },
+          bubbles: true
+        }))
+        if (onClick) onClick(clickedName, data)
+      },
       category,
       type: 'marker'
     })
@@ -2033,6 +2045,141 @@ export class GaeaApp {
       if (el) el.style.display = 'none'
     })
   };
+
+  // ---- 水面加载 ----
+
+  /**
+   * 加载水面
+   * @param {Object} opts
+   * @param {string} opts.gltfUrl - GLTF 模型路径
+   * @param {Object} opts.Position - { x: 纬度, y: 经度, z: 高程 }
+   * @param {Array<number>} opts.rotate - [tilt, heading, bank] 旋转角度
+   * @param {Array<number>} opts.scale - [sx, sy, sz] 缩放
+   * @param {Array<number>} [opts.colorDeep=[0,157,187]] - 深水区颜色 [r, g, b]（0-255）
+   * @param {number} [opts.flowSpeed=0.1] - 流速
+   */
+  addWaterHandle = async ({
+    gltfUrl, Position, rotate, scale,
+    colorDeep = [0, 157, 187],
+    flowSpeed = 0.1
+  }) => {
+    const waterMtl = Gaea.GaeaResourceLoader.Instance.LoadLoaclResource('res://assets/material/river.tres')
+    const material = Gaea.ShaderMaterial.ConvertBy(waterMtl)
+
+    const element = new Gaea.GLTFElement()
+    element.ResourceName = gltfUrl
+    element.GeographyPosition = new Gaea.Vector3(Position.x, Position.y, Position.z)
+
+    element.OnModelInit(() => {
+      const n = element.GetChildCount()
+      for (let i = 0; i < n; i++) {
+        const meshInstance = Gaea.MeshInstance.ConvertBy(element.Root.GetChild(i))
+        const count = meshInstance.Mesh.GetSurfaceCount()
+        for (let j = 0; j < count; j++) {
+          meshInstance.Mesh.SurfaceSetMaterial(j, material)
+        }
+      }
+      element.Scale = new Gaea.Vector3(scale[0], scale[1], scale[2])
+      element.TiltHeadingBank = new Gaea.Vector3(rotate[0], rotate[1], rotate[2])
+
+      Gaea.World.Instance.SetMtlVector3(material, 'uv_scale', new Gaea.Vector3(-7, -7, 1))
+      Gaea.World.Instance.SetMtlFloat(material, 'flow_speed', flowSpeed)
+      Gaea.World.Instance.SetMtlColor(material, 'color_shallow', new Gaea.Color(0 / 255, 157 / 255, 187 / 255, 1))
+      Gaea.World.Instance.SetMtlColor(material, 'color_deep', new Gaea.Color(colorDeep[0] / 255, colorDeep[1] / 255, colorDeep[2] / 255, 1))
+      Gaea.World.Instance.SetMtlFloat(material, 'transparency_clarity', 3)
+      Gaea.World.Instance.SetMtlFloat(material, 'foam_amount', 0.9)
+    })
+
+    Gaea.World.Instance.RenderableObjectList.AddLast(element)
+    return element
+  };
+
+  // ---- 开门动画 ----
+
+  /**
+   * 模型缓动动画（缩放/位移/旋转）
+   * @param {Object} element - GLTF 元素
+   * @param {Object} Scale - 目标缩放 { x, y, z }
+   * @param {Object} Position - 目标位置 { x, y, z }
+   * @param {Object} translation - 模型相对位移 { x, y, z }
+   * @param {number} time - 动画时间（ms）
+   * @param {Object} Door - 门旋转角度 { x, y, z }
+   * @param {number} floor - 门在模型树中的层级索引
+   */
+  tweentest = (element, Scale = {}, Position = {}, translation = {}, time, Door = {}, floor = 0) => {
+    const { Tween, Easing } = window.TWEEN
+
+    if (Object.values(Scale).length) {
+      const scale = { x: element.Scale.x, y: element.Scale.y, z: element.Scale.z }
+      const tweenScale = new Tween(scale)
+        .to(Scale, time)
+        .easing(Easing.Quadratic.InOut)
+        .onUpdate(() => {
+          element.Scale = new Gaea.Vector3(scale.x, scale.y, scale.z)
+        })
+        .start()
+        .onStart(() => { if (Scale.x !== 0.1) element.Visible = true })
+        .onComplete(() => { if (Scale.x === 0.1) element.Visible = false; this.tweenGroup.remove(tweenScale) })
+      this.tweenGroup.add(tweenScale)
+    }
+
+    if (Object.values(Position).length) {
+      const pos = { x: element.GeographyPosition.x, y: element.GeographyPosition.y, z: element.GeographyPosition.z }
+      const tweenPos = new Tween(pos)
+        .to(Position, time)
+        .easing(Easing.Quadratic.InOut)
+        .onUpdate(() => { element.GeographyPosition = new Gaea.Vector3(pos.x, pos.y, pos.z) })
+        .start()
+        .onComplete(() => { this.tweenGroup.remove(tweenPos) })
+      this.tweenGroup.add(tweenPos)
+    }
+
+    if (Object.values(Door).length) {
+      const doorMesh = element.Root.GetChild(floor)
+      const meshInstance = new Gaea.MeshInstance()
+      meshInstance.InstanceID = doorMesh.InstanceID
+      const doorAngle = { x: meshInstance.RotationDegrees.x, y: meshInstance.RotationDegrees.y, z: meshInstance.RotationDegrees.z }
+      const tweenDoor = new Tween(doorAngle)
+        .to(Door, time)
+        .easing(Easing.Quadratic.InOut)
+        .onUpdate(() => { meshInstance.RotationDegrees = new Gaea.Vector3(doorAngle.x, doorAngle.y, doorAngle.z) })
+        .start()
+        .onComplete(() => { this.tweenGroup.remove(tweenDoor) })
+      this.tweenGroup.add(tweenDoor)
+    }
+
+    if (Object.values(translation).length) {
+      const trans = element.Root
+        ? { x: element.Root.Translation.x, y: element.Root.Translation.y, z: element.Root.Translation.z }
+        : { x: element.Translation.x, y: element.Translation.y, z: element.Translation.z }
+      const tweenTrans = new Tween(trans)
+        .to(translation, time)
+        .easing(Easing.Quadratic.InOut)
+        .onUpdate(() => {
+          if (element.Root) element.Root.Translation = new Gaea.Vector3(trans.x, trans.y, trans.z)
+          else element.Translation = new Gaea.Vector3(trans.x, trans.y, trans.z)
+        })
+        .start()
+        .onComplete(() => { this.tweenGroup.remove(tweenTrans) })
+      this.tweenGroup.add(tweenTrans)
+    }
+  };
+
+  // ---- 模型内置动画 ----
+
+  /**
+   * 执行模型内置动画（如开闸/关闸动画）
+   * @param {Object} opts
+   * @param {string} opts.animationPath - 动画路径，如 '沿浦水闸/AnimationPlayer'
+   * @param {string} opts.animationName - 动画名称，如 '开闸'
+   * @param {number} [opts.speed=1.0] - 动画速度
+   * @param {boolean} [opts.isReversePlay=false] - 是否反向播放
+   */
+  executeModelAnimation = ({ animationPath, animationName, speed = 1.0, isReversePlay = false }) => {
+    const node = Gaea.World.Instance.GetNode(animationPath)
+    const nodeAnimate = Gaea.AnimationPlayer.ConvertBy(node)
+    nodeAnimate.Play(animationName, -1, speed, isReversePlay)
+  };
 }
 
 export default GaeaApp;

package/src/components/LayerTree.vue

@@ -44,6 +44,8 @@ import vDrag from '../directives/vDrag.js';
 
 const props = defineProps({
   appInstance: { type: Object, required: true },
+  /** 需要隐藏的分类 key 列表 */
+  hiddenCategories: { type: Array, default: () => [] }
 });
 
 const emit = defineEmits(['close', 'node-click']);
@@ -78,7 +80,10 @@ function onCategoryToggle(categoryKey, checked) {
 
 const filteredData = computed(() => {
   const kw = searchKey.value.trim().toLowerCase();
-  return categories.value.map(rootNode => {
+  const hidden = new Set(props.hiddenCategories);
+  return categories.value
+    .filter(rootNode => rootNode.visible !== false && !hidden.has(rootNode.key))
+    .map(rootNode => {
     if (!kw) {
       rootNode.filteredChildren = rootNode.children || [];
       return rootNode;

package/src/vite-plugin.js

@@ -41,13 +41,19 @@ export default function gaeaVitePlugin() {
     name: 'vite-plugin-gaea',
     enforce: 'pre',
 
-    config() {
-      return {
-        server: { headers: COEP_HEADERS },
-      };
-    },
-
     configureServer(server) {
+      // COEP/COOP 头只对非 WebSocket 请求设置，避免破坏 Vite HMR
+      server.middlewares.stack.unshift({
+        route: '',
+        handle: function coepMiddleware(req, res, next) {
+          if (req.headers.upgrade) return next(); // 跳过 WebSocket 升级请求
+          for (const [key, val] of Object.entries(COEP_HEADERS)) {
+            res.setHeader(key, val);
+          }
+          next();
+        },
+      });
+
       server.middlewares.stack.unshift({
         route: '',
         handle: function gaeaServe(req, res, next) {