Skip to content

Commit

Permalink
Update and add 6 DSO textures. (Stellarium#553)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunshuwei @alex-w
sunshuwei authored and alex-w committed Nov 22, 2018
1 parent ed90a70 commit 640eb95
Show file tree
Hide file tree
Showing 10 changed files with 60 additions and 19 deletions.
19 changes: 14 additions & 5 deletions CREDITS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
from Georg Zotti
http://www.waa.at/
License: Creative Commons Attribution 3.0 Unported
4.18 Images of IC1805, IC1848, NGC6888
4.18 Images of IC1805, IC1848
from Steve Tuttle
http://www.stuttle1.com/
4.19 Images of IC4628, M20, M21, M47, NGC2467, IC2948, NGC3324, NGC3293,
Expand Down Expand Up @@ -389,7 +389,8 @@
Sadr region (Gamma Cygni), Jones-Emberson 1, Medusa
from Peter Vasey, Plover Hill Observatory
http://www.madpc.co.uk/~peterv/
4.26 Image of IC434 from Marc Aragnou
4.26 Image of IC3568 from Howard Bond (Space Telescope Science Institute), Robin Ciardullo (Pennsylvania State University) and NASA
License: public domain
4.27 Image of solar corona from eclipse 2008-08-01 by Georg Zotti
4.28 Images of IC59, IC63, IC410, NGC2359 from Carole Pope
https://sites.google.com/site/caroleastroimaging/
Expand All @@ -410,7 +411,7 @@
License: public domain
4.34 Images of M59, M60, M89, M90, IC2177, IC2220, IC2631, NGC1433, NGC1761,
NGC1788, NGC1999, NGC2014, NGC2442, NGC2547, NGC6334, NGC6357, PGC10074,
RCW38, RCW49, Fornax Cluster, Virgo Cluster
RCW32, RCW38, RCW49, Fornax Cluster, Virgo Cluster
from ESO/Digitized Sky Survey 2
http://eso.org/public/
License: Creative Commons Attribution 4.0 International
Expand Down Expand Up @@ -445,7 +446,7 @@
License: Creative Commons Attribution 4.0 International
4.43 Images of NGC253, NGC2170, NGC5566, the Pleiades from HG731GZ
License: Creative Commons Attribution 3.0 Unported
4.44 Images of M8, M104, IC2944, NGC6726 from Dylan O'Donnell
4.44 Images of M8, M104, IC434, IC2944, NGC6726 from Dylan O'Donnell
http://deography.com/
License: public domain
4.45 Images of NGC247
Expand Down Expand Up @@ -474,7 +475,7 @@
from Starhopper
https://commons.wikimedia.org/wiki/
License: Creative Commons Attribution-Share Alike 4.0 International
4.51 Images of M95, NGC520, NGC660, NGC925, NGC1300, NGC7129, NGC7497
4.51 Images of M95, NGC520, NGC660, NGC925, NGC1300, NGC7129, NGC7497, NGC6888
from Jschulman555
https://commons.wikimedia.org/wiki/
License: Creative Commons Attribution 3.0 Unported
Expand Down Expand Up @@ -566,6 +567,14 @@
from Rogelio Bernal Andreo
https://commons.wikimedia.org/wiki/
License: Creative Commons Attribution-Share Alike 3.0 Unported
4.75 Images of NGC5466
from Egres73
https://commons.wikimedia.org/wiki/
License: Creative Commons Attribution-Share Alike 3.0 Unported
4.76 Images of NGC6905
from Tom Wildoner
https://commons.wikimedia.org/wiki/
License: Creative Commons Attribution-Share Alike 4.0 International
```

## Appendix
Expand Down
Binary file added nebulae/default/ic3568.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed nebulae/default/ic434-marc.png
View file
Binary file not shown.
Binary file added nebulae/default/ic434.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nebulae/default/n5466.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nebulae/default/n6888.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed nebulae/default/n6888_dn.png
View file
Binary file not shown.
Binary file added nebulae/default/n6905.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added nebulae/default/rcw32.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 46 additions & 14 deletions nebulae/default/textures.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,14 @@
"minResolution" : 0.2165786418,
"maxBrightness" : 14.0
},
{
"imageCredits" : {"short" : "Egres73","infoUrl": "https://commons.wikimedia.org/wiki/File:Amas_boo_ngc5466.jpg"},
"imageUrl" : "n5466.png",
"worldCoords" : [[[211.5605,28.3572], [211.1765,28.3582], [211.1775,28.6963], [211.563,28.6952]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 0.2222381739,
"maxBrightness" : 14.0
},
{
"imageCredits" : {"short" : "HG731GZ"},
"imageUrl" : "n5566.png",
Expand Down Expand Up @@ -2078,13 +2086,21 @@
"maxBrightness" : 8
},
{
"imageCredits": {"short" : "Steve Tuttle", "infoUrl": "http://www.stuttle1.com/"},
"imageUrl" : "n6888_dn.png",
"worldCoords" : [[[303.5030, 38.1059], [302.6636, 38.1085], [302.6652, 38.7695], [303.5104, 38.7660]]],
"imageCredits": {"short" : "Jschulman555", "infoUrl": "https://commons.wikimedia.org/wiki/File:NGC6888_Crescent_nebula.jpg"},
"imageUrl" : "n6888.png",
"worldCoords" : [[[303.2366,38.1884], [302.8589,38.1891], [302.8589,38.4857], [303.238,38.4855]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 4.65,
"maxBrightness" : 10.0
},
{
"imageCredits" : {"short" : "Tom Wildoner","infoUrl": "https://commons.wikimedia.org/wiki/File:NGC_6905_%E2%80%93_The_Blue_Flash_Nebula_in_Delphinus.jpg"},
"imageUrl" : "n6905.png",
"worldCoords" : [[[305.6559,20.0417], [305.5347,20.0411], [305.5337,20.1553], [305.655,20.1562]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 0.2222381739,
"maxBrightness" : 13.4
},
{
"imageCredits" : {"short" : "Cristina Cellini","infoUrl": "https://commons.wikimedia.org/wiki/File:Ngc6914_20170924.jpg"},
"imageUrl" : "n6914.png",
Expand Down Expand Up @@ -2319,9 +2335,9 @@
"maxBrightness" : 14
},
{
"imageCredits": {"short" : "Marc Aragnou"},
"imageUrl" : "ic434-marc.png",
"worldCoords" :[[[86.2274, -3.6162], [84.04833, -3.6889], [83.9745, -1.5128], [86.1517, -1.4342]]],
"imageCredits": {"short" : "Dylan O'Donnell","infoUrl": "https://deography.com/the-sky-bridge-from-horsehead-to-orion/"},
"imageUrl" : "ic434.png",
"worldCoords" : [[[85.824,-3.8044], [83.8979,-2.9709], [84.7334,-1.0492], [86.6585,-1.8812]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 2.066023154,
"maxBrightness" : 14.5
Expand Down Expand Up @@ -2430,6 +2446,14 @@
"minResolution" : 2.066023154,
"maxBrightness" : 14.9
},
{
"imageCredits" : {"short" : "Howard Bond (Space Telescope Science Institute), Robin Ciardullo (Pennsylvania State University) and NASA","infoUrl": "http://hubblesite.org/newscenter/archive/releases/1997/38/image/c/"},
"imageUrl" : "ic3568.png",
"worldCoords" : [[[188.3038,82.5604], [188.2534,82.5604], [188.2534,82.567], [188.3038,82.567]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 0.2222381739,
"maxBrightness" : 13.4
},
{
"imageCredits" : {"short" : "NASA, ESA, the Hubble Heritage (STScI/AURA)-ESA/Hubble Collaboration, and A. Evans (University of Virginia, Charlottesville/NRAO/Stony Brook University)","infoUrl": "https://www.spacetelescope.org/images/opo0214a/"},
"imageUrl" : "ic4406.png",
Expand Down Expand Up @@ -2502,14 +2526,6 @@
"minResolution" : 2.066023154,
"maxBrightness" : 13.9
},
{
"imageCredits" : {"Short": "Trevor Gerdes", "infoUrl": "http://www.sarcasmogerdes.com/"},
"imageUrl" : "rcw158-trev.png",
"worldCoords" : [[[ 272.1720, -14.7860], [ 271.0250, -14.7750], [ 271.0365, -13.6690], [ 272.1810, -13.6800]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 0.2169148018,
"maxBrightness" : 13.4
},
{
"imageCredits" : {"short" : "Albert Van Donklaar","infoUrl": "http://www.iceinspace.com.au/"},
"imageUrl" : "rho-a00.png",
Expand Down Expand Up @@ -2694,6 +2710,14 @@
"minResolution" : 0.2222381739,
"maxBrightness" : 14.2
},
{
"imageCredits" : {"short" : "ESO/Digitized Sky Survey 2","infoUrl": "https://www.eso.org/public/images/eso1420c/"},
"imageUrl" : "rcw32.png",
"worldCoords" : [[[134.0118,-43.2605], [128.4534,-43.3388], [128.5208,-39.29834], [133.7435,-39.2275]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 0.266023154,
"maxBrightness" : 14.8
},
{
"imageCredits" : {"short" : "ESO/Digitized Sky Survey 2","infoUrl": "https://www.eso.org/public/images/eso0929d/"},
"imageUrl" : "rcw38.png",
Expand All @@ -2710,6 +2734,14 @@
"minResolution" : 0.266023154,
"maxBrightness" : 14.3
},
{
"imageCredits" : {"Short": "Trevor Gerdes", "infoUrl": "http://www.sarcasmogerdes.com/"},
"imageUrl" : "rcw158-trev.png",
"worldCoords" : [[[ 272.1720, -14.7860], [ 271.0250, -14.7750], [ 271.0365, -13.6690], [ 272.1810, -13.6800]]],
"textureCoords" : [[[0,0], [1,0], [1,1], [0,1]]],
"minResolution" : 0.2169148018,
"maxBrightness" : 13.4
},
{
"imageCredits" : {"Short": "Carole Pope", "infoUrl": "https://sites.google.com/site/caroleastroimaging/"},
"imageUrl" : "cas.png",
Expand Down

0 comments on commit 640eb95

Please sign in to comment.