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

Centered the constellation labels.

ver1_5_1
Vincent Giangiulio 2007-06-25 21:31:40 +00:00
parent 02d2b27bfc
commit d6681c006e
3 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
data/asterisms.dat
View File

@ -1,8 +1,8 @@
"Andromeda"
[
[ "Beta And" "Upsilon And" "Almach" ]
[ "Beta And" "Delta And" "Alpha And" ]
[ "Beta And" "Mu And" "Nu And" ]
[ "Beta And" "Upsilon And" "Almach" ]
[ "Upsilon And" "51 And" ]
]
@ -126,7 +126,7 @@
"Circinus"
[
[ "Gamma Cir" "Alpha Cir" "Beta Cir" ]
[ "Beta Cir" "Alpha Cir" "Gamma Cir" ]
]
"Columba"
@ -207,8 +207,8 @@
"Gemini"
[
[ "1 Gem" "Eta Gem" "Mu Gem" "Epsilon Gem" "Tau Gem" "Rho Gem" "Alpha Gem" ]
[ "Beta Gem" "Upsilon Gem" "Delta Gem" "Zeta Gem" "Gamma Gem" ]
[ "1 Gem" "Eta Gem" "Mu Gem" "Epsilon Gem" "Tau Gem" "Rho Gem" "Alpha Gem" ]
[ "Delta Gem" "Lambda Gem" "51 Gem" "Xi Gem"]
[ "Nu Gem" "Epsilon Gem" ]
[ "Tau Gem" "Theta Gem" ]
@ -224,10 +224,10 @@
"Hercules"
[
[ "Pi Her" "Epsilon Her" "Zeta Her" ]
[ "Phi Her" "Sigma Her" "Eta Her" "Zeta Her" "Beta Her" "Gamma Her" ]
[ "Beta Her" "Alpha Her" ]
[ "Iota Her" "Theta Her" "Rho Her" "Pi Her" "Eta Her" ]
[ "Pi Her" "Epsilon Her" "Zeta Her" ]
[ "Epsilon Her" "Delta Her" "Lambda Her" "Mu Her" "Xi Her" "Omicron Her" "Nu Her" ]
[ "Omicron Her" "109 Her" "110 Her" "111 Her" ]
[ "109 Her" "102 Her" ]
@ -240,7 +240,9 @@
"Hydra"
[
[ "Pi Hya" "Gamma Hya" "Beta Hya" "Xi Hya" "Nu Hya" "Mu Hya" "Lambda Hya" "Upsilon2 Hya" "Upsilon1 Hya" "Alpha Hya" "Iota Hya" "Theta Hya" "Zeta Hya" "Eta Hya" "Sigma Hya" "Delta Hya" "Epsilon Hya" "Zeta Hya" ]
[ "Gamma Hya" "Beta Hya" "Xi Hya" ]
[ "Pi Hya" "Gamma Hya" ]
[ "Xi Hya" "Nu Hya" "Mu Hya" "Lambda Hya" "Upsilon2 Hya" "Upsilon1 Hya" "Alpha Hya" "Iota Hya" "Theta Hya" "Zeta Hya" "Eta Hya" "Sigma Hya" "Delta Hya" "Epsilon Hya" "Zeta Hya" ]
]
"Hydrus"
@ -280,8 +282,8 @@
"Libra"
[
[ "48 Lib" "Theta Lib" "Eta Lib" "Gamma Lib" "Beta Lib" "Alpha2 Lib" "Sigma Lib" "Upsilon Lib" "Tau Lib" ]
[ "Sigma Lib" "Beta Lib" ]
[ "48 Lib" "Theta Lib" "Eta Lib" "Gamma Lib" "Beta Lib" "Alpha2 Lib" "Sigma Lib" "Upsilon Lib" "Tau Lib" ]
]
"Lupus"
@ -335,15 +337,16 @@
"Ophiuchus"
[
[ "45 Oph" "Theta Oph" "44 Oph" "Xi Oph" "Eta Oph" "Zeta Oph" "Epsilon Oph" "Delta Oph" "Kappa Oph" "Alpha Oph" "Beta Oph" "Eta Oph" ]
[ "Kappa Oph" "Alpha Oph" "Beta Oph" "Eta Oph" ]
[ "45 Oph" "Theta Oph" "44 Oph" "Xi Oph" "Eta Oph" "Zeta Oph" "Epsilon Oph" "Delta Oph" "Kappa Oph" ]
[ "Beta Oph" "Gamma Oph" "67 Oph" "70 Oph" ]
[ "Gamma Oph" "Nu Oph" ]
]
"Orion"
[
[ "Chi2 Ori" "Nu Ori" "Xi Ori" "68 Ori" ]
[ "Xi Ori" "Mu Ori" "Alpha Ori" "Zeta Ori" "Kappa Ori" "Beta Ori" "Delta Ori" "Gamma Ori" "Lambda Ori" "Alpha Ori" ]
[ "Chi2 Ori" "Nu Ori" "Xi Ori" "68 Ori" ]
[ "Gamma Ori" "Pi3 Ori" "Pi4 Ori" "Pi5 Ori" "Pi6 Ori" ]
[ "Pi3 Ori" "Pi2 Ori" "Pi1 Ori" ]
]
@ -414,6 +417,7 @@
"Sagittarius"
[
[ "Phi Sgr" "Delta Sgr" ]
[ "Beta2 Sgr" "Iota Sgr" "Alpha Sgr" ]
[ "Iota Sgr" "Theta1 Sgr" "Theta2 Sgr" "62 Sgr" "59 Sgr" "52 Sgr" "Psi Sgr" "Tau Sgr" "Zeta Sgr" "Phi Sgr" "Sigma Sgr" "Tau Sgr" ]
[ "Sigma Sgr" "Omicron Sgr" "Pi Sgr" "53 Sgr" "Rho1 Sgr" ]
@ -422,13 +426,12 @@
[ "Lambda Sgr" "Delta Sgr" "Epsilon Sgr" "Eta Sgr" ]
[ "Delta Sgr" "Gamma Sgr" "3 Sgr" ]
[ "Zeta Sgr" "Epsilon Sgr" "Gamma Sgr" ]
[ "Phi Sgr" "Delta Sgr" ]
]
"Scorpius"
[
[ "Beta2 Sco" "Omega1 Sco" "Nu Sco" "11 Sco" "Beta2 Sco" "Delta Sco" "Pi Sco" "Rho Sco" ]
[ "Delta Sco" "Sigma Sco" "Alpha Sco" "Tau Sco" "Epsilon Sco" "Mu Sco" "Zeta Sco" "Eta Sco" "Theta Sco" "Iota1 Sco" "Kappa Sco" "Lambda Sco" ]
[ "Beta2 Sco" "Omega1 Sco" "Nu Sco" "11 Sco" "Beta2 Sco" "Delta Sco" "Pi Sco" "Rho Sco" ]
[ "Iota1 Sco" "G Sco" ]
]
@ -450,7 +453,8 @@
"Serpens Cauda"
[
[ "Theta Ser" "Eta Ser" "Omicron Ser" "Xi Ser" "Nu Ser" ]
[ "Nu Ser" "Xi Ser" "Omicron Ser" ]
[ "Omicron Ser" "Eta Ser" "Theta Ser" ]
]
"Sextans"
@ -468,7 +472,8 @@
"Telescopium"
[
[ "Epsilon Tel" "Alpha Tel" "Zeta Tel" ]
[ "Zeta Tel" "Alpha Tel" ]
[ "Alpha Tel" "Epsilon Tel" ]
]
"Triangulum"
@ -478,7 +483,7 @@
"Triangulum Australe"
[
[ "Alpha TrA" "Beta TrA" "Epsilon TrA" "Gamma TrA" "Alpha TrA" ]
[ "Beta TrA" "Epsilon TrA" "Gamma TrA" "Alpha TrA" "Beta TrA" ]
]
"Tucana"

26
src/celengine/render.cpp
View File

@ -1679,13 +1679,13 @@ void Renderer::render(const Observer& observer,
disableSmoothLines();
}
renderLabels(FontNormal);
renderLabels(FontNormal, AlignLeft);
clearLabels();
if ((labelMode & ConstellationLabels) != 0 && universe.getAsterisms() != NULL)
{
labelConstellations(*universe.getAsterisms(), observer);
renderLabels(FontLarge);
renderLabels(FontLarge, AlignCenter);
clearLabels();
}
@ -1700,7 +1700,7 @@ void Renderer::render(const Observer& observer,
(*iter)->keep = false;
}
renderLabels(FontNormal);
renderLabels(FontNormal, AlignLeft);
glPolygonMode(GL_FRONT, (GLenum) renderMode);
glPolygonMode(GL_BACK, (GLenum) renderMode);
@ -7405,7 +7405,7 @@ void Renderer::renderParticles(const vector<Particle>& particles,
}
void Renderer::renderLabels(FontStyle fs)
void Renderer::renderLabels(FontStyle fs, LabelAlignment la)
{
if (font[fs] == NULL)
return;
@ -7430,9 +7430,21 @@ void Renderer::renderLabels(FontStyle fs)
{
glColor(labels[i].color);
glPushMatrix();
glTranslatef((int) labels[i].position.x + PixelOffset + 2.0f,
(int) labels[i].position.y + PixelOffset,
0.0f);
int labelOffset = 2;
if (la == AlignCenter)
{
int labelwidth = (font[fs]->getWidth(labels[i].text));
labelOffset = (int) -labelwidth/2;
}
else if (la == AlignRight)
{
int labelwidth = (font[fs]->getWidth(labels[i].text));
labelOffset = (int) -(labelwidth + 2);
}
glTranslatef((int) labels[i].position.x + GLfloat((int) labelOffset) + PixelOffset,
(int) labels[i].position.y + PixelOffset, 0.0f);
// EK TODO: Check where to replace (see '_(' above)
font[fs]->render(labels[i].text);
glPopMatrix();

9
src/celengine/render.h
View File

@ -208,6 +208,13 @@ class Renderer
void setFont(FontStyle, TextureFont*);
TextureFont* getFont(FontStyle) const;
enum LabelAlignment
{
AlignCenter,
AlignLeft,
AlignRight
};
public:
// Internal types
// TODO: Figure out how to make these private. Even with a friend
@ -463,7 +470,7 @@ class Renderer
const Observer& observer);
void renderParticles(const std::vector<Particle>& particles,
Quatf orientation);
void renderLabels(FontStyle fs);
void renderLabels(FontStyle fs, LabelAlignment la);
std::vector<Label>::iterator renderSortedLabels(std::vector<Label>::iterator,
float depth,
FontStyle fs);