@yangyongtao/gaea 1.1.23 → 1.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yangyongtao/gaea",
-  "version": "1.1.23",
+  "version": "1.1.25",
   "description": "Gaea 3D visualization component library - Vue 3 components based on Godot WASM engine. Includes WMTS layer loading, camera view control, Vite plugin auto-injection, etc.",
   "type": "module",
   "main": "src/index.cjs",

package/src/GaeaMethods.js

@@ -164,6 +164,8 @@ const defaultConfig = {
   dataHubApiUrl: '',
   /** 是否显示图层树按钮（右上角重置按钮旁边） */
   showLayerTreeBtn: false,
+  /** 默认隐藏的分类 key 列表，如 ['rainStations', 'rescue'] */
+  defaultHiddenCategories: [],
   /** 图层树分类数据（默认数据，接口数据会合并进来） */
   layerCategories: [
     { key: 'seawall',             text: '海塘',       visible: true,  children: [
@@ -287,6 +289,8 @@ export class GaeaApp {
     this.layerCategories = this.config.layerCategories || [];
     this._screenIconList = [];
     this._hiddenCategories = new Set();
+    this._tilesetMap = {}; // 已加载的 3D Tiles 引用，key 为 tileset 名称
+    this._flattenTool = null; // 压平绘制工具
     this._secIsClickArr = [];
     this._secScreenIconKeyValue = {};
     this._groundPolygonElements = [];
@@ -401,6 +405,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);
@@ -1170,6 +1182,7 @@ export class GaeaApp {
     const tilesetUrl = typeof item === 'string' ? item : item.jsonUrl
     const name = typeof item === 'string' ? '' : (item.tilName || '')
     const height = typeof item === 'string' ? 0 : (item.height || 0)
+    const enableFlatten = typeof item === 'object' ? (item.enableFlatten || false) : false
     const tileset = new Gaea.Gaea3DTileset()
     tileset.Name = name
     tileset.TilesetUrl = tilesetUrl
@@ -1178,6 +1191,7 @@ export class GaeaApp {
     tileset.SkipLevelOfDetail = false
     tileset.IsZUp = true
     tileset.RecalculateNormals = true
+    tileset.EnabledFlatten = enableFlatten
     tileset.BaseUrl = tilesetUrl.slice(0, tilesetUrl.lastIndexOf('/') + 1)
     tileset.InitTileSet(name, tilesetUrl)
     tileset.MaximumMemoryUsage = 512
@@ -1186,10 +1200,75 @@ export class GaeaApp {
       tileset.LocalOffset = new Gaea.Vector3(0, height, 0)
     }
     Gaea.World.Instance.RenderableObjectList.AddLast(tileset)
-    console.log('[GaeaApp] 3D Tiles 已加载:', name || tilesetUrl, height ? `高度: ${height}` : '')
+    if (name) {
+      this._tilesetMap[name] = tileset
+    }
+    console.log('[GaeaApp] 3D Tiles 已加载:', name || tilesetUrl, height ? `高度: ${height}` : '', enableFlatten ? '(压平已启用)' : '')
     return tileset
   };
 
+  // ---- 倾斜摄影压平 ----
+
+  /**
+   * 进入倾斜摄影压平绘制模式
+   * 调用后可以在 3D Tiles 上绘制多边形，多边形区域内将被压平
+   * @param {string} [tilesetName] - 目标 3D Tiles 名称（不传则默认使用第一个已加载的 tileset）
+   */
+  startFlattenDraw = (tilesetName) => {
+    // 查找目标 tileset
+    let tileset = null
+    if (tilesetName) {
+      tileset = this._tilesetMap[tilesetName]
+      if (!tileset) {
+        console.warn(`[GaeaApp] startFlattenDraw: 未找到 tileset "${tilesetName}"`)
+        return
+      }
+    } else {
+      // 取第一个有名字的 tileset
+      const keys = Object.keys(this._tilesetMap)
+      if (keys.length === 0) {
+        console.warn('[GaeaApp] startFlattenDraw: 没有已加载的 3D Tiles')
+        return
+      }
+      tileset = this._tilesetMap[keys[0]]
+    }
+
+    tileset.EnabledFlatten = true
+
+    if (!this._flattenTool) {
+      this._flattenTool = new Gaea.FlattenTool()
+      this._flattenTool.NeedIntersectWithMesh = false
+      this._flattenTool.IsMovingIntersectWithMesh = false
+    }
+
+    Gaea.World.Instance.SetCurrentTool(this._flattenTool)
+    Gaea.World.Instance.CurrentTool = this._flattenTool
+    console.log('[GaeaApp] 压平绘制模式已启动:', tileset.Name || tileset.TilesetUrl)
+  };
+
+  /**
+   * 设置压平高度
+   * @param {number} height - 压平目标高度
+   */
+  setFlattenHeight = (height) => {
+    if (!this._flattenTool) {
+      console.warn('[GaeaApp] setFlattenHeight: 尚未启用压平绘制模式，请先调用 startFlattenDraw()')
+      return
+    }
+    this._flattenTool.Gdtvalue = height
+    console.log('[GaeaApp] 压平高度已设置为:', height)
+  };
+
+  /**
+   * 结束压平绘制模式（保留已绘制的压平效果）
+   */
+  stopFlattenDraw = () => {
+    Gaea.World.Instance.SetCurrentTool(null)
+    Gaea.World.Instance.CurrentTool = null
+    this._flattenTool = null
+    console.log('[GaeaApp] 压平绘制模式已退出')
+  };
+
   /**
    * 根据经纬度飞到指定位置
    * @param {number} lat - 纬度
@@ -1483,7 +1562,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'
     })
@@ -2038,8 +2124,14 @@ export class GaeaApp {
    * @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 }) => {
+  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)
 
@@ -2060,9 +2152,9 @@ export class GaeaApp {
       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', 0.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(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)
     })

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;