@yangyongtao/gaea 1.1.5 → 1.1.7

package/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+## [1.1.6] - 2026-07-01
+
+### Changed
+- 优化引入方式：`loadResource`、`screenToLatLng` 工具函数可直接从 `@yangyongtao/gaea` 导入
+- 移除冗余的 `@yangyongtao/gaea/methods` 导出路径
+
+## [1.1.5] - 2026-07-01
+
+### Added
+- 添加 `npm run pub` 快捷发布命令
+
+### Changed
+- 更新 GitHub 仓库地址为 smallflypig/Gaea
+- 优化 postinstall 脚本，大文件资源版本锁定 1.1.1
+
+## [1.1.0] - 2026-06-30
+
+### Changed
+- 大文件 (Gaea.pck, Gaea.wasm, gltf, 1111.res) 从 npm 包中分离，改为 postinstall 自动下载
+- npm 包体积从 310MB 降至 19.5MB
+
+### Added
+- 添加 postinstall 自动下载脚本
+- 添加 .npmignore 排除大文件

package/README.md

@@ -8,7 +8,7 @@ Gaea 3D 可视化组件库 — 基于 Godot WASM 引擎的 Vue 3 组件包。
 npm install @yangyongtao/gaea
 ```
 
-## 项目配置
+## 快速开始
 
 ### 1. `vite.config.js`
 
@@ -19,140 +19,107 @@ import { gaeaVitePlugin } from '@yangyongtao/gaea/plugin';
 
 export default defineConfig({
   plugins: [vue(), gaeaVitePlugin()],
-  resolve: {
-    preserveSymlinks: true,
-  },
-  optimizeDeps: {
-    exclude: ['@yangyongtao/gaea'],
-  },
+  resolve: { preserveSymlinks: true },
+  optimizeDeps: { exclude: ['@yangyongtao/gaea'] },
 });
 ```
 
-`gaeaVitePlugin()` 会自动完成：
-- 在 HTML 中注入 `<script src="/Gaea.js">`
-- 提供 `/Gaea.js` `/Gaea.wasm` `/Gaea.pck` 等所有 public/ 静态文件
-- 设置 COEP/COOP 响应头
-- 检测浏览器跨域隔离状态
-
-### 2. `src/App.vue` — 完整初始化示例
+### 2. `src/App.vue`
 
 ```vue
 <template>
-  <canvas id="canvas" style="width:100vw;height:100vh"></canvas>
+  <div id="gaea-app">
+    <div class="toolbar">
+      <button @click="showWeather = !showWeather">天气控制</button>
+      <button @click="showFly = !showFly">沿线飞行</button>
+    </div>
+
+    <div class="canvas-area">
+      <canvas id="canvas"></canvas>
+    </div>
+
+    <WeatherControl v-if="showWeather" :appInstance="app" @close="showWeather = false" />
+    <FlyAlongRoute v-if="showFly" :appInstance="app" @close="showFly = false" />
+  </div>
 </template>
 
 <script setup>
-import { onMounted } from 'vue';
+import { ref } from 'vue';
 import { GaeaApp, setConfig } from '@yangyongtao/gaea';
+import { WeatherControl, FlyAlongRoute } from '@yangyongtao/gaea/components';
+
+// 配置
+setConfig({
+  serveLocal: `${window.location.origin}/static/`,
+  serveUrl: 'http://192.168.3.151:8088/gaeaExplorerServer/',
+  defaultLayers: [
+    { layerName: 'earthland', forMat: 'image/png', min: 0, max: 18, transparency: 0.3 },
+    { layerName: '苍南L19',  forMat: 'image/png', min: 5, max: 17 },
+  ],
+  defaultCameraPosition: '27.3680928977018,120.414139621887,0,109379.690132486,0,0',
+});
 
+// 初始化（自动完成：引擎启动 → 环境初始化 → 图层加载）
 const app = new GaeaApp();
 window.APP = app;
 
-onMounted(async () => {
-  setConfig({
-    serveLocal: `${window.location.origin}/static/`,
-    serveUrl: 'http://192.168.3.151:8088/gaeaExplorerServer/',
-  });
-
-  new window.Engine({
-    args: [],
-    canvasResizePolicy: 2,
-    executable: '/Gaea',
-    experimentalVK: false,
-    fileSizes: {
-      'Gaea.pck': 450751936,
-      'Gaea.wasm': 16580215,
-    },
-    focusCanvas: true,
-    gdnativeLibs: [],
-  }).startGame({
-    onProgress: (current, total) => console.log(`加载: ${current}/${total}`),
-  });
-
-  await app.initDefaultEnvironment();
-
-  app.getAllServe().then(() => {
-    app.addLayer({ layerName: 'earthland', forMat: 'image/png', min: 0, max: 18, transparency: 0.3 });
-    app.addLayer({ layerName: '苍南L19',  forMat: 'image/png', min: 5, max: 17 });
-  });
-});
+const showWeather = ref(false);
+const showFly = ref(false);
 </script>
 ```
 
-> **注意**：`fileSizes` 需与 npm 包 `public/Gaea.pck` 和 `public/Gaea.wasm` 实际文件大小一致。
-
 ## API
 
-### 配置
+### 配置项
 
 ```js
 import { setConfig } from '@yangyongtao/gaea';
 
 setConfig({
-  serveUrl: 'http://192.168.3.151:8088/gaeaExplorerServer/',
-  serveLocal: 'http://localhost:8080/static/',
+  serveUrl: '',           // WMTS 服务地址
+  serveLocal: '',          // 静态资源地址
+  defaultLayers: [],       // 默认影像图层
+  defaultCameraPosition: 'lat,lng,alt,dist,pitch,heading',
+  onProgress: (cur, total) => {},  // 引擎加载进度回调
 });
 ```
 
-### 环境初始化
-
-```js
-await app.initDefaultEnvironment();
-```
-
-### 影像图层
-
-```js
-await app.getAllServe();
+### GaeaApp 方法
 
-app.addLayer({
-  layerName: 'earthland',
-  forMat: 'image/png',
-  min: 0, max: 18,
-  transparency: 0.3,
-});
-```
-
-### 相机控制
-
-```js
-app.SetPosition('27.3809, 120.4499, 0, 3000, 0, 0');
-const uri = app.favorite();
-app.favoritePosition(uri);
-```
+| 方法 | 说明 |
+|------|------|
+| `new GaeaApp(options)` | 创建实例，自动初始化引擎/环境/图层 |
+| `app.getAllServe()` | 获取 WMTS 服务图层列表 |
+| `app.addLayer({ layerName, forMat, min, max, transparency })` | 添加影像图层 |
+| `app.SetPosition('lat,lng,alt,dist,pitch,heading')` | 定位到指定视角 |
+| `app.favorite()` | 记录当前视角，返回 URI 字符串 |
+| `app.favoritePosition(uri)` | 恢复已保存的视角 |
+| `app.ready` | Promise，等待初始化完成 |
 
 ### Vue 组件
 
 ```vue
 <script setup>
 import { WeatherControl, FlyAlongRoute } from '@yangyongtao/gaea/components';
+
+const app = window.APP;
+const show = ref(false);
 </script>
 
 <template>
-  <WeatherControl :appInstance="app" @close="close" />
-  <FlyAlongRoute :appInstance="app" @close="close" />
+  <WeatherControl :appInstance="app" @close="show = false" />
+  <FlyAlongRoute :appInstance="app" @close="show = false" />
 </template>
 ```
 
 ### 其他导出
 
-| 导出 | 路径 |
-|------|------|
-| `gaeaVitePlugin` | `@yangyongtao/gaea/plugin` |
-| `GaeaPlugin` (v-drag 指令) | `@yangyongtao/gaea/plugin` |
-| `loadResource`, `screenToLatLng` | `@yangyongtao/gaea` |
-
-## 静态资源
-
-npm 包 `public/` 中的文件由 `gaeaVitePlugin` 自动提供服务。
-
-```
-public/
-├── Gaea.js / Gaea.wasm / Gaea.pck   # Godot 引擎核心
-├── index.js                           # Godot 类绑定
-├── math/                              # 数学工具
-└── static/                            # 点标注、底图、模型等资源
-```
+| 导出 | 路径 | 说明 |
+|------|------|------|
+| `GaeaApp`, `setConfig`, `getConfig` | `@yangyongtao/gaea` | 核心功能 |
+| `loadResource`, `screenToLatLng` | `@yangyongtao/gaea` | 工具函数 |
+| `WeatherControl`, `FlyAlongRoute` | `@yangyongtao/gaea/components` | Vue 组件 |
+| `gaeaVitePlugin`, `GaeaPlugin` | `@yangyongtao/gaea/plugin` | Vite 插件 / v-drag 指令 |
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yangyongtao/gaea",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "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.js",
@@ -14,10 +14,6 @@
       "import": "./src/components/index.js",
       "default": "./src/components/index.js"
     },
-    "./methods": {
-      "import": "./src/GaeaMethods.js",
-      "default": "./src/GaeaMethods.js"
-    },
     "./plugin": {
       "import": "./src/plugin.js",
       "default": "./src/plugin.js"
@@ -27,6 +23,7 @@
     "src/",
     "scripts/",
     "README.md",
+    "CHANGELOG.md",
     "public/*.js",
     "public/*.html",
     "public/*.png",

package/src/GaeaMethods.js

@@ -1,11 +1,12 @@
 /**
  * gaea-3dview npm package
  *
- * 初始化流程：
- * 1. HTML 加载 <script src="/Gaea.js"> → window.Engine 可用
- * 2. import Gaea from '../public/index.js' → window.InstanceMap / NativeCall 等全局变量
- * 3. new window.Engine({...}).startGame({...}) → Godot WASM 启动
- * 4. app.initDefaultEnvironment() → 环境初始化
+ * 初始化在 new GaeaApp() 时自动完成，Vue 页面只需配置。
+ *
+ * 用法：
+ *   setConfig({ serveUrl: '...', serveLocal: '...' });
+ *   const app = new GaeaApp();
+ *   await app.ready;  // 可选，等待初始化完成
  */
 
 import Gaea from '../public/index.js';
@@ -13,7 +14,26 @@ import Gaea from '../public/index.js';
 
 // ==================== 配置 ====================
 
-const defaultConfig = { serveUrl: '', serveLocal: '' };
+const defaultConfig = {
+  serveUrl: '',
+  serveLocal: '',
+  // Engine 配置
+  executable: '/Gaea',
+  fileSizes: { 'Gaea.pck': 450751936, 'Gaea.wasm': 16580215 },
+  canvasResizePolicy: 2,
+  experimentalVK: false,
+  focusCanvas: true,
+  /** 默认加载的影像图层 */
+  defaultLayers: [
+    { layerName: 'earthland', forMat: 'image/png', min: 0, max: 18, transparency: 0.3 },
+    { layerName: '苍南L19',  forMat: 'image/png', min: 5, max: 17 },
+  ],
+  /** 默认相机视角 */
+  defaultCameraPosition: '27.3680928977018,120.414139621887,0,109379.690132486,0,0',
+  /** 引擎加载进度回调 */
+  onProgress: null,
+};
+
 const _config = { ...defaultConfig };
 
 export function setConfig(cfg) { Object.assign(_config, cfg); }
@@ -27,12 +47,80 @@ export class GaeaApp {
     this._options = options;
     this.layers = [];
     this.tLayers = [];
+    window.Gaea = Gaea;
+
+    // 自动启动初始化，catch 防止未处理的 Promise rejection
+    this.ready = this._autoInit().catch(err => {
+      console.error('[GaeaApp] 初始化失败:', err);
+    });
   }
 
   get config() { return { ..._config, ...this._options }; }
 
-  async initDefaultEnvironment() {
-    window.Gaea = Gaea;
+  // ---- 内部初始化 ----
+
+  async _autoInit() {
+    console.log('[GaeaApp] 开始初始化...');
+
+    // 1. 等 canvas 就绪
+    await this._waitForCanvas();
+    console.log('[GaeaApp] canvas 就绪');
+
+    // 2. 启动 Godot 引擎
+    await this._startEngine();
+    console.log('[GaeaApp] 引擎启动完成');
+
+    // 3. 初始化环境
+    await this._initEnvironment();
+    console.log('[GaeaApp] 环境初始化完成');
+
+    // 4. 加载默认图层
+    await this._initLayers();
+    console.log('[GaeaApp] 初始化完成');
+  }
+
+  _waitForCanvas() {
+    return new Promise((resolve, reject) => {
+      const start = Date.now();
+      const check = () => {
+        const el = document.getElementById('canvas');
+        if (el && el.width > 0) {
+          resolve();
+        } else if (Date.now() - start > 10000) {
+          reject(new Error('等待 canvas 超时'));
+        } else {
+          requestAnimationFrame(check);
+        }
+      };
+      check();
+    });
+  }
+
+  async _startEngine() {
+    if (!window.Engine) {
+      throw new Error('window.Engine 不存在，请确保 <script src="/Gaea.js"> 已加载');
+    }
+    if (!window.Engine.isWebGLAvailable()) {
+      throw new Error('WebGL 不可用');
+    }
+
+    const cfg = this.config;
+    const engine = new window.Engine({
+      args: [],
+      canvasResizePolicy: cfg.canvasResizePolicy,
+      executable: cfg.executable,
+      experimentalVK: cfg.experimentalVK,
+      fileSizes: cfg.fileSizes,
+      focusCanvas: cfg.focusCanvas,
+      gdnativeLibs: [],
+    });
+
+    await engine.startGame({
+      onProgress: cfg.onProgress || ((cur, total) => console.log(`引擎加载: ${cur}/${total}`)),
+    });
+  }
+
+  async _initEnvironment() {
     Gaea.World.Instance.Is3DTilesNeedCache = false;
     Gaea.World.Instance.IsPyramidTileSetNeedCache = false;
 
@@ -53,6 +141,41 @@ export class GaeaApp {
     Gaea.World.Instance.CloudVisalbe = false;
   }
 
+  async _initLayers() {
+    const cfg = this.config;
+    await this.getAllServe();
+
+    const pos = cfg.defaultCameraPosition;
+    if (pos) this.SetPosition(pos);
+
+    const list = cfg.defaultLayers;
+    if (list?.length) {
+      for (const layer of list) {
+        this.addLayer(layer);
+      }
+    }
+  }
+
+  // ---- 公开方法 ----
+
+  /** 初始化默认图层和相机视角（手动调用，可传参覆盖配置） */
+  async initDefaultLayers({ layers, cameraPosition } = {}) {
+    const cfg = this.config;
+    await this.getAllServe();
+    console.log('WMTS 图层数量:', this.layers.length);
+    this.layers.slice(0, 10).forEach(l => console.log(' -', l.Title));
+
+    const pos = cameraPosition ?? cfg.defaultCameraPosition;
+    if (pos) this.SetPosition(pos);
+
+    const list = layers ?? cfg.defaultLayers;
+    if (list?.length) {
+      for (const layer of list) {
+        this.addLayer(layer);
+      }
+    }
+  }
+
   async getAllServe() {
     const cfg = this.config;
     const url = `${cfg.serveUrl}htc/service/wmts?REQUEST=GetCapabilities`;

package/src/index.js

@@ -1,7 +1,12 @@
 /**
  * gaea-3dview 主入口
+ *
+ * 用法:
+ *   import { GaeaApp, setConfig } from '@yangyongtao/gaea';
+ *   import { loadResource, screenToLatLng } from '@yangyongtao/gaea';
+ *   import { WeatherControl, FlyAlongRoute } from '@yangyongtao/gaea/components';
+ *   import GaeaPlugin, { gaeaVitePlugin } from '@yangyongtao/gaea/plugin';
  */
 
-export { setConfig, getConfig } from './GaeaMethods.js';
-export { GaeaApp } from './GaeaMethods.js';
-export { default } from './GaeaMethods.js';
+export { GaeaApp, setConfig, getConfig } from './GaeaMethods.js';
+export { loadResource, screenToLatLng } from './utils.js';