← Back to branch summary

~stellarium/stellarium/trunk

« back to all changes in this revision

Viewing changes to src/stel_object.cpp

  • Committer: xalioth
  • Date: 2003-05-28 21:44:07 UTC
  • Revision ID: vcs-imports@canonical.com-20030528214407-62hf94ipa2tdjgz9
Fixed many things : planets, nebula info, navigation, drawing bugs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/stel_object.cpp
43
43
{
44
44
        local_time+=delta_time;
45
45
        double x,y;
46
 
        Vec3d pos=get_equ_pos();
 
46
        Vec3d pos=get_earth_equ_pos();
47
47
        Project(pos[0],pos[1],pos[2],x,y);
48
48
    setOrthographicProjection(global.X_Resolution, global.Y_Resolution);
49
 
    glPushMatrix();
50
 
    glLoadIdentity();
51
49
 
52
50
        if (get_type()==STEL_OBJECT_NEBULA) glColor3f(0.4f,0.5f,0.8f);
53
51
        if (get_type()==STEL_OBJECT_PLANET) glColor3f(1.0f,0.3f,0.3f);
128
126
            glTexCoord2f(0.0f,1.0f);    glVertex3f(-10,10,0);       //Haut Gauche
129
127
        glEnd ();
130
128
    }
131
 
    glPopMatrix();
 
129
 
132
130
    resetPerspectiveProjection();
133
131
 
134
132
}
139
137
{
140
138
        stel_object * sobj = NULL;
141
139
 
142
 
        //if (global.FlagPlanets)
143
 
        //      sobj = Sun->search(v);
144
 
 
 
140
        if (global.FlagPlanets) sobj = Sun->search(v);
145
141
        if (sobj) return sobj;
146
142
 
147
143
        Vec3f u=Vec3f(v[0],v[1],v[2]);
149
145
        sobj = messiers->search(u);
150
146
        if (sobj) return sobj;
151
147
 
152
 
        if (global.FlagStars)
153
 
                sobj = HipVouteCeleste->search(u);
 
148
        if (global.FlagStars) sobj = HipVouteCeleste->search(u);
154
149
 
155
150
        return sobj;
156
151
}
172
167
{
173
168
        sprintf(s,"No info for this object...");
174
169
}
175
 
 
176
 
/*
177
 
char * stel_object::get_info_string(char * s)
178
 
{
179
 
        if (type==0)  //Star
180
 
    {
181
 
                glColor3f(0.4f,0.7f,0.3f);
182
 
        sprintf(objectInfo,"Info : %s\nName :%s\nHip : %.4d\nRA  : %.2dh %.2dm %.2fs\nDE  : %.2fdeg\nMag : %.2f",
183
 
            global.SelectedObject.CommonName==NULL ? "-" : global.SelectedObject.CommonName,
184
 
            global.SelectedObject.Name==NULL ? "-" : global.SelectedObject.Name,
185
 
            global.SelectedObject.HR,
186
 
            global.SelectedObject.RAh,global.SelectedObject.RAm,global.SelectedObject.RAs,
187
 
            global.SelectedObject.DE*180/PI,
188
 
            global.SelectedObject.Mag);
189
 
    }
190
 
    if (type==1)  //Nebulae
191
 
    {   glColor3f(0.4f,0.5f,0.8f);
192
 
        sprintf(objectInfo,"Name: %s\nNGC : %d\nRA  : %.2dh %.2dm %.2fs\nDE  : %.2fdeg\nMag : %.2f",
193
 
            global.SelectedObject.Name,
194
 
            global.SelectedObject.NGCNum,
195
 
            global.SelectedObject.RAh,global.SelectedObject.RAm,global.SelectedObject.RAs,
196
 
            global.SelectedObject.DE*180/PI,
197
 
            global.SelectedObject.Mag);
198
 
    }
199
 
    if (type==2)  //Planet
200
 
    {   glColor3f(1.0f,0.3f,0.3f);
201
 
        sprintf(objectInfo,"Name: %s\nRA  : %.2dh %.2dm %.2fs\nDE  : %.2fdeg\nDistance : %.4f AU",
202
 
            global.SelectedObject.Name,
203
 
            global.SelectedObject.RAh,global.SelectedObject.RAm,global.SelectedObject.RAs,
204
 
            global.SelectedObject.DE*180/PI,
205
 
            global.SelectedObject.Distance);
206
 
    }
207
 
}
208
 
*/