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

Added support for loading stars from text files in extras directory.

ver1_5_1
Chris Laurel 2002-05-08 08:02:57 +00:00
parent a57c4005d9
commit e5308d265f
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/celestia/celestiacore.cpp
View File

@ -1538,7 +1538,7 @@ bool CelestiaCore::initSimulation()
{
fatalError("Cannot read star database.");
return false;
}
}
{
// First read the solar system files listed individually in the
@ -1759,13 +1759,6 @@ bool CelestiaCore::readStars(const CelestiaConfig& cfg)
return false;
}
StarDatabase* starDB = StarDatabase::read(starFile);
if (starDB == NULL)
{
cerr << "Error reading stars file\n";
return false;
}
StarNameDatabase* starNameDB = StarNameDatabase::readNames(starNamesFile);
if (starNameDB == NULL)
{
@ -1773,6 +1766,42 @@ bool CelestiaCore::readStars(const CelestiaConfig& cfg)
return false;
}
// StarDatabase* starDB = StarDatabase::read(starFile);
StarDatabase* starDB = new StarDatabase();
if (!starDB->loadBinary(starFile))
{
delete starDB;
cerr << "Error reading stars file\n";
return false;
}
// Now, read supplemental star files from the extras directory
if (config->extrasDir != "")
{
Directory* dir = OpenDirectory(config->extrasDir);
string filename;
while (dir->nextFile(filename))
{
if (DetermineFileType(filename) == Content_CelestiaStarCatalog)
{
string fullname = config->extrasDir + '/' + filename;
ifstream starFile(fullname.c_str(), ios::in);
if (starFile.good())
{
bool success = starDB->load(starFile);
if (!success)
{
DPRINTF(0, "Error reading star file: %s\n",
fullname.c_str());
}
}
}
}
}
starDB->finish();
starDB->setNameDatabase(starNameDB);
universe->setStarCatalog(starDB);