diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..e69de29bb diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..5ec43ee15 --- /dev/null +++ b/COPYING @@ -0,0 +1,278 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000000000..f97deaa01 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,151 @@ +Celestia Revision History +------------------------- + +1.00 +* Initial public release + + +1.01 +* Added more realistic and aesthetically pleasing ring illumination function +* Made planets project shadows onto their rings (requires multitexturing) +* Detect and use ARB_multitexture extension +* Some configuration parameters now read from a file +* Support for multiple solar system catalog files +* Split solar system files into solarsys.ssc and extrasolar.ssc +* Added Help/License menu +* Added simple camera orbit mode +* Fixed up parsing and printing of catalog numbers--still kludgy though + + +1.02 +* Made Celestia icon appear in corner of window. Whee. +* Fixed an extremely subtle numerical precision bug which manifested itself in + a number of ways: jittering when following small objects, incorrect + targeting of small objects with goto, occasional flashes when closely + approaching an object, and probably other things as well. +* Reversed rotation directions when orbiting--it's much more intuitive now +* Added an exponential dolly capability to the camera +* Double-clicking will now center on the selected object +* Fixed bug in elliptical orbit calculation +* When orbits are displayed, the Orbit for the selected object is highlighted +* Incorporated Scott Hudson's asteroid geometry data for Toutatis, Kleopatra, + and Geographos. +* Fixed problems with disappearing labels and with misplaced labels for + extrasolar planets +* Eliminated 'sticking' when mouse buttons released outside of Celestia window +* Added Real Time option to Time menu +* Reversed planet rotation direction so it's correct. Oops. +* Added about a dozen extrasolar systems from Jean Schneider's catalog +* Create two new textures for extrasolar planets +* Moved Selection class outside of Simulation, as it's generally useful + + +1.03 +* Rotating the camera is now more responsive to mouse movement +* 'Infinite mouse' hack allows rotating and dollying without having to pick up + the mouse and reposition the cursor in the window +* Fixed z ordering for planets and satellites so small that they only appear + as points. Small satellites will no longer get obscured by planets they're + in front of. +* Apparent magnitude calculation for planets now takes into account phase +* At close range, stars are now rendered as textured sphere meshes. +* Choosing stars by catalog number no longer selects a star even when the specified + star doesn't exist. +* Added labels for stars; the list of labelled stars is read from celestia.cfg +* Cleaned up vecmath.h, added consts and reference parameters where appropriate +* Cleaned up StarNameDatabase + + +1.04 +* Start out at the moon instead of in deep space +* Made picking of planets work properly for planets with disc sizes greater than one + pixel. +* Added call to glDeleteTextures to Texture class destructor +* Added bump mapping. Uses DOT3 bump mapping and only works on GeForce cards + right now. +* Enabled user control of per-pixel lighting. +* Menu checked state for label options synced with renderer state. +* Added a context menu that appears when an object is right clicked. +* Celestia now uses texture coordinates from 3DS files +* Added 3DS model of Eros based on NEAR laser rangefinder data +* Added 3DS models of Deimos, Phobos, and numerous other asteroids and + small moons based on Phil Stooke's models +* Replaced TriangleList class with much more flexible VertexList +* Introduced support for compressed textures; texture compression is specified + on a per texture basis in .ssc files. +* Added a reverse time option +* Added an OpenGL Driver Info item to the help menu + + +1.05 +* Made per-pixel lighting work for planets without bump maps too +* Allow user control of magnitude of faintest visible stars +* Added support for PNG textures +* Improved console: enabled backspace, relocated text entry, code cleanup, ... +* Corrected star positions by converting them from equatorial to ecliptical + coordinates. +* Eliminated case sensitivity when selecting objects by name +* New ring texture for Saturn with separate reflectance and opacity +* Ring textures now specified in .ssc files instead of hardcoded +* Implemented date/time selector dialog box +* Changed the mouse wheel function from zoom to dolly. Zoom is now controlled by + shift left-dragging the mouse. For mice without wheels, control left-dragging + will dolly. +* Fixed orbit and dolly functions to work in follow mode +* Improved rendering of objects at close range: less clipping, extra sphere LOD. +* Fixed bug that caused irregular objects to be displayed at half their actual size +* ESC now cancels goto and follow instead of exiting app. +* Fixed orbital calculations for planets so their positions are now closer to + reality. +* Completed extrasolar planets database; it now contains all known planets + around normal stars +* Mir! +* MeanAnomaly field in .ssc files was incorrectly called TrueAnomaly; this + is fixed, and solar system parser now also accepts MeanLongitude in orbital + elements section. +* Epoch can now be specified for orbital elements. Default is J2000. + + +1.06 +* Made Alt+F4 exit the app. +* Fixed text rendering to be pixel-accurate; labels and console text are now + crisper and don't have any missing pixels (need to test on more graphics + chipsets.) +* Updated parser to handle negative numbers. Big oops. +* Corrected errors and omissions in extrasolar planets catalog. +* Added locations menu for saving and recalling favorite places. +* Added intro message. +* Removed stars without spectral class info from database. +* Included support for cloud maps +* Added extrasolar planets from the ESO's April 4th announcement +* Axial rotation for stars +* Alleviated clipping of very distant stars (Deneb was missing from Earth's + sky due to this bug.) +* Increased depth buffer precision for planet rendering--this should improve + the quality of rendering with 16-bit z buffers +* Added option to render constellation diagrams +* Use strips instead of lists for rendering spheres +* Enabled keyboard control of zoom with home and end +* Implemented basics of linear scripting system +* Run a script at startup; the script filename can be set in the config file + +Code revisions: +* Converted Simulation class to use Julian days instead of seconds as internal + time units. +* Eliminated brain damaged observer methods in Simulation +* Cleaned up Console class + + +1.07 +* More corrections to planetary orbital calculations +* Accept LongOfPericenter as well ArgOfPericenter in solar system catalog files +* Updated parser to accept C-style string escapes +* Render the Milky Way and other galaxies +* Added more constellations +* Display constellation names +* Cleaned up render menu +* Added FPS counter +* Implemented basic WWW info feature for planets and stars +* New script commands: renderflags, labels, orbit +* Implemented a scripted demo mode +* Placed ISS in Earth orbit diff --git a/NEWS b/NEWS new file mode 100644 index 000000000..e69de29bb diff --git a/README b/README new file mode 100644 index 000000000..62cc1f9f9 --- /dev/null +++ b/README @@ -0,0 +1,219 @@ +Celestia: A real-time visual space simulation + +Copyright (C) 2001, Chris Laurel + +-- + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +USA. + +-- + +Getting started: + +Important: Celestia must be started from the directory in which the EXE +resides or else it will not find its data files. A real installer is +forthcoming. + +Celestia will start up in a window, and if everything is working +correctly, you'll see the asteroid Eros moving past a field of +stars. In the left corner is a welcome message and some information +about your target (Eros), your speed, and the current time (Universal +Time, so it'll probably be a few hours off from your computer's clock.) +Right drag the mouse to orbit Eros and you should see the Earth and some +familiar constellations. Left dragging the mouse changes your +orientation too, but the camera rotates about its center instead of +rotating around Eros. Rolling the mouse wheel will change your distance +to the space station--you can move light years away, then roll the wheel +in the opposite direction to get back to your starting location. If your +mouse lacks a wheel, you can use the Home and End keys instead. + +In Celestia, you'll generally have an object selected; currently, +it's Eros, but it could also be a star, planet, spacecraft, or galaxy. +The simplest way to select an object is to click on it. Try clicking +on a star to select it. The information about Eros is replaced with +some details about the star. Press G (or use the navigation menu), +and you'll zoom through space toward the selected star. If you +press G again, you'll approach the star even closer. + +Press H to select our Sun, and then G to go back to our solar system. +You'll find yourself half a light year away from the sun, which looks +merely like a bright star at this range. Press G three more times to +get within about 30 AU of the sun and you will be to see a few become +visible near the sun. Right click on the sun to bring up a menu of +planets and other objects in the solar system. After selecting a planet +from the menu, hit G again to travel toward it. Once there, hold down +the right mouse button and drag to orbit the planet. + +That covers the very basics . . . + + +MOUSE FUNCTIONS: + +Left drag to orient camera +Right drag to orbit the selected object +Use the mouse wheel to adjust distance to selection + (for wheelless mice, dragging while holding left and right + buttons or left dragfing while holding control to dolly camera + will adjust distance) +Left drag while holding shift to zoom +Click the wheel to reset the field of view to 45 degrees +Left-click to select; double click to center selection +Right-click to bring up planets menu + +KEYBOARD COMMANDS + +Navigation: +H : Select the sun (Home) +C : Center on selected object +G : Goto selected object +F : Follow selected object +ESC: Cancel motion + +Free movement: +HOME : Move closer to object +END : Move farther from object +F1 : Stop +F2 : Set velocity to 1 km/s +F3 : Set velocity to 1,000 km/s +F4 : Set velocity to 1,000,000 km/s +F5 : Set velocity to 1 AU/s +F6 : Set velocity to 1 ly/s +A : Increase velocity by 10x +Z : Decrease velocity by 10x +Q : Reverse direction +X : Set movement direction toward center of screen + +Time: +Space : stop time +L : Time 10x faster +K : Time 10x slower +J : Reverse time + +Options: +U : Toggle galaxy rendering +N : Toggle planet and moon labels +O : Toggle planet orbits +V : Toggle HUD Text +I : Toggle planet atmospheres (cloud textures) +W : Toggle wireframe mode +/ : Toggle constellation diagrams += : Toggle constellation labels +B : Toggle star labels +P : Toggle per-pixel lighting (if supported) +[ : Decrease limiting magnitude (fewer stars visible) +] : Increase limiting magnitude (more stars visible) + +Other: +D : Run demo +` : Show frames rendered per second + +It's possible to choose a star or planet by name. There are two ways to +enter a star name: choose 'Select Object' from the Navigation menu to +bring up a dialog box, or by hitting Enter, typing in the name, and +pressing Enter again. You can use common names, or Bayer designations +and HD catalog numbers for stars. Bayer and Flamsteed designations need +to be entered like this: + Upsilon And + 51 Peg +The constellation must be given as a three letter abbreviation and the +full Greek letter name spelled out. Irritating, but it'll be fixed. +HD catalog numbers must be entered with a space between HD and the number. + +Celestia handles star catalog numbers in a slightly kludgy way. To keep the +star database size to minimum, only one catalog number is stored. Normally, +this will a number from the HD catalog, but if a star isn't in the HD catalog +the number from another catalog will be used instead. Currently, the secondary +catalog is always the HIPPARCOS data set, for which the prefix "HIP" should be +used. + + +Basic Hacking Tips: + +It's possible to modify the solarsys.ssc, stars.dat, and hdnames.dat +files to create an entirely fictional universe. + +The easiest file to modify is the solar system catalog, as it's a text +file and the format is very text-editor friendly since that's how I +had to enter all the data. It's also quite verbose, but that's not a +problem yet. + +The units used for the solar system data may not be obvious. All +angle fields in the catalog are in degrees. For planets, the period +is specified in earth years, and the semi-major axis in AU; for +satellites, days and kilometers are used instead. + +All solar system textures should be placed in the textures +subdirectory. Currently, JPEG and BMP are the only formats supported. +Models belong in the models directory. Celestia can read 3DS models, +as well as a custom format (.cms files, used right now just for rough +fractal displacement map likenesses of asteroids and small moons.) 3DS +meshes are normalized to fit within a unit cube--the Radius field +determines how big they appear within Celestia. + +The stars.dat file is a binary database of stars, processed from +the 50+ meg HIPPARCOS data set. The first four bytes are an int +containing the number of stars in the database. Following that +are a bunch of records of this form: + +4 byte int : catalog number +4 byte float : right ascension +4 byte float : declination +4 byte float : parallax +2 byte int : apparent magnitude +2 byte int : stellar class +1 byte : parallax error + +RA, declination, and parallax are converted to x, y, z coordinates +and apparent magnitude is converted to absolute magnitude when the +database is read. + + +Credits and Copyrights: + +Most of the planet maps are from David Seal's site: http://maps.jpl.nasa.gov/. +A few of these maps were modified by me, with fictional terrain added +to fill in gaps. The model of the Galileo spacecraft is also from +David Seal's site (though it was converter from Inventor to 3DS format.) + +The Mars, Moon, and Pluto textures and bump maps are all from James +Hastings-Trew's collection. Some of the prettiest planet maps around +are at http://apollo.spaceports.com/~jhasting/ + +The Venus, Saturn, and Saturn's rings textures are from Bjorn Jonsson. +His site is http://www.mmedia.is/~bjj/ and is an excellent resource +for solar system rendering. + +3D asteroid models of Toutatis, Kleopatra, and Geographos are courtesy of +Scott Hudson, Washington State University. His site is: +http://www.eecs.wsu.edu/~hudson/Research/Asteroids/4179/index.html + +3D models of Phobos, Deimos, Amalthea, Proteus, Vesta, Ida, +Mathilde, and Gaspra are derived from Phil Stooke's Cartography of +Non-Spherical Worlds: http://publish.uwo.ca/~pjstooke/plancart.htm + +The texture font library I use for displaying text in OpenGL is +copyright Mark Kilgard. + +The Intel JPEG library (ijl10.dll) is copyright Intel Corp. + +The star database (stars.dat) was derived from the HIPPARCOS data set. + + +Chris Laurel +claurel@shatters.net +http://www.shatters.net/~claurel +and +http://www.shatters.net/celestia/ diff --git a/src/glutmain.cpp b/src/glutmain.cpp index e12affbde..b78bb3e49 100644 --- a/src/glutmain.cpp +++ b/src/glutmain.cpp @@ -221,9 +221,6 @@ static void AddFavorite(string name) } - - - void CancelScript() { if (runningScript != NULL) @@ -442,6 +439,14 @@ void Idle(void) double lastTime = currentTime; currentTime = timer->getTime(); double dt = currentTime - lastTime; + + if (runningScript != NULL) + { + bool finished = runningScript->tick(dt); + if (finished) + CancelScript(); + } + sim->update(dt); Display(); @@ -543,6 +548,10 @@ void KeyPress(unsigned char c, int x, int y) case '\r': textEnterMode = true; break; + case '\e': + CancelScript(); + textEnterMode = false; + break; case 'A': if (sim->getTargetSpeed() == 0) sim->setTargetSpeed(0.000001f); @@ -709,6 +718,32 @@ void KeyPress(unsigned char c, int x, int y) } +void SpecialKeyPress(int key, int x, int y) +{ + switch (key) + { + case GLUT_KEY_F1: + sim->setTargetSpeed(0); + break; + case GLUT_KEY_F2: + sim->setTargetSpeed(astro::kilometersToLightYears(1.0)); + break; + case GLUT_KEY_F3: + sim->setTargetSpeed(astro::kilometersToLightYears(1000.0)); + break; + case GLUT_KEY_F4: + sim->setTargetSpeed(astro::kilometersToLightYears(1000000.0)); + break; + case GLUT_KEY_F5: + sim->setTargetSpeed(astro::AUtoLightYears(1)); + break; + case GLUT_KEY_F6: + sim->setTargetSpeed(1); + break; + } +} + + int main(int argc, char* argv[]) { // Say we're not ready to render yet. @@ -822,6 +857,7 @@ int main(int argc, char* argv[]) glutMouseFunc(MouseButton); glutMotionFunc(MouseDrag); glutKeyboardFunc(KeyPress); + glutSpecialFunc(SpecialKeyPress); timer = CreateTimer(); renderer = new Renderer();