MilkyWay.cpp   MilkyWay.cpp 
skipping to change at line 34 skipping to change at line 34
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.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 "StelTranslator.hpp"
#include <QDebug> #include <QDebug>
#include <QSettings> #include <QSettings>
// Class which manages the displaying of the Milky Way // Class which manages the displaying of the Milky Way
MilkyWay::MilkyWay() MilkyWay::MilkyWay()
: color(1.f, 1.f, 1.f) : color(1.f, 1.f, 1.f)
, intensity(1.) , intensity(1.)
, vertexArray() , vertexArray()
{ {
skipping to change at line 62 skipping to change at line 63
delete vertexArray; delete vertexArray;
vertexArray = NULL; vertexArray = NULL;
} }
void MilkyWay::init() void MilkyWay::init()
{ {
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
Q_ASSERT(conf); Q_ASSERT(conf);
tex = StelApp::getInstance().getTextureManager().createTexture(StelF ileMgr::getInstallationDir()+"/textures/milkyway_2048.png"); tex = StelApp::getInstance().getTextureManager().createTexture(StelF ileMgr::getInstallationDir()+"/textures/milkyway.png");
setFlagShow(conf->value("astro/flag_milky_way").toBool()); setFlagShow(conf->value("astro/flag_milky_way").toBool());
setIntensity(conf->value("astro/milky_way_intensity",1.f).toFloat()) ; setIntensity(conf->value("astro/milky_way_intensity",1.f).toFloat()) ;
// A new texture was provided by Fabien. Better resolution, but in e quatorial coordinates. I had to enhance it a bit, and shift it by 90 degree s. // A new texture was provided by Fabien. Better resolution, but in e quatorial coordinates. I had to enhance it a bit, and shift it by 90 degree s.
vertexArray = new StelVertexArray(StelPainter::computeSphereNoLight( 1.f,1.f,45,15,1, true)); // GZ orig: slices=stacks=20. vertexArray = new StelVertexArray(StelPainter::computeSphereNoLight( 1.f,1.f,45,15,1, true)); // GZ orig: slices=stacks=20.
vertexArray->colors.resize(vertexArray->vertex.length()); vertexArray->colors.resize(vertexArray->vertex.length());
vertexArray->colors.fill(Vec3f(1.0, 0.3, 0.9)); vertexArray->colors.fill(Vec3f(1.0, 0.3, 0.9));
QString displayGroup = N_("Display Options");
addAction("actionShow_MilkyWay", displayGroup, N_("Milky Way"), "fla
gMilkyWayDisplayed", "M");
} }
void MilkyWay::update(double deltaTime) void MilkyWay::update(double deltaTime)
{ {
fader->update((int)(deltaTime*1000)); 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;}
 End of changes. 3 change blocks. 
1 lines changed or deleted 6 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/