Stellarium

Merge lp:~alexwolf/stellarium/dso-marker into lp:stellarium

  1. dso-marker
  2. Merge into trunk
Proposed by Alexander Wolf
Status: Merged
Merged at revision: 4890
Proposed branch: lp:~alexwolf/stellarium/dso-marker
Merge into: lp:stellarium
Diff against target: 126 lines (+30/-3)
5 files modified
src/core/modules/Nebula.cpp (+17/-2)
src/core/modules/Nebula.hpp (+4/-0)
src/core/modules/NebulaMgr.cpp (+7/-0)
src/core/modules/NebulaMgr.hpp (+1/-0)
textures/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~alexwolf/stellarium/dso-marker
Reviewer Review Type Date Requested Status
Stellarium Pending
Review via email: mp+62670@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/core/modules/Nebula.cpp'
--- src/core/modules/Nebula.cpp 2010-04-15 12:28:34 +0000
+++ src/core/modules/Nebula.cpp 2011-05-27 13:25:47 +0000
@@ -1,6 +1,7 @@
1/*1/*
2 * Stellarium2 * Stellarium
3 * Copyright (C) 2002 Fabien Chereau3 * Copyright (C) 2002 Fabien Chereau
4 * Copyright (C) 2011 Alexander Wolf
4 *5 *
5 * This program is free software; you can redistribute it and/or6 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License7 * modify it under the terms of the GNU General Public License
@@ -36,6 +37,9 @@
36#include <QBuffer>37#include <QBuffer>
3738
38StelTextureSP Nebula::texCircle;39StelTextureSP Nebula::texCircle;
40StelTextureSP Nebula::texOpenCluster;
41StelTextureSP Nebula::texGlobularCluster;
42StelTextureSP Nebula::texPlanetNebula;
39float Nebula::circleScale = 1.f;43float Nebula::circleScale = 1.f;
40float Nebula::hintsBrightness = 0;44float Nebula::hintsBrightness = 0;
41Vec3f Nebula::labelColor = Vec3f(0.4,0.3,0.5);45Vec3f Nebula::labelColor = Vec3f(0.4,0.3,0.5);
@@ -136,8 +140,19 @@
136 glBlendFunc(GL_ONE, GL_ONE);140 glBlendFunc(GL_ONE, GL_ONE);
137 float lum = 1.f;//qMin(1,4.f/getOnScreenSize(core))*0.8;141 float lum = 1.f;//qMin(1,4.f/getOnScreenSize(core))*0.8;
138 sPainter.setColor(circleColor[0]*lum*hintsBrightness, circleColor[1]*lum*hintsBrightness, circleColor[2]*lum*hintsBrightness, 1);142 sPainter.setColor(circleColor[0]*lum*hintsBrightness, circleColor[1]*lum*hintsBrightness, circleColor[2]*lum*hintsBrightness, 1);
139 Nebula::texCircle->bind();143 if (nType == 1)
140 sPainter.drawSprite2dMode(XY[0], XY[1], 4);144 Nebula::texOpenCluster->bind();
145
146 if (nType == 2)
147 Nebula::texGlobularCluster->bind();
148
149 if (nType == 4)
150 Nebula::texPlanetNebula->bind();
151
152 if (nType != 1 && nType != 2 && nType != 4)
153 Nebula::texCircle->bind();
154
155 sPainter.drawSprite2dMode(XY[0], XY[1], 6);
141}156}
142157
143void Nebula::drawLabel(StelPainter& sPainter, float maxMagLabel)158void Nebula::drawLabel(StelPainter& sPainter, float maxMagLabel)
144159
=== modified file 'src/core/modules/Nebula.hpp'
--- src/core/modules/Nebula.hpp 2010-05-09 20:01:11 +0000
+++ src/core/modules/Nebula.hpp 2011-05-27 13:25:47 +0000
@@ -1,6 +1,7 @@
1/*1/*
2 * Stellarium2 * Stellarium
3 * Copyright (C) 2002 Fabien Chereau3 * Copyright (C) 2002 Fabien Chereau
4 * Copyright (C) 2011 Alexander Wolf
4 *5 *
5 * This program is free software; you can redistribute it and/or6 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License7 * modify it under the terms of the GNU General Public License
@@ -108,6 +109,9 @@
108 SphericalRegionP pointRegion;109 SphericalRegionP pointRegion;
109110
110 static StelTextureSP texCircle; // The symbolic circle texture111 static StelTextureSP texCircle; // The symbolic circle texture
112 static StelTextureSP texOpenCluster;
113 static StelTextureSP texGlobularCluster;
114 static StelTextureSP texPlanetNebula;
111 static float hintsBrightness;115 static float hintsBrightness;
112116
113 static Vec3f labelColor, circleColor;117 static Vec3f labelColor, circleColor;
114118
=== modified file 'src/core/modules/NebulaMgr.cpp'
--- src/core/modules/NebulaMgr.cpp 2011-01-29 18:14:28 +0000
+++ src/core/modules/NebulaMgr.cpp 2011-05-27 13:25:47 +0000
@@ -1,6 +1,7 @@
1/*1/*
2 * Stellarium2 * Stellarium
3 * Copyright (C) 2002 Fabien Chereau3 * Copyright (C) 2002 Fabien Chereau
4 * Copyright (C) 2011 Alexander Wolf
4 *5 *
5 * This program is free software; you can redistribute it and/or6 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License7 * modify it under the terms of the GNU General Public License
@@ -60,6 +61,9 @@
60NebulaMgr::~NebulaMgr()61NebulaMgr::~NebulaMgr()
61{62{
62 Nebula::texCircle = StelTextureSP();63 Nebula::texCircle = StelTextureSP();
64 Nebula::texOpenCluster = StelTextureSP();
65 Nebula::texGlobularCluster = StelTextureSP();
66 Nebula::texPlanetNebula = StelTextureSP();
63}67}
6468
65/*************************************************************************69/*************************************************************************
@@ -89,6 +93,9 @@
8993
90 nebulaFont.setPixelSize(13);94 nebulaFont.setPixelSize(13);
91 Nebula::texCircle = StelApp::getInstance().getTextureManager().createTexture("textures/neb.png"); // Load circle texture95 Nebula::texCircle = StelApp::getInstance().getTextureManager().createTexture("textures/neb.png"); // Load circle texture
96 Nebula::texOpenCluster = StelApp::getInstance().getTextureManager().createTexture("textures/ocl.png"); // Load open clister marker texture
97 Nebula::texGlobularCluster = StelApp::getInstance().getTextureManager().createTexture("textures/gcl.png"); // Load globular clister marker texture
98 Nebula::texPlanetNebula = StelApp::getInstance().getTextureManager().createTexture("textures/pnb.png"); // Load planetary nebula marker texture
92 texPointer = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur5.png"); // Load pointer texture99 texPointer = StelApp::getInstance().getTextureManager().createTexture("textures/pointeur5.png"); // Load pointer texture
93100
94 setFlagShow(conf->value("astro/flag_nebula",true).toBool());101 setFlagShow(conf->value("astro/flag_nebula",true).toBool());
95102
=== modified file 'src/core/modules/NebulaMgr.hpp'
--- src/core/modules/NebulaMgr.hpp 2011-01-29 18:14:28 +0000
+++ src/core/modules/NebulaMgr.hpp 2011-05-27 13:25:47 +0000
@@ -1,6 +1,7 @@
1/*1/*
2 * Stellarium2 * Stellarium
3 * Copyright (C) 2002 Fabien Chereau3 * Copyright (C) 2002 Fabien Chereau
4 * Copyright (C) 2011 Alexander Wolf
4 *5 *
5 * This program is free software; you can redistribute it and/or6 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License7 * modify it under the terms of the GNU General Public License
78
=== modified file 'textures/CMakeLists.txt'
--- textures/CMakeLists.txt 2011-05-10 06:55:17 +0000
+++ textures/CMakeLists.txt 2011-05-27 13:25:47 +0000
@@ -1,4 +1,4 @@
1########### install files ###############1########### install files ###############
22
3INSTALL(FILES amalthea.png proteus.png triton.png mercury.png venus.png earth-clouds.png earthmap.png mars.png jupiter.png saturn.png uranus.png neptune.png earth-shadow.png saturn_rings_radial.png lune.png phobos.png deimos.png io.png europa.png ganymede.png callisto.png mimas.png enceladus.png tethys.png dione.png rhea.png titan.png hyperion.png iapetus.png miranda.png ariel.png umbriel.png titania.png oberon.png fog.png milkyway.png fogridge.png neb.png halo.png pointeur2.png pointeur4.png pointeur5.png logo24bits.png star16x16.png sun.png nomap.png haloLune.png planet-indicator.png DESTINATION share/${PACKAGE}/textures)3INSTALL(FILES amalthea.png proteus.png triton.png mercury.png venus.png earth-clouds.png earthmap.png mars.png jupiter.png saturn.png uranus.png neptune.png earth-shadow.png saturn_rings_radial.png lune.png phobos.png deimos.png io.png europa.png ganymede.png callisto.png mimas.png enceladus.png tethys.png dione.png rhea.png titan.png hyperion.png iapetus.png miranda.png ariel.png umbriel.png titania.png oberon.png fog.png milkyway.png fogridge.png ocl.png gcl.png pnb.png neb.png halo.png pointeur2.png pointeur4.png pointeur5.png logo24bits.png star16x16.png sun.png nomap.png haloLune.png planet-indicator.png DESTINATION share/${PACKAGE}/textures)
44
55
=== added file 'textures/gcl.png'
6Binary files textures/gcl.png 1970-01-01 00:00:00 +0000 and textures/gcl.png 2011-05-27 13:25:47 +0000 differ6Binary files textures/gcl.png 1970-01-01 00:00:00 +0000 and textures/gcl.png 2011-05-27 13:25:47 +0000 differ
=== added file 'textures/ocl.png'
7Binary files textures/ocl.png 1970-01-01 00:00:00 +0000 and textures/ocl.png 2011-05-27 13:25:47 +0000 differ7Binary files textures/ocl.png 1970-01-01 00:00:00 +0000 and textures/ocl.png 2011-05-27 13:25:47 +0000 differ
=== added file 'textures/pnb.png'
8Binary files textures/pnb.png 1970-01-01 00:00:00 +0000 and textures/pnb.png 2011-05-27 13:25:47 +0000 differ8Binary files textures/pnb.png 1970-01-01 00:00:00 +0000 and textures/pnb.png 2011-05-27 13:25:47 +0000 differ