dev #2

Merged
linkong merged 5 commits from dev into main 2026-03-20 21:17:31 +00:00
2 changed files with 24 additions and 13 deletions
Showing only changes of commit 0c950262d3 - Show all commits

View File

@@ -191,16 +191,27 @@ async function loadData(showWhiteSphere = false) {
setLoading(true);
try {
console.log('开始加载电缆数据...');
await loadGeoJSONFromPath(scene, getEarth());
console.log('电缆数据加载完成');
await loadLandingPoints(scene, getEarth());
console.log('登陆点数据加载完成');
const satCount = await loadSatellites();
console.log(`卫星数据加载完成: ${satCount}`);
updateSatellitePositions();
console.log('卫星位置已更新');
console.log('开始加载数据...');
await Promise.all([
(async () => {
await loadGeoJSONFromPath(scene, getEarth());
console.log('电缆数据加载完成');
await loadLandingPoints(scene, getEarth());
console.log('登陆点数据加载完成');
})(),
(async () => {
const satCount = await loadSatellites();
console.log(`卫星数据加载完成: ${satCount}`);
updateSatellitePositions();
console.log('卫星位置已更新');
toggleSatellites(true);
const satBtn = document.getElementById('toggle-satellites');
if (satBtn) {
satBtn.classList.add('active');
satBtn.querySelector('.tooltip').textContent = '隐藏卫星';
}
})()
]);
} catch (error) {
console.error('加载数据失败:', error);
showStatusMessage('加载数据失败: ' + error.message, 'error');

View File

@@ -291,9 +291,9 @@ export function updateSatellitePositions(deltaTime = 0) {
trailColors[trailIdx + 1] = g * alpha;
trailColors[trailIdx + 2] = b * alpha;
} else {
trailPositions[trailIdx] = 0;
trailPositions[trailIdx + 1] = 0;
trailPositions[trailIdx + 2] = 0;
trailPositions[trailIdx] = pos.x;
trailPositions[trailIdx + 1] = pos.y;
trailPositions[trailIdx + 2] = pos.z;
trailColors[trailIdx] = 0;
trailColors[trailIdx + 1] = 0;
trailColors[trailIdx + 2] = 0;