astro-viewer 3.11.0 → 3.13.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/astroviewer.cjs +837 -173
- package/dist/astroviewer.cjs.map +1 -1
- package/dist/astroviewer.js +837 -173
- 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 +57 -2
- package/lib-esm/AstroSphere.d.ts.map +1 -1
- package/lib-esm/AstroSphere.js +370 -83
- package/lib-esm/AstroSphere.js.map +1 -1
- package/lib-esm/AstroViewer.d.ts +21 -1
- package/lib-esm/AstroViewer.d.ts.map +1 -1
- package/lib-esm/AstroViewer.js +56 -7
- package/lib-esm/AstroViewer.js.map +1 -1
- package/lib-esm/Camera.d.ts +22 -0
- package/lib-esm/Camera.d.ts.map +1 -1
- package/lib-esm/Camera.js +71 -0
- package/lib-esm/Camera.js.map +1 -1
- package/lib-esm/index.d.ts +1 -0
- package/lib-esm/index.d.ts.map +1 -1
- package/lib-esm/index.js +1 -0
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/model/Source.js +1 -1
- package/lib-esm/model/Source.js.map +1 -1
- package/lib-esm/model/catalogues/CatalogueGL.d.ts +13 -4
- package/lib-esm/model/catalogues/CatalogueGL.d.ts.map +1 -1
- package/lib-esm/model/catalogues/CatalogueGL.js +109 -59
- package/lib-esm/model/catalogues/CatalogueGL.js.map +1 -1
- package/lib-esm/model/earth/XYZMap.d.ts +4 -1
- package/lib-esm/model/earth/XYZMap.d.ts.map +1 -1
- package/lib-esm/model/earth/XYZMap.js +35 -2
- package/lib-esm/model/earth/XYZMap.js.map +1 -1
- package/lib-esm/model/footprints/FootprintSetGL.d.ts +1 -0
- package/lib-esm/model/footprints/FootprintSetGL.d.ts.map +1 -1
- package/lib-esm/model/footprints/FootprintSetGL.js +13 -3
- package/lib-esm/model/footprints/FootprintSetGL.js.map +1 -1
- package/lib-esm/model/grid/EquatorialGrid.d.ts +1 -0
- package/lib-esm/model/grid/EquatorialGrid.d.ts.map +1 -1
- package/lib-esm/model/grid/EquatorialGrid.js +3 -0
- package/lib-esm/model/grid/EquatorialGrid.js.map +1 -1
- package/lib-esm/model/grid/HealpixGrid.d.ts +1 -0
- package/lib-esm/model/grid/HealpixGrid.d.ts.map +1 -1
- package/lib-esm/model/grid/HealpixGrid.js +3 -0
- package/lib-esm/model/grid/HealpixGrid.js.map +1 -1
- package/lib-esm/model/grid/LonLatGrid.d.ts +1 -0
- package/lib-esm/model/grid/LonLatGrid.d.ts.map +1 -1
- package/lib-esm/model/grid/LonLatGrid.js +3 -0
- package/lib-esm/model/grid/LonLatGrid.js.map +1 -1
- package/lib-esm/model/hips/AllSky.d.ts.map +1 -1
- package/lib-esm/model/hips/AllSky.js +4 -2
- package/lib-esm/model/hips/AllSky.js.map +1 -1
- package/lib-esm/model/hips/AncestorTile.d.ts.map +1 -1
- package/lib-esm/model/hips/AncestorTile.js +4 -2
- package/lib-esm/model/hips/AncestorTile.js.map +1 -1
- package/lib-esm/model/hips/Tile.d.ts.map +1 -1
- package/lib-esm/model/hips/Tile.js +4 -2
- package/lib-esm/model/hips/Tile.js.map +1 -1
- package/lib-esm/model/hips/TileBuffer.d.ts +11 -0
- package/lib-esm/model/hips/TileBuffer.d.ts.map +1 -1
- package/lib-esm/model/hips/TileBuffer.js +47 -0
- package/lib-esm/model/hips/TileBuffer.js.map +1 -1
- package/lib-esm/model/hips/VisibleTilesManager.d.ts.map +1 -1
- package/lib-esm/model/hips/VisibleTilesManager.js +8 -2
- package/lib-esm/model/hips/VisibleTilesManager.js.map +1 -1
- package/lib-esm/model/meships/MeshHiPS.d.ts +4 -0
- package/lib-esm/model/meships/MeshHiPS.d.ts.map +1 -1
- package/lib-esm/model/meships/MeshHiPS.js +11 -1
- package/lib-esm/model/meships/MeshHiPS.js.map +1 -1
- package/lib-esm/model/terra/TerraPointSetGL.d.ts +1 -0
- package/lib-esm/model/terra/TerraPointSetGL.d.ts.map +1 -1
- package/lib-esm/model/terra/TerraPointSetGL.js +39 -1
- package/lib-esm/model/terra/TerraPointSetGL.js.map +1 -1
- package/lib-esm/shader/CatalogueShaderProgram.d.ts +4 -0
- package/lib-esm/shader/CatalogueShaderProgram.d.ts.map +1 -1
- package/lib-esm/shader/CatalogueShaderProgram.js +6 -0
- package/lib-esm/shader/CatalogueShaderProgram.js.map +1 -1
- package/lib-esm/shader/ShaderManager.d.ts.map +1 -1
- package/lib-esm/shader/ShaderManager.js +7 -4
- package/lib-esm/shader/ShaderManager.js.map +1 -1
- package/lib-esm/shader/XYZShaderProgram.d.ts +3 -0
- package/lib-esm/shader/XYZShaderProgram.d.ts.map +1 -1
- package/lib-esm/shader/XYZShaderProgram.js +11 -3
- package/lib-esm/shader/XYZShaderProgram.js.map +1 -1
- package/lib-esm/utils/Utils.d.ts +12 -0
- package/lib-esm/utils/Utils.d.ts.map +1 -1
- package/lib-esm/utils/Utils.js +26 -0
- package/lib-esm/utils/Utils.js.map +1 -1
- package/package.json +2 -2
|
@@ -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,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;
|
|
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;IACnB,uBAAuB,GAAG,IAAI,CAAC;IAEvC,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,wDAAwD;IACxD,yBAAyB,CAAC,OAAgB;QACxC,IAAI,CAAC,uBAAuB,GAAG,OAAO,CAAC;IACzC,CAAC;IAED,6DAA6D;IAC7D,OAAO,CAAC,KAAa,EAAE,MAAc;QACnC,IAAI,CAAC,IAAI,CAAC,uBAAuB;YAAE,OAAO;QAE1C,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,IAAI,CAAC,IAAI,CAAC,uBAAuB;YAAE,OAAO;QAE1C,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;;;;OAIG;IACH,iBAAiB,CACf,MAAc,EACd,KAAa,EACb,IAAU;QAEV,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC5C,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;QAElC,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,UAAU;YAAE,OAAO,SAAS,CAAC;QAElC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACrC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClC,UAAU,CAAC,eAAe,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,mDAAmD;IACnD,oBAAoB,CAClB,MAAc,EACd,KAAa,EACb,IAAU;QAEV,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC9C,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC/C,IAAI,UAAU;YAAE,OAAO,UAAU,CAAC;QAElC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU;YAAE,OAAO,SAAS,CAAC;QAElC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QACxC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrC,UAAU,CAAC,eAAe,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC;IACpB,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 +1 @@
|
|
|
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,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,mBAAmB,EAAE,YAAY,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC9C;AAED,qBAAa,mBAAoB,YAAW,sBAAsB;IAChE,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;
|
|
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,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,mBAAmB,EAAE,YAAY,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC9C;AAED,qBAAa,mBAAoB,YAAW,sBAAsB;IAChE,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;IAiHP,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"}
|
|
@@ -62,6 +62,10 @@ export class VisibleTilesManager {
|
|
|
62
62
|
if (global.insideSphere && order < 3) {
|
|
63
63
|
order = 3;
|
|
64
64
|
}
|
|
65
|
+
// Visibility state is frame-local. Do not retain ancestors from previous
|
|
66
|
+
// camera positions, otherwise a flyTo accumulates the whole travelled path.
|
|
67
|
+
this._ancestorsMap.clear();
|
|
68
|
+
this._galAncestorsMap.clear();
|
|
65
69
|
this._ancestorsMap.set(order, []);
|
|
66
70
|
this._galAncestorsMap.set(order, []);
|
|
67
71
|
let pixels = [];
|
|
@@ -78,8 +82,10 @@ export class VisibleTilesManager {
|
|
|
78
82
|
}
|
|
79
83
|
else {
|
|
80
84
|
const geomhealpix = global.getHealpix(order);
|
|
81
|
-
const
|
|
82
|
-
const
|
|
85
|
+
const canvas = webgl.canvas;
|
|
86
|
+
const canvasRect = canvas.getBoundingClientRect();
|
|
87
|
+
const maxX = canvasRect.width;
|
|
88
|
+
const maxY = canvasRect.height;
|
|
83
89
|
// Sample a grid of screen points, project to the sphere, then to galactic
|
|
84
90
|
for (let i = 0; i <= maxX; i += maxX / 30) {
|
|
85
91
|
for (let j = 0; j <= maxY; j += maxY / 30) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VisibleTilesManager.js","sourceRoot":"","sources":["../../../src/model/hips/VisibleTilesManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"VisibleTilesManager.js","sourceRoot":"","sources":["../../../src/model/hips/VisibleTilesManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,8 @@ export declare class MeshHiPS extends AbstractSkyEntity {
|
|
|
10
10
|
private _currentOrder;
|
|
11
11
|
private _visibleTiles;
|
|
12
12
|
private _coverageTiles;
|
|
13
|
+
private _color;
|
|
14
|
+
private _wireframe;
|
|
13
15
|
constructor(radius: number, position: [number, number, number], xrad: number, yrad: number, _descriptor: MeshHiPSDescriptor, webgl: WebGL2RenderingContext, _healpixGrid: HealpixGrid);
|
|
14
16
|
get currentOrder(): number;
|
|
15
17
|
get maxOrder(): number;
|
|
@@ -18,6 +20,8 @@ export declare class MeshHiPS extends AbstractSkyEntity {
|
|
|
18
20
|
get propertiesRawText(): string;
|
|
19
21
|
get properties(): ReadonlyMap<string, string>;
|
|
20
22
|
getProperty(key: string): string | undefined;
|
|
23
|
+
setColor(color: [number, number, number, number]): void;
|
|
24
|
+
setWireframe(wireframe: boolean): void;
|
|
21
25
|
refreshOrder(fovDeg: number | undefined): number;
|
|
22
26
|
draw(input: SkyEntityDrawInput): void;
|
|
23
27
|
getDebugStats(): MeshHiPSDebugStats;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeshHiPS.d.ts","sourceRoot":"","sources":["../../../src/model/meships/MeshHiPS.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,KAAK,EAAE,kBAAkB,EAAqB,MAAM,oBAAoB,CAAC;AAGhF,qBAAa,QAAS,SAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"MeshHiPS.d.ts","sourceRoot":"","sources":["../../../src/model/meships/MeshHiPS.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,KAAK,EAAE,kBAAkB,EAAqB,MAAM,oBAAoB,CAAC;AAGhF,qBAAa,QAAS,SAAQ,iBAAiB;IAc3C,OAAO,CAAC,WAAW;IAEnB,OAAO,CAAC,YAAY;IAftB,OAAO,CAAC,cAAc,CAAwB;IAC9C,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,cAAc,CAA2B;IACjD,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,UAAU,CAAU;gBAG1B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACJ,WAAW,EAAE,kBAAkB,EACvC,KAAK,EAAE,sBAAsB,EACrB,YAAY,EAAE,WAAW;IAWnC,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAE5C;IAED,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI5C,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIvD,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IAmBhD,IAAI,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IA4CrC,aAAa,IAAI,kBAAkB;IAgBnC,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,oBAAoB;IAsD5B,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,WAAW;IAgBnB,OAAO,CAAC,WAAW;IAkBnB,OAAO,CAAC,OAAO;CAGhB"}
|
|
@@ -15,6 +15,8 @@ export class MeshHiPS extends AbstractSkyEntity {
|
|
|
15
15
|
_currentOrder;
|
|
16
16
|
_visibleTiles = [];
|
|
17
17
|
_coverageTiles = [];
|
|
18
|
+
_color;
|
|
19
|
+
_wireframe;
|
|
18
20
|
constructor(radius, position, xrad, yrad, _descriptor, webgl, _healpixGrid) {
|
|
19
21
|
super(radius, position, xrad, yrad, _descriptor.name, webgl, false);
|
|
20
22
|
this._descriptor = _descriptor;
|
|
@@ -23,6 +25,8 @@ export class MeshHiPS extends AbstractSkyEntity {
|
|
|
23
25
|
this._shaderProgram = new MeshHiPSShaderProgram(webgl);
|
|
24
26
|
this._shaderProgram.enableProgram();
|
|
25
27
|
this._currentOrder = _descriptor.selectedOrder;
|
|
28
|
+
this._color = [..._descriptor.color];
|
|
29
|
+
this._wireframe = _descriptor.wireframe;
|
|
26
30
|
}
|
|
27
31
|
get currentOrder() {
|
|
28
32
|
return this._currentOrder;
|
|
@@ -45,6 +49,12 @@ export class MeshHiPS extends AbstractSkyEntity {
|
|
|
45
49
|
getProperty(key) {
|
|
46
50
|
return this._descriptor.getProperty(key);
|
|
47
51
|
}
|
|
52
|
+
setColor(color) {
|
|
53
|
+
this._color = [...color];
|
|
54
|
+
}
|
|
55
|
+
setWireframe(wireframe) {
|
|
56
|
+
this._wireframe = wireframe;
|
|
57
|
+
}
|
|
48
58
|
refreshOrder(fovDeg) {
|
|
49
59
|
if (this._descriptor.fixedOrder) {
|
|
50
60
|
this._currentOrder = this._descriptor.selectedOrder;
|
|
@@ -84,7 +94,7 @@ export class MeshHiPS extends AbstractSkyEntity {
|
|
|
84
94
|
for (const coord of byOrder.get(order) ?? []) {
|
|
85
95
|
this._tiles
|
|
86
96
|
.get(this.tileKey(coord))
|
|
87
|
-
?.draw(pMatrix, vMatrix, mMatrix, this.
|
|
97
|
+
?.draw(pMatrix, vMatrix, mMatrix, this._color, this._wireframe);
|
|
88
98
|
}
|
|
89
99
|
}
|
|
90
100
|
if (wasCullFace)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeshHiPS.js","sourceRoot":"","sources":["../../../src/model/meships/MeshHiPS.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAsB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAE9E,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,OAAO,QAAS,SAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"MeshHiPS.js","sourceRoot":"","sources":["../../../src/model/meships/MeshHiPS.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import MouseHelper from '../../utils/MouseHelper.js';
|
|
|
4
4
|
export declare class TerraPointSetGL extends CatalogueGL {
|
|
5
5
|
_kind: string;
|
|
6
6
|
addSources(inData: any[][], columnsMeta: MetadataColumn[]): void;
|
|
7
|
+
protected findNearestSourceIndex(inMouseHelper: MouseHelper, inMatrix: Float32Array, viewMatrix: Float32Array, projectionMatrix: Float32Array): number | null;
|
|
7
8
|
draw(inMatrix: Float32Array, inMouseHelper: MouseHelper, viewMatrix: Float32Array, projectionMatrix: Float32Array): void;
|
|
8
9
|
}
|
|
9
10
|
//# sourceMappingURL=TerraPointSetGL.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraPointSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"TerraPointSetGL.d.ts","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAIrD,OAAO,WAAW,MAAM,4BAA4B,CAAA;AAgBpD,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,KAAK,EAAE,MAAM,CAAoB;IAEjC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,WAAW,EAAE,cAAc,EAAE;IAsCzD,SAAS,CAAC,sBAAsB,CAC9B,aAAa,EAAE,WAAW,EAC1B,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,YAAY,EACxB,gBAAgB,EAAE,YAAY,GAC7B,MAAM,GAAG,IAAI;IAkDhB,IAAI,CACF,QAAQ,EAAE,YAAY,EACtB,aAAa,EAAE,WAAW,EAC1B,UAAU,EAAE,YAAY,EACxB,gBAAgB,EAAE,YAAY;CAIjC"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* See LICENSE.md, LICENSE-AGPL.md, and LICENSE-COMMERCIAL.md for details.
|
|
10
10
|
*/
|
|
11
11
|
import { CatalogueGL } from '../catalogues/CatalogueGL.js';
|
|
12
|
+
import { mat4 } from 'gl-matrix';
|
|
12
13
|
import { MetadataManager } from '../MetadataManager.js';
|
|
13
14
|
import { Point } from '../Point.js';
|
|
14
15
|
import { CoordsType } from '../../utils/CoordsType.js';
|
|
@@ -43,8 +44,45 @@ export class TerraPointSetGL extends CatalogueGL {
|
|
|
43
44
|
this._ready = true;
|
|
44
45
|
this._bufferInitialised = false;
|
|
45
46
|
}
|
|
47
|
+
findNearestSourceIndex(inMouseHelper, inMatrix, viewMatrix, projectionMatrix) {
|
|
48
|
+
if (inMouseHelper.xyz == null)
|
|
49
|
+
return null;
|
|
50
|
+
const canvas = this.getCanvas();
|
|
51
|
+
const width = canvas.clientWidth;
|
|
52
|
+
const height = canvas.clientHeight;
|
|
53
|
+
if (!width || !height)
|
|
54
|
+
return null;
|
|
55
|
+
const modelView = mat4.create();
|
|
56
|
+
const mvp = mat4.create();
|
|
57
|
+
mat4.multiply(modelView, viewMatrix, inMatrix);
|
|
58
|
+
mat4.multiply(mvp, projectionMatrix, modelView);
|
|
59
|
+
const mousePoint = new Point({
|
|
60
|
+
x: inMouseHelper.xyz[0],
|
|
61
|
+
y: inMouseHelper.xyz[1],
|
|
62
|
+
z: inMouseHelper.xyz[2],
|
|
63
|
+
}, CoordsType.CARTESIAN);
|
|
64
|
+
const mouseScreen = this.projectPointToScreen(mousePoint, mvp, width, height);
|
|
65
|
+
if (!mouseScreen)
|
|
66
|
+
return null;
|
|
67
|
+
let nearestIndex = null;
|
|
68
|
+
let nearestDistancePx = Number.POSITIVE_INFINITY;
|
|
69
|
+
for (let index = 0; index < this._sources.length; index += 1) {
|
|
70
|
+
const source = this._sources[index];
|
|
71
|
+
if (!source)
|
|
72
|
+
continue;
|
|
73
|
+
const sourceScreen = this.projectPointToScreen(source.point, mvp, width, height);
|
|
74
|
+
if (!sourceScreen)
|
|
75
|
+
continue;
|
|
76
|
+
const distancePx = Math.hypot(sourceScreen[0] - mouseScreen[0], sourceScreen[1] - mouseScreen[1]);
|
|
77
|
+
if (distancePx <= this.getHitRadiusPx(source) &&
|
|
78
|
+
distancePx < nearestDistancePx) {
|
|
79
|
+
nearestDistancePx = distancePx;
|
|
80
|
+
nearestIndex = index;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
return nearestIndex;
|
|
84
|
+
}
|
|
46
85
|
draw(inMatrix, inMouseHelper, viewMatrix, projectionMatrix) {
|
|
47
|
-
this._oldMouseCoords = inMouseHelper?.xyz ?? null;
|
|
48
86
|
super.draw(inMatrix, inMouseHelper, viewMatrix, projectionMatrix);
|
|
49
87
|
}
|
|
50
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TerraPointSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;
|
|
1
|
+
{"version":3,"file":"TerraPointSetGL.js","sourceRoot":"","sources":["../../../src/model/terra/TerraPointSetGL.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
type UniformNames = {
|
|
2
2
|
vertex_color: string;
|
|
3
|
+
hover_color: string;
|
|
4
|
+
selected_color: string;
|
|
3
5
|
m_perspective: string;
|
|
4
6
|
m_model_view: string;
|
|
5
7
|
};
|
|
@@ -13,6 +15,8 @@ type Locations = {
|
|
|
13
15
|
pMatrix: WebGLUniformLocation | null;
|
|
14
16
|
mvMatrix: WebGLUniformLocation | null;
|
|
15
17
|
color: WebGLUniformLocation | null;
|
|
18
|
+
hoverColor: WebGLUniformLocation | null;
|
|
19
|
+
selectedColor: WebGLUniformLocation | null;
|
|
16
20
|
position: number;
|
|
17
21
|
hovered: number;
|
|
18
22
|
pointSize: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CatalogueShaderProgram.d.ts","sourceRoot":"","sources":["../../src/shader/CatalogueShaderProgram.ts"],"names":[],"mappings":"AAiBA,KAAK,YAAY,GAAG;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACrC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAAA;IAClC,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAGD,qBAAa,sBAAsB;IACjC,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,eAAe,CAAc;IAErC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAA;IAClC,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAA;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAC7B,OAAO,CAAC,MAAM,CAAyB;gBAG3B,KAAK,EAAE,sBAAsB;
|
|
1
|
+
{"version":3,"file":"CatalogueShaderProgram.d.ts","sourceRoot":"","sources":["../../src/shader/CatalogueShaderProgram.ts"],"names":[],"mappings":"AAiBA,KAAK,YAAY,GAAG;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACrC,KAAK,EAAE,oBAAoB,GAAG,IAAI,CAAA;IAClC,UAAU,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACvC,aAAa,EAAE,oBAAoB,GAAG,IAAI,CAAA;IAC1C,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAGD,qBAAa,sBAAsB;IACjC,OAAO,CAAC,cAAc,CAA0B;IAChD,OAAO,CAAC,aAAa,CAAc;IACnC,OAAO,CAAC,eAAe,CAAc;IAErC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAA;IAClC,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAA;IACtC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;IAC7B,OAAO,CAAC,MAAM,CAAyB;gBAG3B,KAAK,EAAE,sBAAsB;IA8BzC,IAAI,aAAa,IAAI,YAAY,CAQhC;IAED,OAAO,CAAC,WAAW;IAmEnB,aAAa,CACX,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,YAAY,EACzB,UAAU,EAAE,YAAY,GACvB,IAAI;CAuBR"}
|
|
@@ -24,6 +24,8 @@ export class CatalogueShaderProgram {
|
|
|
24
24
|
this._webgl = webgl;
|
|
25
25
|
this.gl_uniforms = {
|
|
26
26
|
vertex_color: 'u_fragcolor',
|
|
27
|
+
hover_color: 'u_hovercolor',
|
|
28
|
+
selected_color: 'u_selectedcolor',
|
|
27
29
|
m_perspective: 'uPMatrix',
|
|
28
30
|
m_model_view: 'uMVMatrix'
|
|
29
31
|
};
|
|
@@ -37,6 +39,8 @@ export class CatalogueShaderProgram {
|
|
|
37
39
|
pMatrix: null,
|
|
38
40
|
mvMatrix: null,
|
|
39
41
|
color: null,
|
|
42
|
+
hoverColor: null,
|
|
43
|
+
selectedColor: null,
|
|
40
44
|
position: -1,
|
|
41
45
|
hovered: -1,
|
|
42
46
|
pointSize: -1,
|
|
@@ -86,6 +90,8 @@ export class CatalogueShaderProgram {
|
|
|
86
90
|
this.locations.pointSize = gl.getAttribLocation(this.shaderProgram, this.gl_attributes.point_size);
|
|
87
91
|
this.locations.brightness = gl.getAttribLocation(this.shaderProgram, this.gl_attributes.point_hue);
|
|
88
92
|
this.locations.color = gl.getUniformLocation(this.shaderProgram, this.gl_uniforms.vertex_color);
|
|
93
|
+
this.locations.hoverColor = gl.getUniformLocation(this.shaderProgram, this.gl_uniforms.hover_color);
|
|
94
|
+
this.locations.selectedColor = gl.getUniformLocation(this.shaderProgram, this.gl_uniforms.selected_color);
|
|
89
95
|
}
|
|
90
96
|
enableShaders(pMatrix, modelMatrix, viewMatrix) {
|
|
91
97
|
// const gl = global.gl as GL
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CatalogueShaderProgram.js","sourceRoot":"","sources":["../../src/shader/CatalogueShaderProgram.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,uBAAuB;AACvB,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,aAAa,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"CatalogueShaderProgram.js","sourceRoot":"","sources":["../../src/shader/CatalogueShaderProgram.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShaderManager.d.ts","sourceRoot":"","sources":["../../src/shader/ShaderManager.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,MAAM,CAAC,WAAW,IAAI,UAAU;IAuBhC,MAAM,CAAC,WAAW,IAAI,UAAU;
|
|
1
|
+
{"version":3,"file":"ShaderManager.d.ts","sourceRoot":"","sources":["../../src/shader/ShaderManager.ts"],"names":[],"mappings":"AAaA,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAEhC,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,MAAM,CAAC,WAAW,IAAI,UAAU;IAuBhC,MAAM,CAAC,WAAW,IAAI,UAAU;IAqGhC,MAAM,CAAC,WAAW,IAAI,UAAU;IAgBhC,MAAM,CAAC,WAAW,IAAI,UAAU;IAYhC,MAAM,CAAC,MAAM,IAAI,UAAU;IAiB3B,MAAM,CAAC,YAAY,IAAI,UAAU;IAmEjC,MAAM,CAAC,eAAe,IAAI,UAAU;IA2EpC,MAAM,CAAC,cAAc,IAAI,UAAU;IAsGnC,OAAO,CAAC,MAAM,CAAC,eAAe;IAuE9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;CAKhC"}
|
|
@@ -47,6 +47,8 @@ export default class ShaderManager {
|
|
|
47
47
|
in float v_brightness;
|
|
48
48
|
|
|
49
49
|
uniform vec4 u_fragcolor;
|
|
50
|
+
uniform vec4 u_hovercolor;
|
|
51
|
+
uniform vec4 u_selectedcolor;
|
|
50
52
|
|
|
51
53
|
out vec4 fragColor;
|
|
52
54
|
|
|
@@ -103,11 +105,12 @@ export default class ShaderManager {
|
|
|
103
105
|
#endif
|
|
104
106
|
|
|
105
107
|
if (v_selected == 1.0){
|
|
106
|
-
|
|
107
|
-
fragColor = vec4(1.0, 0.0, 0.0, 1.0) * (alpha);
|
|
108
|
+
fragColor = u_hovercolor * alpha;
|
|
108
109
|
} else if (v_selected == 2.0){
|
|
109
|
-
//
|
|
110
|
-
|
|
110
|
+
// Persistent selection: keep the dataset colour as an outer ring
|
|
111
|
+
// and use the hover colour for the fill. This remains visible for
|
|
112
|
+
// both light and dark user-selected base colours.
|
|
113
|
+
fragColor = (r > 0.72 ? u_fragcolor : u_hovercolor) * alpha;
|
|
111
114
|
}else{
|
|
112
115
|
if (r < 0.4) {
|
|
113
116
|
discard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShaderManager.js","sourceRoot":"","sources":["../../src/shader/ShaderManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,MAAM,CAAC,WAAW;QAChB,OAAO;;;;;;;;;;;;;;;;;;;MAmBL,CAAC;IACL,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO
|
|
1
|
+
{"version":3,"file":"ShaderManager.js","sourceRoot":"","sources":["../../src/shader/ShaderManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,MAAM,CAAC,OAAO,OAAO,aAAa;IAChC,MAAM,CAAC,WAAW;QAChB,OAAO;;;;;;;;;;;;;;;;;;;MAmBL,CAAC;IACL,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAiGL,CAAC;IACL,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO;;;;;;;;;;;;MAYL,CAAC;IACL,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO;;;;;;;;MAQL,CAAC;IACL,CAAC;IAED,MAAM,CAAC,MAAM;QACX,OAAO;;;;;;;;;;;;;MAaL,CAAC;IACL,CAAC;IAED,MAAM,CAAC,YAAY;QACjB,OAAO;;;;;;;;;;;;;;;MAeL,aAAa,CAAC,gBAAgB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAgDhC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,eAAe;QACpB,OAAO;;;;;;;;;;;;;;;MAeL,aAAa,CAAC,gBAAgB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAwDhC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,cAAc;QACnB,OAAO;;;;;;;;;;;;;;;;;;;;;;MAsBL,aAAa,CAAC,gBAAgB,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA4EhC,CAAC;IACL,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,KAAa;QAC1C,OAAO;gCACqB,KAAK;8BACP,KAAK;4BACP,KAAK;4BACL,KAAK;gCACD,KAAK;+BACN,KAAK;;uBAEb,KAAK;;;;0BAIF,KAAK;;;0BAGL,KAAK;;;;0BAIL,KAAK;0CACW,KAAK;;;;0BAIrB,KAAK;0CACW,KAAK;4BACnB,KAAK,+BAA+B,KAAK;;;0BAG3C,KAAK;uCACQ,KAAK;;;;;;4BAMhB,KAAK;qCACI,KAAK;;;wBAGlB,KAAK;;;;;;;;;;;;2BAYF,KAAK;mBACb,KAAK,cAAc,KAAK;;;;;qCAKN,KAAK;;;;;;;;;GASvC,CAAC;IACF,CAAC;IAEO,MAAM,CAAC,gBAAgB;QAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAC5C,aAAa,CAAC,eAAe,CAAC,KAAK,CAAC,CACrC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;CACF"}
|
|
@@ -4,6 +4,7 @@ type XYZLocations = {
|
|
|
4
4
|
vMatrix: WebGLUniformLocation | null;
|
|
5
5
|
sampler: WebGLUniformLocation | null;
|
|
6
6
|
colorMapIdx: WebGLUniformLocation | null;
|
|
7
|
+
opacity: WebGLUniformLocation | null;
|
|
7
8
|
vertexPositionAttribute: number;
|
|
8
9
|
textureCoordAttribute: number;
|
|
9
10
|
};
|
|
@@ -13,11 +14,13 @@ export declare class XYZShaderProgram {
|
|
|
13
14
|
private _shaderProgram?;
|
|
14
15
|
private _colorMapBlockIndex;
|
|
15
16
|
private _colorMapBuffer;
|
|
17
|
+
private _opacity;
|
|
16
18
|
private _runtimeColorMap;
|
|
17
19
|
private _colorMapVariableInfo;
|
|
18
20
|
constructor(webgl: WebGL2RenderingContext);
|
|
19
21
|
get shaderProgram(): WebGLProgram;
|
|
20
22
|
enableProgram(): void;
|
|
23
|
+
setOpacity(opacity: number): void;
|
|
21
24
|
setRuntimeColorMap(colorMap: {
|
|
22
25
|
r: Float32Array;
|
|
23
26
|
g: Float32Array;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XYZShaderProgram.d.ts","sourceRoot":"","sources":["../../src/shader/XYZShaderProgram.ts"],"names":[],"mappings":"AAeA,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,WAAW,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACxC,uBAAuB,EAAE,MAAM,CAAA;IAC/B,qBAAqB,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAA;IAChC,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,cAAc,CAAC,CAAc;IACrC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,gBAAgB,CAEX;IACb,OAAO,CAAC,qBAAqB,CAO5B;gBAEW,KAAK,EAAE,sBAAsB;
|
|
1
|
+
{"version":3,"file":"XYZShaderProgram.d.ts","sourceRoot":"","sources":["../../src/shader/XYZShaderProgram.ts"],"names":[],"mappings":"AAeA,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,WAAW,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACxC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACpC,uBAAuB,EAAE,MAAM,CAAA;IAC/B,qBAAqB,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAA;IAChC,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,cAAc,CAAC,CAAc;IACrC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,eAAe,CAA2B;IAClD,OAAO,CAAC,QAAQ,CAAI;IACpB,OAAO,CAAC,gBAAgB,CAEX;IACb,OAAO,CAAC,qBAAqB,CAO5B;gBAEW,KAAK,EAAE,sBAAsB;IAczC,IAAI,aAAa,IAAI,YAAY,CAYhC;IAED,aAAa,IAAI,IAAI;IAIrB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIjC,kBAAkB,CAChB,QAAQ,EACJ;QAAE,CAAC,EAAE,YAAY,CAAC;QAAC,CAAC,EAAE,YAAY,CAAC;QAAC,CAAC,EAAE,YAAY,CAAA;KAAE,GACrD,SAAS,GACZ,IAAI;IAIP,aAAa,CACX,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EACrB,WAAW,SAAI,GACd,IAAI;IA0BP,OAAO,CAAC,WAAW;IAwEnB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,kBAAkB;IAsC1B,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,WAAW;CAsBpB"}
|
|
@@ -15,6 +15,7 @@ export class XYZShaderProgram {
|
|
|
15
15
|
_shaderProgram;
|
|
16
16
|
_colorMapBlockIndex = null;
|
|
17
17
|
_colorMapBuffer = null;
|
|
18
|
+
_opacity = 1;
|
|
18
19
|
_runtimeColorMap;
|
|
19
20
|
_colorMapVariableInfo = {
|
|
20
21
|
r_palette: { index: 0, offset: 0 },
|
|
@@ -29,6 +30,7 @@ export class XYZShaderProgram {
|
|
|
29
30
|
vMatrix: null,
|
|
30
31
|
sampler: null,
|
|
31
32
|
colorMapIdx: null,
|
|
33
|
+
opacity: null,
|
|
32
34
|
vertexPositionAttribute: -1,
|
|
33
35
|
textureCoordAttribute: -1,
|
|
34
36
|
};
|
|
@@ -49,6 +51,9 @@ export class XYZShaderProgram {
|
|
|
49
51
|
enableProgram() {
|
|
50
52
|
this._webgl.useProgram(this.shaderProgram);
|
|
51
53
|
}
|
|
54
|
+
setOpacity(opacity) {
|
|
55
|
+
this._opacity = Math.min(1, Math.max(0, opacity));
|
|
56
|
+
}
|
|
52
57
|
setRuntimeColorMap(colorMap) {
|
|
53
58
|
this._runtimeColorMap = colorMap;
|
|
54
59
|
}
|
|
@@ -61,6 +66,7 @@ export class XYZShaderProgram {
|
|
|
61
66
|
this.locations.vMatrix = gl.getUniformLocation(program, 'uVMatrix');
|
|
62
67
|
this.locations.sampler = gl.getUniformLocation(program, 'uSampler');
|
|
63
68
|
this.locations.colorMapIdx = gl.getUniformLocation(program, 'cmapIdx');
|
|
69
|
+
this.locations.opacity = gl.getUniformLocation(program, 'uOpacity');
|
|
64
70
|
this.locations.vertexPositionAttribute = gl.getAttribLocation(program, 'aVertexPosition');
|
|
65
71
|
this.locations.textureCoordAttribute = gl.getAttribLocation(program, 'aTextureCoord');
|
|
66
72
|
gl.uniformMatrix4fv(this.locations.pMatrix, false, pMatrix);
|
|
@@ -68,6 +74,7 @@ export class XYZShaderProgram {
|
|
|
68
74
|
gl.uniformMatrix4fv(this.locations.mMatrix, false, mMatrix);
|
|
69
75
|
gl.uniform1i(this.locations.sampler, 0);
|
|
70
76
|
gl.uniform1i(this.locations.colorMapIdx, colorMapIdx);
|
|
77
|
+
gl.uniform1f(this.locations.opacity, this._opacity);
|
|
71
78
|
if (colorMapIdx >= 2) {
|
|
72
79
|
this.uploadColorMap(colorMapIdx);
|
|
73
80
|
}
|
|
@@ -90,6 +97,7 @@ export class XYZShaderProgram {
|
|
|
90
97
|
in vec2 vTextureCoord;
|
|
91
98
|
uniform sampler2D uSampler;
|
|
92
99
|
uniform int cmapIdx;
|
|
100
|
+
uniform float uOpacity;
|
|
93
101
|
|
|
94
102
|
layout (std140) uniform colormap {
|
|
95
103
|
float r_palette[256];
|
|
@@ -104,7 +112,7 @@ export class XYZShaderProgram {
|
|
|
104
112
|
|
|
105
113
|
if (cmapIdx == 1) {
|
|
106
114
|
float gray = 0.21 * color.r + 0.71 * color.g + 0.07 * color.b;
|
|
107
|
-
outColor = vec4(vec3(gray), color.a);
|
|
115
|
+
outColor = vec4(vec3(gray), color.a * uOpacity);
|
|
108
116
|
return;
|
|
109
117
|
}
|
|
110
118
|
|
|
@@ -117,12 +125,12 @@ export class XYZShaderProgram {
|
|
|
117
125
|
r_palette[rIndex] / 256.0,
|
|
118
126
|
g_palette[gIndex] / 256.0,
|
|
119
127
|
b_palette[bIndex] / 256.0,
|
|
120
|
-
color.a
|
|
128
|
+
color.a * uOpacity
|
|
121
129
|
);
|
|
122
130
|
return;
|
|
123
131
|
}
|
|
124
132
|
|
|
125
|
-
outColor = color;
|
|
133
|
+
outColor = vec4(color.rgb, color.a * uOpacity);
|
|
126
134
|
}`);
|
|
127
135
|
gl.attachShader(this._shaderProgram, vertexShader);
|
|
128
136
|
gl.attachShader(this._shaderProgram, fragmentShader);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XYZShaderProgram.js","sourceRoot":"","sources":["../../src/shader/XYZShaderProgram.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"XYZShaderProgram.js","sourceRoot":"","sources":["../../src/shader/XYZShaderProgram.ts"],"names":[],"mappings":"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"}
|
package/lib-esm/utils/Utils.d.ts
CHANGED
|
@@ -22,6 +22,16 @@ export interface DMS {
|
|
|
22
22
|
}
|
|
23
23
|
export declare function cartesianToSpherical(xyz: vec3): SphericalCoords;
|
|
24
24
|
export declare function colorHex2RGB(hexColor: string): [number, number, number];
|
|
25
|
+
export type InteractionColors = {
|
|
26
|
+
hover: [number, number, number];
|
|
27
|
+
selected: [number, number, number];
|
|
28
|
+
};
|
|
29
|
+
/**
|
|
30
|
+
* Derive interaction colours from the object's normal colour.
|
|
31
|
+
* Dark colours move towards white; light colours move towards black.
|
|
32
|
+
* Selection uses the stronger contrast so selected > hover > normal.
|
|
33
|
+
*/
|
|
34
|
+
export declare function interactionColorsFromHex(hexColor: string): InteractionColors;
|
|
25
35
|
export declare function degToRad(degrees: number): number;
|
|
26
36
|
export declare function radToDeg(radians: number): number;
|
|
27
37
|
export declare function sphericalToAstroDeg(phiDeg: number, thetaDeg: number): AstroCoords;
|
|
@@ -29,4 +39,6 @@ export declare function sphericalToCartesian(phiDeg: number, thetaDeg: number, r
|
|
|
29
39
|
export declare function astroDegToSpherical(raDeg: number, decDeg: number): SphericalCoords;
|
|
30
40
|
export declare function raDegToHMS(raDeg: number): HMS;
|
|
31
41
|
export declare function decDegToDMS(decDeg: number): DMS;
|
|
42
|
+
export declare function raHMSToDeg(hms: HMS): number;
|
|
43
|
+
export declare function decDMSToDeg(dms: DMS): number;
|
|
32
44
|
//# sourceMappingURL=Utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAGD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,IAAI,GAAG,eAAe,CAe/D;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAcvE;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"Utils.d.ts","sourceRoot":"","sources":["../../src/utils/Utils.ts"],"names":[],"mappings":"AAWA;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,GAAG;IAClB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAGD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,IAAI,GAAG,eAAe,CAe/D;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAcvE;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,iBAAiB,CAe5E;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,WAAW,CAOb;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,CAAC,GAAE,MAAU,GACZ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAK1B;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,eAAe,CAOjB;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAK7C;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAa/C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAE3C;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAG5C"}
|