spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Added extended info field to Star class 

- Implemented star catalog cross indexes
- Use a cross index to store HD catalog numbers instead of storing them directly in Star instances
ver1_5_1
Chris Laurel 2004-09-09 07:34:50 +00:00
parent e63fc443bc
commit f1d7f7dcf0
5 changed files with 124 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
src/celestia/celestiacore.cpp
View File

@ -64,7 +64,7 @@ static float KeyRotationAccel = degToRad(120.0f);
static float MouseRotationSensitivity = degToRad(1.0f);
static const int ConsolePageRows = 10;
static Console console(100, 120);
static Console console(200, 120);
static void warning(string s)
@ -242,7 +242,7 @@ bool View::walkTreeResizeDelta(View* v, float delta, bool check)
newSize = v->height * ratio;
if (newSize <= .1) return false;
if (check) return true;
v->height = newSize;
v->height = (float) newSize;
if (sign == 1)
{
v->y = p->y + (v->y - p->y) * ratio;
@ -258,7 +258,7 @@ bool View::walkTreeResizeDelta(View* v, float delta, bool check)
newSize = v->width * ratio;
if (newSize <= .1) return false;
if (check) return true;
v->width = newSize;
v->width = (float) newSize;
if (sign == 1)
{
v->x = p->x + (v->x - p->x) * ratio;
@ -2561,40 +2561,23 @@ static void displayAcronym(Overlay& overlay, char* s)
}
static void displayStarNames(Overlay& overlay,
Star& star,
StarDatabase& starDB,
int maxNames = 10)
static void displayStarName(Overlay& overlay,
Star& star,
StarDatabase& starDB)
{
StarNameDatabase::NumberIndex::const_iterator iter =
starDB.getStarNames(star.getCatalogNumber());
int count = 0;
while (iter != starDB.finalName() &&
iter->first == star.getCatalogNumber() &&
count < maxNames)
if (iter != starDB.finalName() &&
iter->first == star.getCatalogNumber())
{
if (count != 0)
overlay << " / ";
overlay << ReplaceGreekLetterAbbr(iter->second);
iter++;
count++;
return;
}
uint32 hd = star.getCatalogNumber(Star::HDCatalog);
uint32 hip = star.getCatalogNumber(Star::HIPCatalog);
if (hd != Star::InvalidCatalogNumber && hd != 0 && count < maxNames)
uint32 hip = star.getCatalogNumber();
if (hip != Star::InvalidCatalogNumber && hip != 0)
{
if (count != 0)
overlay << " / ";
overlay << "HD " << hd;
count++;
}
if (hip != Star::InvalidCatalogNumber && hip != 0 && count < maxNames)
{
if (count != 0)
overlay << " / ";
if (hip >= 1000000)
{
uint32 tyc3 = hip / 1000000000;
@ -2605,9 +2588,80 @@ static void displayStarNames(Overlay& overlay,
overlay << "TYC " << tyc1 << '-' << tyc2 << '-' << tyc3;
}
else
{
overlay << "HIP " << hip;
}
}
}
static string starNameList(Star& star,
StarDatabase& starDB,
int maxNames = 10)
{
string starNames;
char numString[32];
StarNameDatabase::NumberIndex::const_iterator iter =
starDB.getStarNames(star.getCatalogNumber());
int count = 0;
while (iter != starDB.finalName() &&
iter->first == star.getCatalogNumber() &&
count < maxNames)
{
if (count != 0)
starNames += " / ";
starNames += ReplaceGreekLetterAbbr(iter->second);
iter++;
count++;
}
uint32 hip = star.getCatalogNumber();
if (hip != Star::InvalidCatalogNumber && hip != 0 && count < maxNames)
{
if (count != 0)
starNames += " / ";
if (hip >= 1000000)
{
uint32 tyc3 = hip / 1000000000;
hip -= tyc3 * 1000000000;
uint32 tyc2 = hip / 10000;
hip -= tyc2 * 10000;
uint32 tyc1 = hip;
sprintf(numString, "TYC %u-%u-%u", tyc1, tyc2, tyc3);
starNames += numString;
}
else
{
sprintf(numString, "HIP %u", hip);
starNames += numString;
}
count++;
}
uint32 hd = starDB.crossIndex(StarDatabase::HenryDraper, hip);
if (count < maxNames && hd != Star::InvalidCatalogNumber)
{
if (count != 0)
starNames += " / ";
sprintf(numString, "HD %u", hd);
starNames += numString;
}
uint32 sao = starDB.crossIndex(StarDatabase::SAO, hip);
if (count < maxNames && sao != Star::InvalidCatalogNumber)
{
if (count != 0)
starNames += " / ";
sprintf(numString, "SAO %u", sao);
starNames += numString;
}
return starNames;
}
@ -2793,7 +2847,7 @@ static void displaySelectionName(Overlay& overlay,
overlay << sel.deepsky()->getName();
break;
case Selection::Type_Star:
displayStarNames(overlay, *(sel.star()), *univ.getStarCatalog(), 1);
displayStarName(overlay, *(sel.star()), *univ.getStarCatalog());
break;
case Selection::Type_Location:
overlay << sel.location()->getName();
@ -3085,10 +3139,15 @@ void CelestiaCore::renderOverlay()
{
case Selection::Type_Star:
{
if (sel != lastSelection)
{
lastSelection = sel;
selectionNames = starNameList(*(sel.star()),
*(sim->getUniverse()->getStarCatalog()));
}
overlay->setFont(titleFont);
displayStarNames(*overlay,
*(sel.star()),
*(sim->getUniverse()->getStarCatalog()));
*overlay << selectionNames;
overlay->setFont(font);
*overlay << '\n';
displayStarInfo(*overlay,
@ -3730,6 +3789,24 @@ bool CelestiaCore::initRenderer()
}
static void loadCrossIndex(StarDatabase* starDB,
StarDatabase::Catalog catalog,
const string& filename)
{
if (!filename.empty())
{
ifstream xrefFile(filename.c_str(), ios::in | ios::binary);
if (xrefFile.good())
{
if (!starDB->loadCrossIndex(catalog, xrefFile))
cerr << "Error reading cross index " << filename << '\n';
else
clog << "Loaded cross index " << filename << '\n';
}
}
}
bool CelestiaCore::readStars(const CelestiaConfig& cfg)
{
ifstream starNamesFile(cfg.starNamesFile.c_str(), ios::in);
@ -3767,6 +3844,10 @@ bool CelestiaCore::readStars(const CelestiaConfig& cfg)
starDB->setNameDatabase(starNameDB);
loadCrossIndex(starDB, StarDatabase::HenryDraper, cfg.HDCrossIndexFile);
loadCrossIndex(starDB, StarDatabase::SAO, cfg.SAOCrossIndexFile);
loadCrossIndex(starDB, StarDatabase::Gliese, cfg.GlieseCrossIndexFile);
// Now, read supplemental star files from the extras directories
for (vector<string>::const_iterator iter = config->extrasDirs.begin();
iter != config->extrasDirs.end(); iter++)

3
src/celestia/celestiacore.h
View File

@ -408,6 +408,9 @@ class CelestiaCore // : public Watchable<CelestiaCore>
int screenDpi;
int distanceToScreen;
Selection lastSelection;
string selectionNames;
#ifdef CELX
friend View* getViewByObserver(CelestiaCore*, Observer*);
friend void getObservers(CelestiaCore*, std::vector<Observer*>&);

33
src/celestia/configfile.cpp
View File

@ -78,6 +78,9 @@ CelestiaConfig* ReadCelestiaConfig(string filename)
configParams->getString("DeepSkyCatalog", config->deepSkyCatalog);
configParams->getString("StarDatabase", config->starDatabaseFile);
configParams->getString("StarNameDatabase", config->starNamesFile);
configParams->getString("HDCrossIndex", config->HDCrossIndexFile);
configParams->getString("SAOCrossIndex", config->SAOCrossIndexFile);
configParams->getString("GlieseCrossIndex", config->GlieseCrossIndexFile);
configParams->getString("Font", config->mainFont);
configParams->getString("LabelFont", config->labelFont);
configParams->getString("TitleFont", config->titleFont);
@ -173,36 +176,6 @@ CelestiaConfig* ReadCelestiaConfig(string filename)
}
}
Value* xrefsVal = configParams->getValue("StarCatalogCrossReferences");
if (xrefsVal != NULL)
{
if (xrefsVal->getType() != Value::ArrayType)
{
DPRINTF(0, "%s: StarCatalogCrossReferences must be an array.\n", filename.c_str());
}
else
{
Array* xrefs = xrefsVal->getArray();
// assert(xrefs != NULL);
for (Array::iterator iter = xrefs->begin(); iter != xrefs->end(); iter++)
{
Value* xrefNameVal = *iter;
// assert(xrefNameVal != NULL);
if (xrefNameVal->getType() == Value::StringType)
{
config->catalogXrefFiles.insert(config->catalogXrefFiles.end(),
xrefNameVal->getString());
}
else
{
DPRINTF(0, "%s: Catalog cross reference name must be a string.\n",
filename.c_str());
}
}
}
}
Value* labelledStarsVal = configParams->getValue("LabelledStars");
if (labelledStarsVal != NULL)
{

5
src/celestia/configfile.h
View File

@ -17,7 +17,6 @@ struct CelestiaConfig
{
std::string starDatabaseFile;
std::string starNamesFile;
std::vector<std::string> catalogXrefFiles;
std::vector<std::string> solarSystemFiles;
std::vector<std::string> extrasDirs;
std::string deepSkyCatalog;
@ -41,6 +40,10 @@ struct CelestiaConfig
std::string scriptScreenshotDirectory;
std::string scriptSystemAccessPolicy;
std::string HDCrossIndexFile;
std::string SAOCrossIndexFile;
std::string GlieseCrossIndexFile;
// Renderer detail options
unsigned int shadowTextureSize;
unsigned int eclipseTextureSize;

3
src/celestia/eclipsefinder.cpp
View File

@ -127,8 +127,7 @@ int EclipseFinder::CalculateEclipses()
delete eclipse;
return 1;
}
else if ((sys->getStar()->getCatalogNumber(0) != 0)
&& (sys->getStar()->getCatalogNumber(1) != 0))
else if (sys->getStar()->getCatalogNumber() != 0)
{
eclipse = new Eclipse(0.);
eclipse->planete = "None";