MilkyWay.cpp   MilkyWay.cpp 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA.
*/ */
#include "MilkyWay.hpp" #include "MilkyWay.hpp"
#include "StelFader.hpp" #include "StelFader.hpp"
#include "StelTexture.hpp" #include "StelTexture.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "StelNavigator.hpp"
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "StelToneReproducer.hpp" #include "StelToneReproducer.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelTextureMgr.hpp" #include "StelTextureMgr.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
#include "StelPainter.hpp" #include "StelPainter.hpp"
#include <QDebug> #include <QDebug>
#include <QSettings> #include <QSettings>
skipping to change at line 71 skipping to change at line 71
vertexArray = new StelVertexArray(StelPainter::computeSphereNoLight( 1.f,1.f,20,20,1)); vertexArray = new StelVertexArray(StelPainter::computeSphereNoLight( 1.f,1.f,20,20,1));
} }
void MilkyWay::update(double deltaTime) {fader->update((int)(deltaTime*1000 ));} void MilkyWay::update(double deltaTime) {fader->update((int)(deltaTime*1000 ));}
void MilkyWay::setFlagShow(bool b){*fader = b;} void MilkyWay::setFlagShow(bool b){*fader = b;}
bool MilkyWay::getFlagShow() const {return *fader;} bool MilkyWay::getFlagShow() const {return *fader;}
void MilkyWay::draw(StelCore* core) void MilkyWay::draw(StelCore* core)
{ {
StelNavigator* nav = core->getNavigator(); StelProjector::ModelViewTranformP transfo = core->getJ2000ModelViewT
const StelProjectorP prj = core->getProjection(nav->getJ2000ModelVie ransform();
wMat()* transfo->combine(Mat4d::xrotation(M_PI/180.*23.)*
Mat4d::xrotation(M_PI/180*23)* Mat4d::yrotation(M_PI/180.*120.)*
Mat4d::yrotation(M_PI/180*120)* Mat4d::zrotation(M_PI/180.*7.));
Mat4d::zrotation(M_PI/180*7));
const StelProjectorP prj = core->getProjection(transfo);
StelToneReproducer* eye = core->getToneReproducer(); StelToneReproducer* eye = core->getToneReproducer();
Q_ASSERT(tex); // A texture must be loaded before calling this Q_ASSERT(tex); // A texture must be loaded before calling this
// This RGB color corresponds to the night blue scotopic color = 0.2 5, 0.25 in xyY mode. // This RGB color corresponds to the night blue scotopic color = 0.2 5, 0.25 in xyY mode.
// since milky way is always seen white RGB value in the texture (1. 0,1.0,1.0) // since milky way is always seen white RGB value in the texture (1. 0,1.0,1.0)
Vec3f c; Vec3f c;
if (StelApp::getInstance().getVisionModeNight()) if (StelApp::getInstance().getVisionModeNight())
c = Vec3f(0.34165f, 0.f, 0.f); c = Vec3f(0.34165f, 0.f, 0.f);
else else
 End of changes. 2 change blocks. 
7 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/