astro-viewer 3.6.0 → 3.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/64.astroviewer.cjs +37 -0
- package/dist/64.astroviewer.cjs.map +1 -0
- package/dist/64.astroviewer.js +41 -0
- package/dist/64.astroviewer.js.map +1 -0
- package/dist/64.astroviewer.min.js +2 -0
- package/dist/64.astroviewer.min.js.map +1 -0
- package/dist/911.astroviewer.cjs +4047 -0
- package/dist/911.astroviewer.cjs.map +1 -0
- package/dist/911.astroviewer.js +735 -0
- package/dist/911.astroviewer.js.map +1 -0
- package/dist/911.astroviewer.min.js +2 -0
- package/dist/911.astroviewer.min.js.map +1 -0
- package/dist/astroviewer.cjs +3019 -479
- package/dist/astroviewer.cjs.map +1 -1
- package/dist/astroviewer.js +3172 -476
- package/dist/astroviewer.js.map +1 -1
- package/dist/astroviewer.min.js +1 -1
- package/dist/astroviewer.min.js.map +1 -1
- package/lib-esm/AstroSphere.d.ts +10 -2
- package/lib-esm/AstroSphere.d.ts.map +1 -1
- package/lib-esm/AstroSphere.js +92 -28
- package/lib-esm/AstroSphere.js.map +1 -1
- package/lib-esm/AstroViewer.d.ts +32 -23
- package/lib-esm/AstroViewer.d.ts.map +1 -1
- package/lib-esm/AstroViewer.js +125 -69
- package/lib-esm/AstroViewer.js.map +1 -1
- package/lib-esm/model/hips/AllSky.d.ts +7 -4
- package/lib-esm/model/hips/AllSky.d.ts.map +1 -1
- package/lib-esm/model/hips/AllSky.js +99 -33
- package/lib-esm/model/hips/AllSky.js.map +1 -1
- package/lib-esm/model/hips/AncestorTile.d.ts +7 -4
- package/lib-esm/model/hips/AncestorTile.d.ts.map +1 -1
- package/lib-esm/model/hips/AncestorTile.js +97 -53
- package/lib-esm/model/hips/AncestorTile.js.map +1 -1
- package/lib-esm/model/hips/FitsTileLoader.d.ts +9 -0
- package/lib-esm/model/hips/FitsTileLoader.d.ts.map +1 -0
- package/lib-esm/model/hips/FitsTileLoader.js +65 -0
- package/lib-esm/model/hips/FitsTileLoader.js.map +1 -0
- package/lib-esm/model/hips/HiPS.d.ts +16 -5
- package/lib-esm/model/hips/HiPS.d.ts.map +1 -1
- package/lib-esm/model/hips/HiPS.js +160 -72
- package/lib-esm/model/hips/HiPS.js.map +1 -1
- package/lib-esm/model/hips/HiPSCoverage.d.ts +20 -0
- package/lib-esm/model/hips/HiPSCoverage.d.ts.map +1 -0
- package/lib-esm/model/hips/HiPSCoverage.js +166 -0
- package/lib-esm/model/hips/HiPSCoverage.js.map +1 -0
- package/lib-esm/model/hips/Tile.d.ts +8 -5
- package/lib-esm/model/hips/Tile.d.ts.map +1 -1
- package/lib-esm/model/hips/Tile.js +116 -56
- package/lib-esm/model/hips/Tile.js.map +1 -1
- package/lib-esm/model/hips/TileBuffer.d.ts +13 -4
- package/lib-esm/model/hips/TileBuffer.d.ts.map +1 -1
- package/lib-esm/model/hips/TileBuffer.js +52 -11
- package/lib-esm/model/hips/TileBuffer.js.map +1 -1
- package/lib-esm/model/hips/VisibleTilesManager.d.ts +5 -5
- package/lib-esm/model/hips/VisibleTilesManager.d.ts.map +1 -1
- package/lib-esm/model/hips/VisibleTilesManager.js +6 -20
- package/lib-esm/model/hips/VisibleTilesManager.js.map +1 -1
- package/lib-esm/shader/HiPSShaderProgram.d.ts +11 -2
- package/lib-esm/shader/HiPSShaderProgram.d.ts.map +1 -1
- package/lib-esm/shader/HiPSShaderProgram.js +99 -53
- package/lib-esm/shader/HiPSShaderProgram.js.map +1 -1
- package/lib-esm/shader/ShaderManager.d.ts +2 -0
- package/lib-esm/shader/ShaderManager.d.ts.map +1 -1
- package/lib-esm/shader/ShaderManager.js +199 -96
- package/lib-esm/shader/ShaderManager.js.map +1 -1
- package/package.json +3 -3
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
* See LICENSE.md, LICENSE-AGPL.md, and LICENSE-COMMERCIAL.md for details.
|
|
10
10
|
*/
|
|
11
11
|
// TileBuffer.ts
|
|
12
|
-
import Tile from
|
|
12
|
+
import Tile from "./Tile.js"; // adjust if your file is named differently
|
|
13
13
|
// export default class TileBuffer {
|
|
14
14
|
export class TileBuffer {
|
|
15
15
|
// Equatorial
|
|
@@ -43,7 +43,7 @@ export class TileBuffer {
|
|
|
43
43
|
/** Register an equatorial HiPS into the buffer. */
|
|
44
44
|
addHiPS(hips) {
|
|
45
45
|
if (this._activeHiPS.has(hips)) {
|
|
46
|
-
console.error(
|
|
46
|
+
console.error("HiPS already present in TileBuffer");
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
49
|
this._activeHiPS.set(hips, new Map());
|
|
@@ -51,7 +51,7 @@ export class TileBuffer {
|
|
|
51
51
|
/** Register a galactic HiPS into the buffer. */
|
|
52
52
|
addGalHiPS(hips) {
|
|
53
53
|
if (this._galActiveHiPS.has(hips)) {
|
|
54
|
-
console.error(
|
|
54
|
+
console.error("HiPS already present in TileBuffer");
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
57
|
this._galActiveHiPS.set(hips, new Map());
|
|
@@ -62,6 +62,9 @@ export class TileBuffer {
|
|
|
62
62
|
if (order > hips.maxOrder) {
|
|
63
63
|
continue;
|
|
64
64
|
}
|
|
65
|
+
if (!hips.intersectsCoverage(order, tileno)) {
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
65
68
|
this.getTile(tileno, order, hips);
|
|
66
69
|
}
|
|
67
70
|
}
|
|
@@ -71,12 +74,15 @@ export class TileBuffer {
|
|
|
71
74
|
if (order > hips.maxOrder) {
|
|
72
75
|
continue;
|
|
73
76
|
}
|
|
77
|
+
if (!hips.intersectsCoverage(order, tileno)) {
|
|
78
|
+
continue;
|
|
79
|
+
}
|
|
74
80
|
this.getGalTile(tileno, order, hips);
|
|
75
81
|
}
|
|
76
82
|
}
|
|
77
83
|
/** Fetch (or create) an equatorial tile, reviving from cache if present. */
|
|
78
84
|
getTile(tileno, order, hips) {
|
|
79
|
-
const tileKey = this.key(order, tileno, hips
|
|
85
|
+
const tileKey = this.key(order, tileno, hips);
|
|
80
86
|
if (!this._tiles.has(tileKey)) {
|
|
81
87
|
if (this._cachedTiles.has(tileKey)) {
|
|
82
88
|
const tile = this._cachedTiles.get(tileKey);
|
|
@@ -94,7 +100,7 @@ export class TileBuffer {
|
|
|
94
100
|
}
|
|
95
101
|
/** Fetch (or create) a galactic tile, reviving from cache if present. */
|
|
96
102
|
getGalTile(tileno, order, hips) {
|
|
97
|
-
const tileKey = this.key(order, tileno, hips
|
|
103
|
+
const tileKey = this.key(order, tileno, hips);
|
|
98
104
|
if (!this._galTiles.has(tileKey)) {
|
|
99
105
|
if (this._galCachedTiles.has(tileKey)) {
|
|
100
106
|
const tile = this._galCachedTiles.get(tileKey);
|
|
@@ -112,7 +118,7 @@ export class TileBuffer {
|
|
|
112
118
|
}
|
|
113
119
|
/** Move a tile (equatorial or galactic) into cache. */
|
|
114
120
|
moveTileToCache(tileno, order, hips) {
|
|
115
|
-
const tileKey = this.key(order, tileno, hips
|
|
121
|
+
const tileKey = this.key(order, tileno, hips);
|
|
116
122
|
if (this._tiles.has(tileKey)) {
|
|
117
123
|
const tile = this._tiles.get(tileKey);
|
|
118
124
|
tile.setCacheTime0();
|
|
@@ -131,29 +137,64 @@ export class TileBuffer {
|
|
|
131
137
|
const now = Date.now();
|
|
132
138
|
for (const [tileKey, tile] of this._cachedTiles) {
|
|
133
139
|
const t0 = tile.cacheTime0;
|
|
134
|
-
if (!tile.inView &&
|
|
140
|
+
if (!tile.inView &&
|
|
141
|
+
t0 !== undefined &&
|
|
142
|
+
now - t0 > this._cacheAliveMilliSeconds) {
|
|
135
143
|
tile.destroyIntervals();
|
|
136
144
|
this._cachedTiles.delete(tileKey);
|
|
137
145
|
}
|
|
138
146
|
}
|
|
139
147
|
for (const [tileKey, tile] of this._galCachedTiles) {
|
|
140
148
|
const t0 = tile.cacheTime0;
|
|
141
|
-
if (!tile.inView &&
|
|
149
|
+
if (!tile.inView &&
|
|
150
|
+
t0 !== undefined &&
|
|
151
|
+
now - t0 > this._cacheAliveMilliSeconds) {
|
|
142
152
|
tile.destroyIntervals();
|
|
143
153
|
this._galCachedTiles.delete(tileKey);
|
|
144
154
|
}
|
|
145
155
|
}
|
|
146
156
|
}
|
|
147
157
|
/** Compose a stable key for maps. */
|
|
148
|
-
key(order, tileno,
|
|
149
|
-
return `${order}#${tileno}#${baseURL}`;
|
|
158
|
+
key(order, tileno, hips) {
|
|
159
|
+
return `${order}#${tileno}#${hips.baseURL}#${hips.format}`;
|
|
160
|
+
}
|
|
161
|
+
removeHiPS(hips) {
|
|
162
|
+
this.invalidateHiPS(hips);
|
|
163
|
+
this._activeHiPS.delete(hips);
|
|
164
|
+
this._galActiveHiPS.delete(hips);
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* Remove all active and cached tiles belonging to a specific HiPS.
|
|
168
|
+
*
|
|
169
|
+
* Tile keys contain the HiPS base URL and format. We intentionally
|
|
170
|
+
* ignore the format here so that a format change removes resources
|
|
171
|
+
* created with the previous format as well.
|
|
172
|
+
*/
|
|
173
|
+
invalidateHiPS(hips) {
|
|
174
|
+
const belongsToHiPS = (tileKey) => tileKey.includes(`#${hips.baseURL}#`);
|
|
175
|
+
const clearTiles = (tiles) => {
|
|
176
|
+
for (const [tileKey, tile] of tiles) {
|
|
177
|
+
if (!belongsToHiPS(tileKey)) {
|
|
178
|
+
continue;
|
|
179
|
+
}
|
|
180
|
+
tile.destroyIntervals();
|
|
181
|
+
tiles.delete(tileKey);
|
|
182
|
+
}
|
|
183
|
+
};
|
|
184
|
+
clearTiles(this._tiles);
|
|
185
|
+
clearTiles(this._cachedTiles);
|
|
186
|
+
clearTiles(this._galTiles);
|
|
187
|
+
clearTiles(this._galCachedTiles);
|
|
150
188
|
}
|
|
151
189
|
/** Optional: call to stop internal timers if you dispose this buffer. */
|
|
152
190
|
dispose() {
|
|
153
191
|
window.clearInterval(this._cleanerId);
|
|
154
192
|
}
|
|
155
193
|
get size() {
|
|
156
|
-
return this._tiles.size +
|
|
194
|
+
return (this._tiles.size +
|
|
195
|
+
this._cachedTiles.size +
|
|
196
|
+
this._galTiles.size +
|
|
197
|
+
this._galCachedTiles.size);
|
|
157
198
|
}
|
|
158
199
|
get activeTileCount() {
|
|
159
200
|
return this._tiles.size + this._galTiles.size;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileBuffer.js","sourceRoot":"","sources":["../../../src/model/hips/TileBuffer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,gBAAgB;AAChB,OAAO,IAAI,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"TileBuffer.js","sourceRoot":"","sources":["../../../src/model/hips/TileBuffer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,gBAAgB;AAChB,OAAO,IAAI,MAAM,WAAW,CAAC,CAAC,2CAA2C;AAKzE,oCAAoC;AACpC,MAAM,OAAO,UAAU;IACrB,aAAa;IACL,MAAM,CAAoB;IAC1B,YAAY,CAAoB;IAChC,WAAW,CAA+B;IAElD,WAAW;IACH,SAAS,CAAoB;IAC7B,eAAe,CAAoB;IACnC,cAAc,CAA+B;IAE7C,uBAAuB,CAAS;IAChC,UAAU,CAAS;IAEnB,MAAM,CAAyB;IAC/B,mBAAmB,CAAsB;IACzC,kBAAkB,CAAC;IAE3B,YACE,oBAAoB,GAAG,CAAC,EACxB,KAA6B,EAC7B,iBAAoC,EACpC,kBAAuC;QAEvC,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;QAC5C,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAC9B,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAE7B,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;QAEhC,IAAI,CAAC,uBAAuB,GAAG,oBAAoB,GAAG,EAAE,GAAG,IAAI,CAAC;QAEhE,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE;YACxC,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC,EAAE,MAAM,CAAC,CAAC;IACb,CAAC;IAED,mDAAmD;IACnD,OAAO,CAAC,IAAU;QAChB,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,gDAAgD;IAChD,UAAU,CAAC,IAAU;QACnB,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,6DAA6D;IAC7D,OAAO,CAAC,KAAa,EAAE,MAAc;QACnC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC;YAC3C,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC1B,SAAS;YACX,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,2DAA2D;IAC3D,UAAU,CAAC,KAAa,EAAE,MAAc;QACtC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC;YAC9C,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC1B,SAAS;YACX,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YAED,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,4EAA4E;IAC5E,OAAO,CAAC,MAAc,EAAE,KAAa,EAAE,IAAU;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;gBAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC/B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAClC,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,0HAA0H;gBAC1H,MAAM,IAAI,GAAG,IAAI,IAAI,CACnB,MAAM,EACN,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,mBAAmB,CACzB,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;IACnC,CAAC;IAED,yEAAyE;IACzE,UAAU,CAAC,MAAc,EAAE,KAAa,EAAE,IAAU;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACtC,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;gBAChD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAClC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACrC,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,0HAA0H;gBAC1H,MAAM,IAAI,GAAG,IAAI,IAAI,CACnB,MAAM,EACN,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,mBAAmB,CACzB,CAAC;gBACF,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;IACtC,CAAC;IAED,uDAAuD;IACvD,eAAe,CAAC,MAAc,EAAE,KAAa,EAAE,IAAU;QACvD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;YACvC,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;YAC1C,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACxC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,6CAA6C;IACrC,YAAY;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAChD,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC3B,IACE,CAAC,IAAI,CAAC,MAAM;gBACZ,EAAE,KAAK,SAAS;gBAChB,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,uBAAuB,EACvC,CAAC;gBACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACnD,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAC3B,IACE,CAAC,IAAI,CAAC,MAAM;gBACZ,EAAE,KAAK,SAAS;gBAChB,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,uBAAuB,EACvC,CAAC;gBACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;IACH,CAAC;IAED,qCAAqC;IAC7B,GAAG,CAAC,KAAa,EAAE,MAAc,EAAE,IAAU;QACnD,OAAO,GAAG,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7D,CAAC;IAED,UAAU,CAAC,IAAU;QACnB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAE1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CAAC,IAAU;QACvB,MAAM,aAAa,GAAG,CAAC,OAAe,EAAW,EAAE,CACjD,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QAExC,MAAM,UAAU,GAAG,CAAC,KAAwB,EAAQ,EAAE;YACpD,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,KAAK,EAAE,CAAC;gBACpC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5B,SAAS;gBACX,CAAC;gBAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;QACH,CAAC,CAAC;QAEF,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9B,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3B,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IAED,yEAAyE;IACzE,OAAO;QACL,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,CACL,IAAI,CAAC,MAAM,CAAC,IAAI;YAChB,IAAI,CAAC,YAAY,CAAC,IAAI;YACtB,IAAI,CAAC,SAAS,CAAC,IAAI;YACnB,IAAI,CAAC,eAAe,CAAC,IAAI,CAC1B,CAAC;IACJ,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;IAChD,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;IAC5D,CAAC;IAED,IAAI,cAAc;QAChB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,aAAa,EAAE;gBAAE,KAAK,EAAE,CAAC;QACpC,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,aAAa,EAAE;gBAAE,KAAK,EAAE,CAAC;QACpC,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,aAAa,EAAE;gBAAE,KAAK,EAAE,CAAC;QACpC,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,aAAa,EAAE;gBAAE,KAAK,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,gBAAgB;QAClB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,SAAS,EAAE;gBAAE,KAAK,EAAE,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,IAAI,IAAI,CAAC,SAAS,EAAE;gBAAE,KAAK,EAAE,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,SAAS,EAAE;gBAAE,KAAK,EAAE,CAAC;QAChC,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,SAAS,EAAE;gBAAE,KAAK,EAAE,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,+DAA+D;AAC/D,gDAAgD"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { TileBuffer } from
|
|
2
|
-
import { ReadonlyMat4 } from
|
|
3
|
-
import { HealpixGrid } from
|
|
4
|
-
import { HiPSShaderProgram } from
|
|
5
|
-
import Camera from
|
|
1
|
+
import { TileBuffer } from "./TileBuffer.js";
|
|
2
|
+
import { ReadonlyMat4 } from "gl-matrix";
|
|
3
|
+
import { HealpixGrid } from "../grid/HealpixGrid.js";
|
|
4
|
+
import { HiPSShaderProgram } from "../../shader/HiPSShaderProgram.js";
|
|
5
|
+
import Camera from "../../Camera.js";
|
|
6
6
|
interface VisibleTiles {
|
|
7
7
|
pixels: number[];
|
|
8
8
|
order: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VisibleTilesManager.d.ts","sourceRoot":"","sources":["../../../src/model/hips/VisibleTilesManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"VisibleTilesManager.d.ts","sourceRoot":"","sources":["../../../src/model/hips/VisibleTilesManager.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAc,YAAY,EAAE,MAAM,WAAW,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAGrC,UAAU,YAAY;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,oBAAoB,CAAe;IAC3C,OAAO,CAAC,aAAa,CAAwB;IAE7C,OAAO,CAAC,WAAW,CAAU;IAE7B,OAAO,CAAC,uBAAuB,CAAe;IAC9C,OAAO,CAAC,gBAAgB,CAAwB;IAChD,OAAO,CAAC,uBAAuB,CAAO;IACtC,OAAO,CAAC,eAAe,CAAO;IAC9B,OAAO,CAAC,YAAY,CAAmC;IACvD,OAAO,CAAC,WAAW,CAAa;IAChC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,MAAM,CAAyB;gBAGrC,KAAK,EAAE,sBAAsB,EAC7B,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,EAAE,WAAW;IAwC1B,IAAI,WAAW,gBAEd;IAED,IAAI,UAAU,eAEb;IAED,IAAI,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI;IAKjC,eAAe,IAAI,MAAM;IAIzB,oBAAoB,CAClB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,sBAAsB,EAC7B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,GACpB,IAAI;IA2GP,IAAI,mBAAmB,IAAI,YAAY,CAEtC;IAED,IAAI,YAAY,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAExC;IAED,IAAI,sBAAsB,IAAI,YAAY,CAEzC;IAED,IAAI,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAE3C;IAED,IAAI,YAAY,IAAI,MAAM,CAEzB;CACF"}
|
|
@@ -8,15 +8,12 @@
|
|
|
8
8
|
*
|
|
9
9
|
* See LICENSE.md, LICENSE-AGPL.md, and LICENSE-COMMERCIAL.md for details.
|
|
10
10
|
*/
|
|
11
|
-
import global from
|
|
12
|
-
import { Pointing, Vec3 } from
|
|
13
|
-
import RayPickingUtils from
|
|
14
|
-
|
|
15
|
-
import {
|
|
16
|
-
import {
|
|
17
|
-
// import healpixGridSingleton from '../grid/HealpixGridSingleton.js';
|
|
18
|
-
// import {HealpixGridSingleton} from '../grid/HealpixGridSingleton.js';
|
|
19
|
-
import { bootSetup } from '../../Config.js';
|
|
11
|
+
import global from "../../Global.js";
|
|
12
|
+
import { Pointing, Vec3 } from "astrospatial-core/healpix";
|
|
13
|
+
import RayPickingUtils from "../../utils/RayPickingUtils.js";
|
|
14
|
+
import { TileBuffer } from "./TileBuffer.js";
|
|
15
|
+
import { vec4, mat4 } from "gl-matrix";
|
|
16
|
+
import { bootSetup } from "../../Config.js";
|
|
20
17
|
export class VisibleTilesManager {
|
|
21
18
|
_visibleTilesByOrder;
|
|
22
19
|
_ancestorsMap;
|
|
@@ -55,18 +52,13 @@ export class VisibleTilesManager {
|
|
|
55
52
|
init(insideSphere) {
|
|
56
53
|
this.initialised = true;
|
|
57
54
|
this.insideSphere = insideSphere;
|
|
58
|
-
// this.computeVisiblePixels();
|
|
59
|
-
// setInterval(() => this.computeVisiblePixels(), 500);
|
|
60
55
|
}
|
|
61
56
|
getVisibleOrder() {
|
|
62
|
-
// return healpixGridSingleton.visibleorder;
|
|
63
57
|
return this._healpixGrid.visibleorder;
|
|
64
58
|
}
|
|
65
|
-
// computeVisiblePixels(): void {
|
|
66
59
|
computeVisiblePixels(order, webgl, camera, pMatrix) {
|
|
67
60
|
if (!this.initialised)
|
|
68
61
|
return;
|
|
69
|
-
// let order = healpixGridSingleton.visibleorder;
|
|
70
62
|
if (global.insideSphere && order < 3) {
|
|
71
63
|
order = 3;
|
|
72
64
|
}
|
|
@@ -86,8 +78,6 @@ export class VisibleTilesManager {
|
|
|
86
78
|
}
|
|
87
79
|
else {
|
|
88
80
|
const geomhealpix = global.getHealpix(order);
|
|
89
|
-
// const maxX = (global.gl as GL).canvas.width;
|
|
90
|
-
// const maxY = (global.gl as GL).canvas.height;
|
|
91
81
|
const maxX = webgl.canvas.width;
|
|
92
82
|
const maxY = webgl.canvas.height;
|
|
93
83
|
// Sample a grid of screen points, project to the sphere, then to galactic
|
|
@@ -107,13 +97,11 @@ export class VisibleTilesManager {
|
|
|
107
97
|
if (!pixels.includes(currPixNo)) {
|
|
108
98
|
pixels.push(currPixNo);
|
|
109
99
|
this._ancestorsMap.get(order).push(currPixNo);
|
|
110
|
-
// newTileBuffer.addTile(order, currPixNo);
|
|
111
100
|
this._tileBuffer.addTile(order, currPixNo);
|
|
112
101
|
}
|
|
113
102
|
if (!galTiles.includes(galTileNo)) {
|
|
114
103
|
galTiles.push(galTileNo);
|
|
115
104
|
this._galAncestorsMap.get(order).push(galTileNo);
|
|
116
|
-
// newTileBuffer.addGalTile(order, galTileNo);
|
|
117
105
|
this._tileBuffer.addGalTile(order, galTileNo);
|
|
118
106
|
}
|
|
119
107
|
}
|
|
@@ -131,7 +119,6 @@ export class VisibleTilesManager {
|
|
|
131
119
|
const parent = pixels[p] >> (2 * o);
|
|
132
120
|
if (!list.includes(parent)) {
|
|
133
121
|
list.push(parent);
|
|
134
|
-
// newTileBuffer.addTile(tgtOrder, parent);
|
|
135
122
|
this._tileBuffer.addTile(tgtOrder, parent);
|
|
136
123
|
}
|
|
137
124
|
}
|
|
@@ -144,7 +131,6 @@ export class VisibleTilesManager {
|
|
|
144
131
|
const parent = galTiles[p] >> (2 * o);
|
|
145
132
|
if (!list.includes(parent)) {
|
|
146
133
|
list.push(parent);
|
|
147
|
-
// newTileBuffer.addGalTile(tgtOrder, parent);
|
|
148
134
|
this._tileBuffer.addGalTile(tgtOrder, parent);
|
|
149
135
|
}
|
|
150
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VisibleTilesManager.js","sourceRoot":"","sources":["../../../src/model/hips/VisibleTilesManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAW,MAAM,2BAA2B,CAAC;AACpE,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAC7D,
|
|
1
|
+
{"version":3,"file":"VisibleTilesManager.js","sourceRoot":"","sources":["../../../src/model/hips/VisibleTilesManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,9 @@ type UniformNames = {
|
|
|
8
8
|
colormap_red: string;
|
|
9
9
|
colormap_green: string;
|
|
10
10
|
colormap_blue: string;
|
|
11
|
+
textureMode: string;
|
|
12
|
+
dataMin: string;
|
|
13
|
+
dataMax: string;
|
|
11
14
|
};
|
|
12
15
|
type AttributeNames = {
|
|
13
16
|
vertex_pos: string;
|
|
@@ -17,8 +20,12 @@ type Locations = {
|
|
|
17
20
|
pMatrix: WebGLUniformLocation | null;
|
|
18
21
|
mMatrix: WebGLUniformLocation | null;
|
|
19
22
|
vMatrix: WebGLUniformLocation | null;
|
|
20
|
-
|
|
21
|
-
textureAlpha: WebGLUniformLocation | null
|
|
23
|
+
samplers: Array<WebGLUniformLocation | null>;
|
|
24
|
+
textureAlpha: Array<WebGLUniformLocation | null>;
|
|
25
|
+
textureMode: Array<WebGLUniformLocation | null>;
|
|
26
|
+
dataMin: Array<WebGLUniformLocation | null>;
|
|
27
|
+
dataMax: Array<WebGLUniformLocation | null>;
|
|
28
|
+
layerOpacity: WebGLUniformLocation | null;
|
|
22
29
|
clorMapIdx: WebGLUniformLocation | null;
|
|
23
30
|
vertexPositionAttribute: number;
|
|
24
31
|
textureCoordAttribute: number;
|
|
@@ -37,6 +44,7 @@ export declare class HiPSShaderProgram {
|
|
|
37
44
|
private _webgl;
|
|
38
45
|
constructor(webgl: WebGL2RenderingContext);
|
|
39
46
|
get shaderProgram(): WebGLProgram;
|
|
47
|
+
setLayerOpacity(opacity: number): void;
|
|
40
48
|
setRuntimeColorMap(colorMap: {
|
|
41
49
|
r: Float32Array;
|
|
42
50
|
g: Float32Array;
|
|
@@ -48,6 +56,7 @@ export declare class HiPSShaderProgram {
|
|
|
48
56
|
setNativeShader(): void;
|
|
49
57
|
setColorMapShader(): void;
|
|
50
58
|
private changeFSShader;
|
|
59
|
+
setTextureDataMode(samplerIndex: number, fits: boolean, min?: number, max?: number): void;
|
|
51
60
|
enableShaders(pMatrix: Float32Array, vMatrix: Float32Array, mMatrix: Float32Array, colorMapIdx: number): void;
|
|
52
61
|
}
|
|
53
62
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HiPSShaderProgram.d.ts","sourceRoot":"","sources":["../../src/shader/HiPSShaderProgram.ts"],"names":[],"mappings":"AAiBA,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"HiPSShaderProgram.d.ts","sourceRoot":"","sources":["../../src/shader/HiPSShaderProgram.ts"],"names":[],"mappings":"AAiBA,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IAEtB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAC;IACrC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAErC,QAAQ,EAAE,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAC7C,YAAY,EAAE,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IACjD,WAAW,EAAE,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAChD,OAAO,EAAE,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAC5C,OAAO,EAAE,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAAC;IAE5C,YAAY,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAE1C,UAAU,EAAE,oBAAoB,GAAG,IAAI,CAAC;IAExC,uBAAuB,EAAE,MAAM,CAAC;IAChC,qBAAqB,EAAE,MAAM,CAAC;CAC/B,CAAC;AAGF,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,gBAAgB,CAEV;IAEd,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,eAAe,CAAe;IAEtC,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,yBAAyB,CAO/B;IAEF,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,OAAO,CAAC,MAAM,CAAyB;gBAE3B,KAAK,EAAE,sBAAsB;IA2CzC,IAAI,aAAa,IAAI,YAAY,CAWhC;IAED,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAatC,kBAAkB,CAChB,QAAQ,EAAE;QAAE,CAAC,EAAE,YAAY,CAAC;QAAC,CAAC,EAAE,YAAY,CAAC;QAAC,CAAC,EAAE,YAAY,CAAA;KAAE,GAAG,SAAS,GAC1E,IAAI;IAIP,OAAO,CAAC,WAAW;IAqCnB,aAAa,IAAI,IAAI;IAKrB,kBAAkB,IAAI,IAAI;IAQ1B,eAAe,IAAI,IAAI;IAQvB,iBAAiB,IAAI,IAAI;IAgEzB,OAAO,CAAC,cAAc;IAqBtB,kBAAkB,CAChB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,CAAC,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,MAAM,GACX,IAAI;IAuCP,aAAa,CACX,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,MAAM,GAClB,IAAI;CA2JR"}
|