diff --git a/ChangeLog b/ChangeLog index c56cb7104..6036cee73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -680,3 +680,4 @@ Code: * Allow sunset color to be specified in .ssc files * Bound Ctrl+P to mark/unmark selection * Implemented tab completion of star, planet, and deep sky object names +* Implemented new, scientifically accurate Pluto-Charon textures diff --git a/data/solarsys.ssc b/data/solarsys.ssc index 59bb6cf19..6be6f8a67 100644 --- a/data/solarsys.ssc +++ b/data/solarsys.ssc @@ -229,7 +229,9 @@ Lower [ 0.8 0.6 0.6 ] Upper [ 0.7 0.3 0.3 ] Sky [ 0.83 0.75 0.65 ] - + Sunset [ 0.7 0.7 0.8 ] + # Slightly bluish sunset, as seen in true color pictures + # from Pathfinder # Slightly bluish sunset, as seen in true color pictures # from Pathfinder Sunset [ 0.7 0.7 0.8 ] @@ -330,6 +332,7 @@ Lower [ 0.7 0.6 0.5 ] Upper [ 0.5 0.45 0.4 ] Sky [ 0.8 0.8 0.5 ] + Sunset [ 1.0 0.6 0.2 ] } RotationPeriod 9.927953 # System II (for GRS) @@ -759,6 +762,7 @@ Lower [ 0.75 0.85 1.0 ] Upper [ 0.5 0.8 0.9 ] Sky [ 0.6 0.7 0.7 ] + } RotationPeriod 17.24 # System III (magnetic field) @@ -1001,12 +1005,14 @@ Albedo 0.155 } - "Pluto" "Sol" { Texture "pluto.jpg" BumpMap "plutobump1k.jpg" BumpHeight 2.5 + SpecularTexture "pluto-spec.jpg" + SpecularColor [ 0.135 0.12 0.08 ] + SpecularPower 9.5 Radius 1137 CustomOrbit "pluto" @@ -1032,6 +1038,9 @@ "Charon" "Sol/Pluto" { Texture "charon.jpg" + SpecularTexture "charon-spec.jpg" + SpecularColor [ 0.135 0.12 0.08 ] + SpecularPower 9.5 Radius 586 InfoURL "http://www.nineplanets.org/pluto.html#Charon" @@ -1056,6 +1065,7 @@ + "Galileo" "Sol" { Class "spacecraft" diff --git a/textures/lores/charon-spec.jpg b/textures/lores/charon-spec.jpg new file mode 100644 index 000000000..3283d034f Binary files /dev/null and b/textures/lores/charon-spec.jpg differ diff --git a/textures/lores/charon.jpg b/textures/lores/charon.jpg index a9bc3d3d6..f734a6f04 100644 Binary files a/textures/lores/charon.jpg and b/textures/lores/charon.jpg differ diff --git a/textures/lores/pluto-spec.jpg b/textures/lores/pluto-spec.jpg new file mode 100644 index 000000000..a80639007 Binary files /dev/null and b/textures/lores/pluto-spec.jpg differ diff --git a/textures/lores/pluto.jpg b/textures/lores/pluto.jpg index a30d4de66..d9fcf2b2b 100644 Binary files a/textures/lores/pluto.jpg and b/textures/lores/pluto.jpg differ diff --git a/textures/medres/charon-spec.jpg b/textures/medres/charon-spec.jpg new file mode 100644 index 000000000..96ea8b5e5 Binary files /dev/null and b/textures/medres/charon-spec.jpg differ diff --git a/textures/medres/charon.jpg b/textures/medres/charon.jpg new file mode 100644 index 000000000..2e270db72 Binary files /dev/null and b/textures/medres/charon.jpg differ diff --git a/textures/medres/pluto-spec.jpg b/textures/medres/pluto-spec.jpg new file mode 100644 index 000000000..499982df0 Binary files /dev/null and b/textures/medres/pluto-spec.jpg differ diff --git a/textures/medres/pluto.jpg b/textures/medres/pluto.jpg index 9a7237778..1b5ccfdf3 100644 Binary files a/textures/medres/pluto.jpg and b/textures/medres/pluto.jpg differ