Compare commits

...

22 Commits

Author SHA1 Message Date
Matthieu BAUMANN
c71f573a97 set to production 2023-05-26 18:43:50 +02:00
Matthieu Baumann
aa9dfe632e change the deploy 2023-05-26 18:43:40 +02:00
Matthieu Baumann
78ff815e9b npm pack 2023-05-26 18:35:21 +02:00
Matthieu Baumann
ead34d5944 add formats info 2023-05-26 18:16:02 +02:00
Matthieu Baumann
d363882308 update workflow 2023-05-26 18:16:02 +02:00
Matthieu Baumann
a80bff6289 use the umd version for index.html 2023-05-26 18:16:02 +02:00
Matthieu Baumann
05ddeb8f7d include only js files into the npm package 2023-05-26 18:16:02 +02:00
bmatthieu3
6cce07cdfd update ci [ci skip] 2023-05-26 18:16:02 +02:00
bmatthieu3
eedb5b2bdf npm install and source rustup 2023-05-26 18:16:02 +02:00
bmatthieu3
4cf94eaf1a add some ci (TO TEST) 2023-05-26 18:16:02 +02:00
bmatthieu3
fbb4d760a4 remove webpack config file 2023-05-26 18:16:02 +02:00
bmatthieu3
30b87b2464 update readme 2023-05-26 18:16:02 +02:00
bmatthieu3
54bb0be16e update readme with new npm usage instructions 2023-05-26 18:16:02 +02:00
bmatthieu3
4808f84b37 fix: import A when it is necessary 2023-05-26 18:16:02 +02:00
bmatthieu3
fa52c39d7c update readme 2023-05-26 18:16:02 +02:00
bmatthieu3
bcfe829b03 use vite producing es and umd aladin lite module types. The umd is consistent with what is being used since a long time (including manually the aladin lite script) 2023-05-26 18:16:02 +02:00
bmatthieu3
6b0f4e4b60 Commit related to PR #90. We first check the clockwise order of the footprints in the celestial space first. 2023-05-23 11:46:01 +02:00
bmatthieu3
eaebc78cb7 update to fitsrs 0.2.9 2023-05-22 16:41:54 +02:00
bmatthieu3
9b3f4e8803 unrelated to this PR: the rust code handles the -pi -> pi to 0 -> 360deg ra remapping 2023-05-22 15:56:01 +02:00
Henrik Norman
44ac866ce6 Removed block of context menus. Also added handling of touchcancel
Co-authored-by: bmatthieu3 <matthieu.baumann@astro.unistra.fr>
2023-05-22 15:56:01 +02:00
Matthieu Baumann
34aa6faa89 Merge pull request #90 from cds-astro/removeCrossingPolygonEdges
check for ccw order for every 3 vertices
2023-05-20 00:10:39 +02:00
bmatthieu3
42243edf65 check for ccw order for every 3 vertices 2023-05-19 23:59:39 +02:00
132 changed files with 895 additions and 894 deletions

35
.github/workflows/npm-publish.yml vendored Normal file
View File

@@ -0,0 +1,35 @@
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
name: Publish to NPM
on:
release:
types: [created]
workflow_dispatch:
jobs:
publish-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
registry-url: https://registry.npmjs.org/
- name: "Install the rust compiler"
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
source "$HOME/.cargo/env"
- name: "Install wasm-pack"
run: |
curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -y
- name: "Install dependencies"
run: |
npm install
- name: "Build Aladin Lite"
run: |
npm run build
npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

35
.github/workflows/test.yml vendored Normal file
View File

@@ -0,0 +1,35 @@
name: Run tests
on:
push:
branches:
- develop
pull_request:
branches:
- develop
# Allows to run this workflow manually from the Actions tab
workflow_dispatch:
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: "Checkout branch ${{ github.head_ref }}"
uses: actions/checkout@v3
- name: "Setup node"
uses: actions/setup-node@v3
with:
node-version: 16
- name: "Install the rust compiler"
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
source "$HOME/.cargo/env"
- name: "Install wasm-pack"
run: |
curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -y
- name: "Install dependencies"
run: |
npm install
- name: "Build Aladin Lite"
run: |
npm run build
- name: "Run some tests"
run: npm test

View File

@@ -14,7 +14,13 @@ More details on [Aladin Lite documentation page](http://aladin.u-strasbg.fr/Alad
Aladin Lite v3 is out! Please play with [Aladin Lite v3 at this link](https://aladin.u-strasbg.fr/AladinLite). Aladin Lite v3 is out! Please play with [Aladin Lite v3 at this link](https://aladin.u-strasbg.fr/AladinLite).
If you want to embed it into your webpage, please include [the javascript script of Aladin Lite v3](https://aladin.cds.unistra.fr/AladinLite/api/v3/latest/aladin.js) into your project. API differences from the v2 are minimal, here is a snippet of code you can use to embed it into your webpages: ## Embed it into your projects
You can embed Aladin Lite it into your webpages in two ways
### The vanilla way
Please include [the javascript script of Aladin Lite v3](https://aladin.cds.unistra.fr/AladinLite/api/v3/latest/aladin.js) into your project. API differences from the v2 are minimal, here is a snippet of code you can use to embed it into your webpages:
```js ```js
<!doctype html> <!doctype html>
@@ -39,6 +45,37 @@ If you want to embed it into your webpage, please include [the javascript script
</html> </html>
``` ```
### Using the aladin lite NPM package
First, install it with npm:
```npm i aladin-lite```
Second, you can use it that way:
```js
<!doctype html>
<html>
<head>
<!-- Mandatory when setting up Aladin Lite v3 for a smartphones/tablet usage -->
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no">
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="module">
import A from 'aladin-lite';
A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", cooFrame: 'equatorial', showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: true});
});
</script>
</body>
</html>
```
## Goals of v3 ## Goals of v3
- Rust/WebGL new core integration - Rust/WebGL new core integration
@@ -62,7 +99,6 @@ If you want to embed it into your webpage, please include [the javascript script
## Source code ## Source code
Source code is available in the ``src`` directory. Source code is available in the ``src`` directory.
Precisely, the core is implemented in Rust and can be found in ``src/core``.
## Licence ## Licence
@@ -93,7 +129,7 @@ npm install
After that you are supposed to have the Rust toolchain installed After that you are supposed to have the Rust toolchain installed
to compile the core project into WebAssembly. to compile the core project into WebAssembly.
Follow the steps from the Rust official website [here](https://www.rust-lang.org/learn/get-started) Follow the steps from the Rust official website [here](https://www.rust-lang.org/learn/get-started)
You will also need [wasm-pack](https://rustwasm.github.io/wasm-pack/), a tool helping compiling rust into a proper .wasm file.
Once it's installed you can only build the project: Once it's installed you can only build the project:
```bash ```bash
@@ -116,7 +152,7 @@ and run the tests
```bash ```bash
cd src/core cd src/core
cargo test cargo test --features webgl2
``` ```
To generate the Rust backend API documentation To generate the Rust backend API documentation

View File

@@ -1,12 +1,15 @@
USER_ALADIN="matthieu.baumann" USER_ALADIN="matthieu.baumann"
DATEUPLOAD="$(date '+%Y-%m-%d')" DATEUPLOAD="$(date '+%Y-%m-%d')"
ssh $USER_ALADIN@aladin 'sg hips -c "mkdir -p $HOME/al-tmp && rm -rf $HOME/al-tmp/*"' ssh $USER_ALADIN@aladin 'sg hips -c "mkdir -p /home/matthieu.baumann/al-tmp && rm -rf /home/matthieu.baumann/al-tmp/*"'
# Copy the dist files # Copy the dist files
scp dist/* $USER_ALADIN@aladin:~/al-tmp scp dist/* $USER_ALADIN@aladin:~/al-tmp
# Copy the tgz
cp aladin-l*.tgz aladin-lite.tgz
scp aladin-lite.tgz $USER_ALADIN@aladin:~/al-tmp
ssh $USER_ALADIN@aladin 'sg hips -c "rm -rf /home/thomas.boch/AladinLite/www/api/v3/21-02-2023d && ssh $USER_ALADIN@aladin "sg hips -c 'rm -rf /home/thomas.boch/AladinLite/www/api/v3/d$DATEUPLOAD &&
mkdir -p /home/thomas.boch/AladinLite/www/api/v3/21-02-2023d && mkdir -p /home/thomas.boch/AladinLite/www/api/v3/d$DATEUPLOAD &&
cp $HOME/al-tmp/* /home/thomas.boch/AladinLite/www/api/v3/21-02-2023d && cp /home/matthieu.baumann/al-tmp/* /home/thomas.boch/AladinLite/www/api/v3/d$DATEUPLOAD &&
rm -rf /home/thomas.boch/AladinLite/www/api/v3/beta && rm -rf /home/thomas.boch/AladinLite/www/api/v3/beta &&
ln -s /home/thomas.boch/AladinLite/www/api/v3/21-02-2023d /home/thomas.boch/AladinLite/www/api/v3/beta"' ln -s /home/thomas.boch/AladinLite/www/api/v3/d$DATEUPLOAD /home/thomas.boch/AladinLite/www/api/v3/beta'"

View File

@@ -1,11 +1,16 @@
USER_ALADIN="matthieu.baumann" USER_ALADIN="matthieu.baumann"
DATEUPLOAD="$(date '+%Y-%m-%d')" DATEUPLOAD="$(date '+%Y-%m-%d')"
ssh $USER_ALADIN@aladin 'sg hips -c "mkdir -p $HOME/al-tmp && rm -rf $HOME/al-tmp/*"' ssh $USER_ALADIN@aladin 'sg hips -c "mkdir -p /home/matthieu.baumann/al-tmp && rm -rf /home/matthieu.baumann/al-tmp/*"'
scp dist/* $USER_ALADIN@aladin:~/al-tmp # Copy the dist files
# For compatibility with the docs, rename the UMD file into aladin.js
scp dist/aladin.umd.cjs $USER_ALADIN@aladin:~/al-tmp/aladin.js
# Copy the tgz
cp aladin-l*.tgz aladin-lite.tgz
scp aladin-lite.tgz $USER_ALADIN@aladin:~/al-tmp
ssh $USER_ALADIN@aladin 'sg hips -c "rm -rf /home/thomas.boch/AladinLite/www/api/v3/22-12-2022 && ssh $USER_ALADIN@aladin "sg hips -c 'rm -rf /home/thomas.boch/AladinLite/www/api/v3/$DATEUPLOAD &&
mkdir -p /home/thomas.boch/AladinLite/www/api/v3/22-12-2022 && mkdir -p /home/thomas.boch/AladinLite/www/api/v3/$DATEUPLOAD &&
cp $HOME/al-tmp/* /home/thomas.boch/AladinLite/www/api/v3/22-12-2022 && cp /home/matthieu.baumann/al-tmp/* /home/thomas.boch/AladinLite/www/api/v3/$DATEUPLOAD &&
rm -rf /home/thomas.boch/AladinLite/www/api/v3/latest && rm -rf /home/thomas.boch/AladinLite/www/api/v3/latest &&
ln -s /home/thomas.boch/AladinLite/www/api/v3/22-12-2022 /home/thomas.boch/AladinLite/www/api/v3/latest"' ln -s /home/thomas.boch/AladinLite/www/api/v3/$DATEUPLOAD /home/thomas.boch/AladinLite/www/api/v3/latest'"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -4,10 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', { fov:0.15, target: 'Arp 240', showReticle: false, fullScreen: true }); aladin = A.aladin('#aladin-lite-div', { fov:0.15, target: 'Arp 240', showReticle: false, fullScreen: true });

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: ["P/PanSTARRS/DR1/color-i-r-g"], showReticle: false, gridOptions: {opacity: 0.5}, projection: "AIT", cooFrame: 'galactic', target: "93.2721132 -20.9942421", fov: 1000, showGotoControl: false, showFrame: false, fullScreen: true, showLayersControl: true, showCooGrid: false, showCooGridControl: false}); aladin = A.aladin('#aladin-lite-div', {survey: ["P/PanSTARRS/DR1/color-i-r-g"], showReticle: false, gridOptions: {opacity: 0.5}, projection: "AIT", cooFrame: 'galactic', target: "93.2721132 -20.9942421", fov: 1000, showGotoControl: false, showFrame: false, fullScreen: true, showLayersControl: true, showCooGrid: false, showCooGridControl: false});

View File

@@ -4,10 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
A.init.then(() => { A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {projection: "TAN", survey: "P/HSC/DR2/deep/g", target: '02 21 36.529 -05 31 20.16', fov: 0.1}); let aladin = A.aladin('#aladin-lite-div', {projection: "TAN", survey: "P/HSC/DR2/deep/g", target: '02 21 36.529 -05 31 20.16', fov: 0.1});

View File

@@ -16,10 +16,8 @@
</div> </div>
</div> </div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
<!-- <script type="text/javascript" src="https://aladin.u-strasbg.fr/AladinLite/api/v3/latest/aladin.js" charset="utf-8"></script> --> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', fov: 400, fullScreen: true, showCooGrid: false, showReticle: false}) aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', fov: 400, fullScreen: true, showCooGrid: false, showReticle: false})

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "P/SPITZER/color", cooFrame: 'galactic', fov: 5}); aladin = A.aladin('#aladin-lite-div', {survey: "P/SPITZER/color", cooFrame: 'galactic', fov: 5});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
var aladin = A.aladin( var aladin = A.aladin(

View File

@@ -4,10 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
A.init.then(() => { A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {fov: 70,projection: "AIT"}); let aladin = A.aladin('#aladin-lite-div', {fov: 70,projection: "AIT"});
let hsc = aladin.newImageSurvey("P/HSC/DR2/deep/g", {colormap:"Purples", imgFormat: "fits"}); let hsc = aladin.newImageSurvey("P/HSC/DR2/deep/g", {colormap:"Purples", imgFormat: "fits"});

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'M50', fov: 0.3}); aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'M50', fov: 0.3});

View File

@@ -12,10 +12,8 @@ Show sources with proper motion greater than:
<input id='slider' style='vertical-align:middle;width:60vw;' step='1' min='0' max='500' type='range' value='0'> <input id='slider' style='vertical-align:middle;width:60vw;' step='1' min='0' max='500' type='range' value='0'>
<span id='pmVal' >0 mas/yr</span><br><br><div id='aladin-lite-div' style='width: 500px;height: 500px;'></div> <span id='pmVal' >0 mas/yr</span><br><br><div id='aladin-lite-div' style='width: 500px;height: 500px;'></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
var pmThreshold = 0; var pmThreshold = 0;

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55, showContextMenu: true}); aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55, showContextMenu: true});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55, showContextMenu: true}); aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55, showContextMenu: true});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "P/PanSTARRS/DR1/color-z-zg-g", fov:1.5, target: "NGC 7318B"}); aladin = A.aladin('#aladin-lite-div', {survey: "P/PanSTARRS/DR1/color-z-zg-g", fov:1.5, target: "NGC 7318B"});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -221,13 +221,11 @@
.coro-star { .coro-star {
vertical-align: middle; vertical-align: middle;
} }
</style> </style>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
var hipsDir="http://alasky.u-strasbg.fr/CDS_P_Coronelli"; var hipsDir="http://alasky.u-strasbg.fr/CDS_P_Coronelli";

View File

@@ -7,9 +7,8 @@
<div id="aladin-lite-div" style="width:440px;height:300px"></div> <div id="aladin-lite-div" style="width:440px;height:300px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: "icrs", fullScreen: true}); aladin = A.aladin('#aladin-lite-div', {cooFrame: "icrs", fullScreen: true});

View File

@@ -16,11 +16,8 @@ Image Opacity: <br/> <input id="slider" type="range" value=1 min=0 max=1 step=0.
<input id="DSS" type="radio" name="survey" value="P/DSS2/Color" checked><label for="DSS">Optical (DSS2) <label> <input id="DSS" type="radio" name="survey" value="P/DSS2/Color" checked><label for="DSS">Optical (DSS2) <label>
<input id="2MASS" type="radio" name="survey" value="P/2MASS/Color"><label for="2MASS">Infrared (2MASS)<label> <input id="2MASS" type="radio" name="survey" value="P/2MASS/Color"><label for="2MASS">Infrared (2MASS)<label>
<div id='aladin-statsDiv'></div> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: "0 0", cooFrame: "gal"}); aladin = A.aladin('#aladin-lite-div', {target: "0 0", cooFrame: "gal"});

View File

@@ -6,9 +6,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
/*aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic'}); /*aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -5,11 +5,10 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css"> <link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
<script type="text/javascript"> <script type="module">
import A from '../src/js/A.js';
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M 45', fov: 5}); aladin = A.aladin('#aladin-lite-div', {target: 'M 45', fov: 5});

View File

@@ -6,10 +6,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -7,10 +7,8 @@
<script src="https://code.jquery.com/jquery-1.10.1.min.js"></script> <script src="https://code.jquery.com/jquery-1.10.1.min.js"></script>
<div id='infoDiv'>&nbsp; </div> <div id='infoDiv'>&nbsp; </div>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
A.init.then(() => { A.init.then(() => {
var aladin = A.aladin('#aladin-lite-div', {target: '05 37 58 +08 17 35', fov: 12, backgroundColor: 'rgb(120, 0, 0)'}); var aladin = A.aladin('#aladin-lite-div', {target: '05 37 58 +08 17 35', fov: 12, backgroundColor: 'rgb(120, 0, 0)'});
var cat = A.catalog({sourceSize: 20}); var cat = A.catalog({sourceSize: 20});

View File

@@ -6,10 +6,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -36,8 +36,8 @@
</body> </body>
<script src="https://code.jquery.com/jquery-1.10.1.min.js"></script> <script src="https://code.jquery.com/jquery-1.10.1.min.js"></script>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
<script type="text/javascript"> import A from '../src/js/A.js';
$('#layersControl').show(); $('#layersControl').show();
var curSelectedSource = null; var curSelectedSource = null;

View File

@@ -4,10 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "P/DSS2/color", fov:1, showCooGridControl:true}); aladin = A.aladin('#aladin-lite-div', {survey: "P/DSS2/color", fov:1, showCooGridControl:true});

View File

@@ -4,10 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {projection: "TAN", target: '15 16 57.636 -60 55 7.49', showCooGrid: true, fov: 90}); aladin = A.aladin('#aladin-lite-div', {projection: "TAN", target: '15 16 57.636 -60 55 7.49', showCooGrid: true, fov: 90});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'http://alasky.cds.unistra.fr/ancillary/GaiaDR2/hips-density-map/', target: 'galactic center'}); aladin = A.aladin('#aladin-lite-div', {survey: 'http://alasky.cds.unistra.fr/ancillary/GaiaDR2/hips-density-map/', target: 'galactic center'});

View File

@@ -6,11 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<!-- Load a hips located at ./hips/gaia/ -->
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'galactic center'}); aladin = A.aladin('#aladin-lite-div', {target: 'galactic center'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'http://alasky.cds.unistra.fr/ancillary/GaiaDR2/hips-density-map/', target: 'galactic center'}); aladin = A.aladin('#aladin-lite-div', {survey: 'http://alasky.cds.unistra.fr/ancillary/GaiaDR2/hips-density-map/', target: 'galactic center'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'galactic center'}); aladin = A.aladin('#aladin-lite-div', {target: 'galactic center'});

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
var aladin = A.aladin( var aladin = A.aladin(

View File

@@ -6,10 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin( aladin = A.aladin(

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
A.init.then(() => { A.init.then(() => {
var aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'LMC', fov: 5}); var aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'LMC', fov: 5});
aladin.addCatalog(A.catalogFromURL('https://vizier.u-strasbg.fr/viz-bin/votable?-source=HIP2&-c=LMC&-out.add=_RAJ,_DEJ&-oc.form=dm&-out.meta=DhuL&-out.max=9999&-c.rm=180', {sourceSize:12, color: '#f08080'})); aladin.addCatalog(A.catalogFromURL('https://vizier.u-strasbg.fr/viz-bin/votable?-source=HIP2&-c=LMC&-out.add=_RAJ,_DEJ&-oc.form=dm&-out.meta=DhuL&-out.max=9999&-c.rm=180', {sourceSize:12, color: '#f08080'}));

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
A.init.then(() => { A.init.then(() => {
let a = A.aladin('#aladin-lite-div', {target: '03 47 00.00 +24 07 00.0', survey: 'P/DSS2/color', zoom: 2, showReticle: false}); let a = A.aladin('#aladin-lite-div', {target: '03 47 00.00 +24 07 00.0', survey: 'P/DSS2/color', zoom: 2, showReticle: false});
var cat = A.catalog({name: 'Some markers', sourceSize: 18}); var cat = A.catalog({name: 'Some markers', sourceSize: 18});

View File

@@ -6,9 +6,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {fov: 180, fullScreen: true, cooFrame: 'equatorial', showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, survey: 'CDS/P/Mars/THEMIS-Day-100m-v12'}); aladin = A.aladin('#aladin-lite-div', {fov: 180, fullScreen: true, cooFrame: 'equatorial', showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, survey: 'CDS/P/Mars/THEMIS-Day-100m-v12'});

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '240 +10.65', cooFrame: 'j2000d', fov: 90, showFrame: false, showCooGrid: true, showLayersControl: false, showGotoControl: false, fullScreen: true, showContextMenu: true}); aladin = A.aladin('#aladin-lite-div', {target: '240 +10.65', cooFrame: 'j2000d', fov: 90, showFrame: false, showCooGrid: true, showLayersControl: false, showGotoControl: false, fullScreen: true, showContextMenu: true});

View File

@@ -7,10 +7,8 @@
<div id="ui" class="ui"> <div id="ui" class="ui">
</div> </div>
</div> </div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '00 00 00 +07 00 00', fov: 130, survey: 'P/ISOPHOT/170'}); aladin = A.aladin('#aladin-lite-div', {target: '00 00 00 +07 00 00', fov: 130, survey: 'P/ISOPHOT/170'});

View File

@@ -7,10 +7,8 @@
<div id="ui" class="ui"> <div id="ui" class="ui">
</div> </div>
</div> </div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55}); aladin = A.aladin('#aladin-lite-div', {target: 'LMC', fov: 55});

View File

@@ -7,10 +7,8 @@
<div id="ui" class="ui"> <div id="ui" class="ui">
</div> </div>
</div> </div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '00 00 00 +07 00 00', fov: 130, survey: 'P/Mellinger/color'}); aladin = A.aladin('#aladin-lite-div', {target: '00 00 00 +07 00 00', fov: 130, survey: 'P/Mellinger/color'});

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'M51', fov: 180, fullScreen: true}); aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'M51', fov: 180, fullScreen: true});

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin( aladin = A.aladin(

View File

@@ -5,11 +5,10 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css"> <link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css">
<script type="text/javascript"> <script type="module">
import A from '../src/js/A.js';
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M 45', fov: 5, showContextMenu: true}); aladin = A.aladin('#aladin-lite-div', {target: 'M 45', fov: 5, showContextMenu: true});

View File

@@ -8,10 +8,8 @@
<div id="al2" style="width: 500px; height: 500px"> <div id="al2" style="width: 500px; height: 500px">
</div> </div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let al1; let al1;
let al2; let al2;
A.init.then(() => { A.init.then(() => {

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {fullScreen: true, survey: ['P/DM/vizMine', 'P/HST/GOODS/color', 'P/MATLAS/g'], target: '0 0', showCooGrid: true, fov: 180}); aladin = A.aladin('#aladin-lite-div', {fullScreen: true, survey: ['P/DM/vizMine', 'P/HST/GOODS/color', 'P/MATLAS/g'], target: '0 0', showCooGrid: true, fov: 180});

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -7,10 +7,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -5,18 +5,18 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript">
<script type="module">
import A from '../src/js/A.js';
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: '14 18 16.868 +56 44 29.37', fov: 5, showContextMenu: true}); aladin = A.aladin('#aladin-lite-div', {target: '14 18 16.868 +56 44 29.37', fov: 360, projection: 'AIT', showContextMenu: true});
const c1 = A.catalogFromURL('https://raw.githubusercontent.com/bmatthieu3/SKA-Discovery-Service-Mockup/aladin/ObsCore/ObsCore_003.xml', {onClick: 'showTable'}); const c1 = A.catalogFromURL('https://raw.githubusercontent.com/bmatthieu3/SKA-Discovery-Service-Mockup/aladin/ObsCore/ObsCore_003.xml', {onClick: 'showTable'});
aladin.addCatalog(c1); aladin.addCatalog(c1);
const c2 = A.catalogFromVizieR('B/assocdata/obscore', '14 18 16.868 +56 44 29.37', 100, {onClick: 'showTable', limit: 1000});
aladin.addCatalog(c2);
}); });
</script> </script>
</body> </body>

View File

@@ -4,10 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'M1', fov: 0.3}); aladin = A.aladin('#aladin-lite-div', {survey: 'P/DSS2/red', target: 'M1', fov: 0.3});

View File

@@ -4,10 +4,10 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript"> <script type="module">
import A from '../src/js/A.js';
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', fov: 110, target: 'galactic center'}); aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', fov: 110, target: 'galactic center'});

View File

@@ -6,10 +6,9 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -5,10 +5,10 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript"> <script type="module">
import A from '../src/js/A.js';
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'Gamma Cas', fov: 10}); aladin = A.aladin('#aladin-lite-div', {target: 'Gamma Cas', fov: 10});

View File

@@ -5,10 +5,10 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<div id='buttons'></div> <div id='buttons'></div>
<script type="text/javascript"> <script type="module">
import A from '../src/js/A.js';
A.init.then(() => { A.init.then(() => {
var a = A.aladin('#aladin-lite-div', {target: '03 47 00.00 +24 07 00.0', survey: 'P/DSS2/color', zoom: 2, showReticle: false}); var a = A.aladin('#aladin-lite-div', {target: '03 47 00.00 +24 07 00.0', survey: 'P/DSS2/color', zoom: 2, showReticle: false});
var cat = A.catalog({color: 'red', onClick: 'showTable'}); var cat = A.catalog({color: 'red', onClick: 'showTable'});

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M81', fov: 1}); aladin = A.aladin('#aladin-lite-div', {target: 'M81', fov: 1});

View File

@@ -4,10 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {target: 'M81', fov: 1}); aladin = A.aladin('#aladin-lite-div', {target: 'M81', fov: 1});

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin( aladin = A.aladin(

View File

@@ -6,9 +6,8 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', target: 'galactic center', survey: 'P/Finkbeiner'}); aladin = A.aladin('#aladin-lite-div', {cooFrame: 'galactic', target: 'galactic center', survey: 'P/Finkbeiner'});

View File

@@ -4,9 +4,8 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -5,10 +5,8 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite

View File

@@ -5,7 +5,7 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="https://aladin.cds.unistra.fr/AladinLite/api/v3/latest/aladin.js" charset="utf-8"></script> <script type="text/javascript" src="https://aladin.cds.unistra.fr/AladinLite/api/v3/latest/aladin.umd.cjs" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
let aladin; let aladin;

View File

@@ -5,11 +5,10 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript"> <script type="module">
let aladin; import A from '../src/js/A.js';
A.init.then(() => { A.init.then(() => {
// Start up Aladin Lite // Start up Aladin Lite
aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'Sgr a*', fov: 0.5}); aladin = A.aladin('#aladin-lite-div', {survey: "CDS/P/DSS2/color", target: 'Sgr a*', fov: 0.5});

View File

@@ -5,10 +5,9 @@
<body> <body>
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <script type="module">
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin( aladin = A.aladin(

View File

@@ -6,9 +6,10 @@
<div id="aladin-lite-div" style="width: 1024px; height: 768px"></div> <div id="aladin-lite-div" style="width: 1024px; height: 768px"></div>
<div id='aladin-statsDiv'></div> <div id='aladin-statsDiv'></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript"> <script type="module">
import A from '../src/js/A.js';
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {survey: ["P/Mellinger"], cooFrame: 'galactic', fov: 1000, fullScreen: true, showCooGrid: true}); aladin = A.aladin('#aladin-lite-div', {survey: ["P/Mellinger"], cooFrame: 'galactic', fov: 1000, fullScreen: true, showCooGrid: true});

View File

@@ -6,9 +6,9 @@
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script> <script type="module">
import A from '../src/js/A.js';
<script type="text/javascript">
let aladin; let aladin;
A.init.then(() => { A.init.then(() => {
aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic', showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: true}); aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic', showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: true});

View File

@@ -5,33 +5,12 @@
</head> </head>
<body> <body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div> <div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../aladin.js" charset="utf-8"></script>
<script type="text/javascript" src="./../dist/aladin.umd.cjs" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
var aladin; var aladin;
A.init.then(() => { A.init.then(() => {
/*aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic'});
aladin.setProjection('MOL');
aladin.setBaseImageLayer("P/PanSTARRS/DR1/g", {
imgFormat: 'fits',
colormap: 'redtemperature',
stretch: 'Asinh'
});*/
/*aladin = A.aladin('#aladin-lite-div', {fov: 360, fullScreen: true, cooFrame: 'galactic'});
aladin.setProjection('AIT');
aladin.setBaseImageLayer("P/PanSTARRS/DR1/g", {imgFormat: "fits"});
aladin.getBaseImageLayer().setColormap('redtemperature', {stretch: "Asinh"});*/
aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", fullScreen: true, expandLayersControl: true, cooFrame: 'equatorial', showProjectionControl: true, showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, showContextMenu: true}); aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", fullScreen: true, expandLayersControl: true, cooFrame: 'equatorial', showProjectionControl: true, showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, showContextMenu: true});
//aladin.setProjection('AIT');
//let survey = aladin.createImageSurvey("P/PanSTARRS/DR1/g", null, null, null, null, );
/*aladin.setBaseImageLayer("P/PanSTARRS/DR1/g");
aladin.getBaseImageLayer().setColormap('viridis', {stretch: "Asinh"});*/
// manage URL parameters // manage URL parameters
const searchParams = new URL(document.location).searchParams; const searchParams = new URL(document.location).searchParams;
@@ -62,8 +41,6 @@
enabled: b enabled: b
}); });
} }
}); });
</script> </script>

48
examples/index_es.html Normal file
View File

@@ -0,0 +1,48 @@
<!doctype html>
<html>
<head>
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no">
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="module">
import A from '../dist/aladin.js';
A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", fullScreen: true, expandLayersControl: true, cooFrame: 'equatorial', showProjectionControl: true, showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, showContextMenu: true});
// manage URL parameters
const searchParams = new URL(document.location).searchParams;
if (searchParams.has('baseImageLayer')) {
aladin.setBaseImageLayer(searchParams.get('baseImageLayer'));
}
if (searchParams.has('overlayImageLayer')) {
aladin.setOverlayImageLayer(searchParams.get('overlayImageLayer'));
}
if (searchParams.has('cooFrame')) {
aladin.setFrame(searchParams.get('cooFrame'));
}
if (searchParams.has('fov')) {
aladin.setFoV(parseFloat(searchParams.get('fov')));
}
if (searchParams.has('ra') && searchParams.has('dec')) {
aladin.gotoRaDec(parseFloat(searchParams.get('ra')), parseFloat(searchParams.get('dec')));
}
if (searchParams.has('showReticle')) {
aladin.showReticle(searchParams.get('showReticle')==='true');
}
if (searchParams.has('projection')) {
aladin.setProjection(searchParams.get('projection'));
}
if (searchParams.has('showCooGrid')) {
const b = searchParams.get('showCooGrid') === 'true';
aladin.view.setGridConfig({
enabled: b
});
}
});
</script>
</body>
</html>

47
examples/index_umd.html Normal file
View File

@@ -0,0 +1,47 @@
<!doctype html>
<html>
<head>
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, user-scalable=no">
</head>
<body>
<div id="aladin-lite-div" style="width: 500px; height: 400px"></div>
<script type="text/javascript" src="./../dist/aladin.umd.cjs" charset="utf-8"></script>
<script type="text/javascript">
A.init.then(() => {
let aladin = A.aladin('#aladin-lite-div', {fov: 360, projection: "AIT", fullScreen: true, expandLayersControl: true, cooFrame: 'equatorial', showProjectionControl: true, showCooGridControl: true, showSimbadPointerControl: true, showCooGrid: false, showContextMenu: true});
// manage URL parameters
const searchParams = new URL(document.location).searchParams;
if (searchParams.has('baseImageLayer')) {
aladin.setBaseImageLayer(searchParams.get('baseImageLayer'));
}
if (searchParams.has('overlayImageLayer')) {
aladin.setOverlayImageLayer(searchParams.get('overlayImageLayer'));
}
if (searchParams.has('cooFrame')) {
aladin.setFrame(searchParams.get('cooFrame'));
}
if (searchParams.has('fov')) {
aladin.setFoV(parseFloat(searchParams.get('fov')));
}
if (searchParams.has('ra') && searchParams.has('dec')) {
aladin.gotoRaDec(parseFloat(searchParams.get('ra')), parseFloat(searchParams.get('dec')));
}
if (searchParams.has('showReticle')) {
aladin.showReticle(searchParams.get('showReticle')==='true');
}
if (searchParams.has('projection')) {
aladin.setProjection(searchParams.get('projection'));
}
if (searchParams.has('showCooGrid')) {
const b = searchParams.get('showCooGrid') === 'true';
aladin.view.setGridConfig({
enabled: b
});
}
});
</script>
</body>
</html>

View File

@@ -1,5 +0,0 @@
#!/bin/bash
for filename in *.html; do
google-chrome http://localhost:8080/${filename}
done

View File

@@ -1,18 +1,28 @@
{ {
"homepage": "https://aladin.u-strasbg.fr/", "homepage": "https://aladin.u-strasbg.fr/",
"name": "aladin-lite", "name": "aladin-lite",
"type": "module",
"version": "3.1.0", "version": "3.1.0",
"description": "An astronomical HiPS visualizer in the browser", "description": "An astronomical HiPS visualizer in the browser",
"author": "Thomas Boch and Matthieu Baumann", "author": "Thomas Boch and Matthieu Baumann",
"license": "GPL-3", "license": "GPL-3",
"main": "dist/aladin.js", "module": "./dist/aladin.js",
"main": "./dist/aladin.js",
"files": [ "files": [
"dist/*" "dist/aladin.js",
"dist/aladin.umd.cjs",
"dist/index.html"
], ],
"exports": {
".": {
"import": "./dist/aladin.js"
}
},
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/cds-astro/aladin-lite" "url": "https://github.com/cds-astro/aladin-lite"
}, },
"email": "cds-question@unistra.fr",
"keywords": [ "keywords": [
"astronomy", "astronomy",
"visualization", "visualization",
@@ -21,32 +31,27 @@
"HiPS" "HiPS"
], ],
"scripts": { "scripts": {
"package-tar": "tar -zcvf AladinLiteAssets.tar.gz dist/*", "wasm": "wasm-pack build ./src/core --target web --release --out-name core -- --features webgl2",
"predeploy": "npm run build && npm run package-tar", "predeploy": "npm run build && npm pack",
"deploy": "./deploy-dbg.sh", "deploy": "./deploy.sh",
"build": "webpack && sed \"s/\\\\.\\\\/\\\\.\\\\.\\\\/aladin\\\\.js/https:\\\\/\\\\/aladin.cds.unistra.fr\\\\/AladinLite\\\\/api\\\\/v3\\\\/latest\\\\/aladin.js/g\" examples/index.html > dist/index.html", "build": "npm run wasm && vite build && cp examples/index.html dist/index.html",
"serve": "webpack-dev-server" "dev": "npm run build && vite",
"serve": "npm run dev",
"preview": "vite preview",
"test": "cd src/core && cargo test --release --features webgl2"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.18.5",
"@babel/preset-env": "^7.18.2",
"@wasm-tool/wasm-pack-plugin": "^1.6.0",
"babel-loader": "^8.2.5",
"npm": "^8.19.2", "npm": "^8.19.2",
"terser-webpack-plugin": "^5.3.3", "terser": "^5.17.6",
"webpack": "^5.74.0", "vite": "^4.3.8",
"webpack-cli": "^4.9.0", "vite-plugin-css-injected-by-js": "^3.1.1",
"webpack-dev-server": "^4.7.4", "vite-plugin-glsl": "^1.1.2",
"webpack-glsl-loader": "^1.0.1", "vite-plugin-top-level-await": "^1.3.1",
"webpack-glsl-minify": "^1.5.0" "vite-plugin-wasm": "^3.2.2",
"vite-plugin-wasm-pack": "^0.1.12"
}, },
"dependencies": { "dependencies": {
"autocompleter": "^6.1.3", "autocompleter": "^6.1.3",
"babel-preset-es2015": "^6.24.1", "jquery": "^3.6.1"
"css-loader": "^5.0.1",
"file-loader": "^6.1.0",
"jquery": "^3.6.1",
"style-loader": "^3.3.1",
"wasm-pack": "^0.10.3"
} }
} }

View File

@@ -30,7 +30,6 @@ serde = { version = "^1.0.59", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
serde-wasm-bindgen = "0.4" serde-wasm-bindgen = "0.4"
console_error_panic_hook = "0.1.7" console_error_panic_hook = "0.1.7"
fitsrs = "0.2.7"
enum_dispatch = "0.3.8" enum_dispatch = "0.3.8"
wasm-bindgen = "0.2.79" wasm-bindgen = "0.2.79"
wasm-streams = "0.3.0" wasm-streams = "0.3.0"
@@ -39,7 +38,8 @@ al-core = { path = "./al-core" }
al-task-exec = { path = "./al-task-exec" } al-task-exec = { path = "./al-task-exec" }
al-api = { path = "./al-api" } al-api = { path = "./al-api" }
mapproj = "0.3.0" mapproj = "0.3.0"
wcs = "0.2.6" fitsrs = "0.2.9"
wcs = "0.2.8"
colorgrad = "0.6.2" colorgrad = "0.6.2"
image-decoder = { package = "image", version = "0.24.2", default-features = false, features = ["jpeg", "png"] } image-decoder = { package = "image", version = "0.24.2", default-features = false, features = ["jpeg", "png"] }
votable = "0.2.3" votable = "0.2.3"
@@ -119,7 +119,7 @@ codegen-units = 256
rpath = false rpath = false
[profile.release] [profile.release]
opt-level = 3 opt-level = 'z'
debug = false debug = false
debug-assertions = false debug-assertions = false
overflow-checks = false overflow-checks = false

View File

@@ -1,6 +1,6 @@
use wasm_bindgen::prelude::*; use wasm_bindgen::prelude::*;
#[wasm_bindgen(raw_module = "../src/js/Color")] #[wasm_bindgen(raw_module = "../../js/Color")]
extern "C" { extern "C" {
pub type Color; pub type Color;

View File

@@ -135,7 +135,6 @@ impl App {
WebGl2RenderingContext::ONE, WebGl2RenderingContext::ONE,
WebGl2RenderingContext::ONE, WebGl2RenderingContext::ONE,
); );
// TODO: https://caniuse.com/?search=scissor is not supported for safari <= 14.1 // TODO: https://caniuse.com/?search=scissor is not supported for safari <= 14.1
// When it will be supported nearly everywhere, we will need to uncomment this line to // When it will be supported nearly everywhere, we will need to uncomment this line to
// enable it // enable it

View File

@@ -15,7 +15,7 @@ uniform vec2 kernel_size;
out vec2 out_uv; out vec2 out_uv;
out vec3 out_p; out vec3 out_p;
@include "../hips/projection.glsl" #include ../hips/projection.glsl;
void main() { void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f)); vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv; out vec2 out_uv;
out vec3 out_p; out vec3 out_p;
@include "../hips/projection.glsl" #include ../hips/projection.glsl;
void main() { void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f)); vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -15,7 +15,7 @@ uniform vec2 kernel_size;
out vec2 out_uv; out vec2 out_uv;
out vec3 out_p; out vec3 out_p;
@include "../hips/projection.glsl" #include ../hips/projection.glsl;
void main() { void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f)); vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv; out vec2 out_uv;
out vec3 out_p; out vec3 out_p;
@include "../hips/projection.glsl" #include ../hips/projection.glsl;
void main() { void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f)); vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv; out vec2 out_uv;
out vec3 out_p; out vec3 out_p;
@include "../hips/projection.glsl" #include ../hips/projection.glsl;
void main() { void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f)); vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -14,7 +14,7 @@ uniform vec2 kernel_size;
out vec2 out_uv; out vec2 out_uv;
out vec3 out_p; out vec3 out_p;
@include "../hips/projection.glsl" #include ../hips/projection.glsl;
void main() { void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f)); vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -15,7 +15,7 @@ uniform vec2 kernel_size;
out vec2 out_uv; out vec2 out_uv;
out vec3 out_p; out vec3 out_p;
@include "../hips/projection.glsl" #include ../hips/projection.glsl;
void main() { void main() {
vec3 p = vec3(inv_model * vec4(center, 1.0f)); vec3 p = vec3(inv_model * vec4(center, 1.0f));

View File

@@ -8,7 +8,7 @@ out vec4 color;
uniform sampler2D texture_fbo; uniform sampler2D texture_fbo;
uniform float alpha; uniform float alpha;
@include "./colormap.glsl" #include ./colormap.glsl;
void main() { void main() {
float opacity = texture(texture_fbo, out_uv).r; float opacity = texture(texture_fbo, out_uv).r;

View File

@@ -11,7 +11,7 @@ in vec2 frag_uv;
uniform isampler2D tex; uniform isampler2D tex;
uniform float opacity; uniform float opacity;
@include "../hips/color.glsl" #include ../hips/color.glsl;
void main() { void main() {
ivec4 color = texture(tex, frag_uv); ivec4 color = texture(tex, frag_uv);

View File

@@ -11,7 +11,7 @@ in vec2 frag_uv;
uniform sampler2D tex; uniform sampler2D tex;
uniform float opacity; uniform float opacity;
@include "../hips/color.glsl" #include ../hips/color.glsl;
void main() { void main() {
vec4 color = texture(tex, frag_uv); vec4 color = texture(tex, frag_uv);

View File

@@ -11,7 +11,7 @@ in vec2 frag_uv;
uniform usampler2D tex; uniform usampler2D tex;
uniform float opacity; uniform float opacity;
@include "../hips/color.glsl" #include ../hips/color.glsl;
void main() { void main() {
uvec4 color = texture(tex, frag_uv); uvec4 color = texture(tex, frag_uv);

View File

@@ -17,10 +17,10 @@ uniform float size_tile_uv;
uniform int tex_storing_fits; uniform int tex_storing_fits;
@include "../colormaps/colormap.glsl" #include ../colormaps/colormap.glsl;
@include "./transfer_funcs.glsl" #include ./transfer_funcs.glsl;
@include "./tonal_corrections.glsl" #include ./tonal_corrections.glsl;
@include "./hsv.glsl" #include ./hsv.glsl;
vec4 get_pixels(vec3 uv) { vec4 get_pixels(vec3 uv) {
int idx_texture = int(uv.z); int idx_texture = int(uv.z);

View File

@@ -17,9 +17,9 @@ uniform float size_tile_uv;
uniform int tex_storing_fits; uniform int tex_storing_fits;
@include "../colormaps/colormap.glsl" #include ../colormaps/colormap.glsl;
@include "./transfer_funcs.glsl" #include ./transfer_funcs.glsl;
@include "./tonal_corrections.glsl" #include ./tonal_corrections.glsl;
ivec4 get_pixels(vec3 uv) { ivec4 get_pixels(vec3 uv) {
int idx_texture = int(uv.z); int idx_texture = int(uv.z);

View File

@@ -17,9 +17,9 @@ uniform float size_tile_uv;
uniform int tex_storing_fits; uniform int tex_storing_fits;
@include "../colormaps/colormap.glsl" #include ../colormaps/colormap.glsl;
@include "./transfer_funcs.glsl" #include ./transfer_funcs.glsl;
@include "./tonal_corrections.glsl" #include ./tonal_corrections.glsl;
uvec4 get_pixels(vec3 uv) { uvec4 get_pixels(vec3 uv) {
int idx_texture = int(uv.z); int idx_texture = int(uv.z);

View File

@@ -13,7 +13,7 @@ in float m_end;
out vec4 out_frag_color; out vec4 out_frag_color;
uniform float opacity; uniform float opacity;
@include "../color.glsl" #include ../color.glsl;
void main() { void main() {
vec4 color_start = get_color_from_texture(frag_uv_start); vec4 color_start = get_color_from_texture(frag_uv_start);

View File

@@ -12,7 +12,7 @@ in float m_end;
out vec4 out_frag_color; out vec4 out_frag_color;
@include "../color.glsl" #include ../color.glsl;
uniform float opacity; uniform float opacity;

View File

@@ -12,7 +12,7 @@ in float m_end;
out vec4 out_frag_color; out vec4 out_frag_color;
@include "../color_i.glsl" #include ../color_i.glsl;
uniform float opacity; uniform float opacity;

View File

@@ -13,7 +13,7 @@ in float m_end;
out vec4 out_frag_color; out vec4 out_frag_color;
@include "../color_u.glsl" #include ../color_u.glsl;
uniform float opacity; uniform float opacity;

View File

@@ -23,7 +23,7 @@ uniform float czf;
// current time in ms // current time in ms
uniform float current_time; uniform float current_time;
@include "../projection.glsl" #include ../projection.glsl;
void main() { void main() {
gl_Position = vec4(ndc_pos, 0.0, 1.0); gl_Position = vec4(ndc_pos, 0.0, 1.0);

View File

@@ -19,8 +19,8 @@ struct Tile {
uniform Tile textures_tiles[12]; uniform Tile textures_tiles[12];
uniform int num_tiles; uniform int num_tiles;
@include "../color.glsl" #include ../color.glsl;
@include "./healpix.glsl" #include ./healpix.glsl;
uniform float opacity; uniform float opacity;

View File

@@ -25,8 +25,8 @@ struct TileColor {
bool found; bool found;
}; };
@include "../color.glsl" #include ../color.glsl;
@include "./healpix.glsl" #include ./healpix.glsl;
vec4 get_tile_color(vec3 pos) { vec4 get_tile_color(vec3 pos) {
HashDxDy result = hash_with_dxdy(0, pos.zxy); HashDxDy result = hash_with_dxdy(0, pos.zxy);

Some files were not shown because too many files have changed in this diff Show More