Merge lp:~guillaume-chereau/stellarium/nomenclature-optimization into lp:stellarium

[Alexander Wolf]

[gzotti (georg-zotti)]

Sorry, I may have caused the merge conflict. The long/lat->Vec3d XYZpc computation is done in the constructor, and a rotation matrix added to the position computation, should be easy to fix, but I cannot commit to that branch. Apart from that, this makes things better and solves an ugly bug, so I approve.

review: Approve

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'src/core/modules/NomenclatureItem.cpp'
--- src/core/modules/NomenclatureItem.cpp	2017-10-31 13:14:51 +0000
+++ src/core/modules/NomenclatureItem.cpp	2017-11-03 04:14:28 +0000
@@ -40,8 +40,7 @@
 				   float nLatitude,
 				   float nLongitude,
 				   float nSize)
-	: initialized(false)
-	, XYZ(0.0)
+	: XYZ(0.0)
 	, planet(nPlanet)
 	, identificator(nId)
 	, englishName(nName)
@@ -52,8 +51,11 @@
 	, longitude(nLongitude)
 	, size(nSize)
 {
+<<<<<<< TREE
 	StelUtils::spheToRect((longitude /*+ planet->getAxisRotation()*/) * M_PI/180.0, latitude * M_PI/180.0, XYZpc);
 	initialized = true;
+=======
+>>>>>>> MERGE-SOURCE
 }
 
 NomenclatureItem::~NomenclatureItem()
@@ -808,35 +810,24 @@
 	return color;
 }
 
-float NomenclatureItem::getVMagnitude(const StelCore* core) const
-{
-	Q_UNUSED(core);
-	return 99.f;
-}
-
-double NomenclatureItem::getAngularSize(const StelCore* core) const
-{
-	return std::atan2(size*planet->getSphereScale()/AU, getJ2000EquatorialPos(core).length()) * 180./M_PI;
-}
-
-void NomenclatureItem::update(double deltaTime)
-{
-	labelsFader.update((int)(deltaTime*1000));
-}
-
-void NomenclatureItem::draw(StelCore* core, StelPainter *painter)
-{
-	if (!getFlagLabels())
-		return;
-
+Vec3d NomenclatureItem::getJ2000EquatorialPos(const StelCore* core) const
+{
+	if (jde == core->getJDE()) return XYZ;
+	jde = core->getJDE();
 	const Vec3d equPos = planet->getJ2000EquatorialPos(core);
-
 	// Calculate the radius of the planet. It is necessary to re-scale it
 	const double r = planet->getRadius() * planet->getSphereScale();
+<<<<<<< TREE
 
 	Vec3d XYZ0;
 //	// For now, assume spherical planets, simply scale by radius.
 	XYZ0 = XYZpc*r;
+=======
+	Vec3d XYZ0; // XYZ is member variable with equatorial J2000.0 coordinates
+	StelUtils::spheToRect((longitude + planet->getAxisRotation()) * M_PI/180.0, latitude * M_PI/180.0, XYZ0);
+	// For now, assume spherical planets, simply scale by radius.
+	XYZ0 *= r;
+>>>>>>> MERGE-SOURCE
 	// TODO1: handle ellipsoid bodies
 	// TODO2: intersect properly with OBJ bodies! (LP:1723742)
 
@@ -844,8 +835,38 @@
 	   Feature's original coordinates are in planetocentric system, so we have to multiply it by the rotation matrix.
 	   planet->getRotEquatorialToVsop87() gives us the rotation matrix between Equatorial (on date) coordinates and Ecliptic J2000 coordinates.
 	   So we have to make another change to obtain the rotation matrix using Equatorial J2000: we have to multiplay by core->matVsop87ToJ2000 */
+<<<<<<< TREE
 	// TODO: Maybe it is more efficient to add some getRotEquatorialToVsop87Zrotation() to the Planet class which returns a Mat4d computed in Planet::computeTransMatrix().
 	XYZ = equPos + (core->matVsop87ToJ2000 * planet->getRotEquatorialToVsop87()) * Mat4d::zrotation(planet->getAxisRotation()* M_PI/180.0) * XYZ0;
+=======
+	XYZ = equPos + (core->matVsop87ToJ2000 * planet->getRotEquatorialToVsop87()) * XYZ0;
+	return XYZ;
+}
+
+float NomenclatureItem::getVMagnitude(const StelCore* core) const
+{
+	Q_UNUSED(core);
+	return 99.f;
+}
+
+double NomenclatureItem::getAngularSize(const StelCore* core) const
+{
+	return std::atan2(size*planet->getSphereScale()/AU, getJ2000EquatorialPos(core).length()) * 180./M_PI;
+}
+
+void NomenclatureItem::update(double deltaTime)
+{
+	labelsFader.update((int)(deltaTime*1000));
+}
+
+void NomenclatureItem::draw(StelCore* core, StelPainter *painter)
+{
+	if (!getFlagLabels())
+		return;
+
+	const Vec3d equPos = planet->getJ2000EquatorialPos(core);
+	Vec3d XYZ = getJ2000EquatorialPos(core);
+>>>>>>> MERGE-SOURCE
 	// In case we are located at a labeled site, don't show this label or any labels within 150 km. Else we have bad flicker...
 	if (XYZ.lengthSquared() < 150.*150.*AU_KM*AU_KM )
 		return;
@@ -865,7 +886,7 @@
 
 	// check visibility of feature
 	Vec3d srcPos;
-	if (painter->getProjector()->projectCheck(XYZ, srcPos) && (equPos.length() >= XYZ.length()) && (planet->getVMagnitude(core)<20.) && (screenSize>50. && screenSize<750.))
+	if (painter->getProjector()->projectCheck(XYZ, srcPos) && (equPos.length() >= XYZ.length()) && (screenSize>50. && screenSize<750.))
 	{
 		painter->setColor(color[0], color[1], color[2], 1.0);
 		painter->drawCircle(srcPos[0], srcPos[1], 2.f);

=== modified file 'src/core/modules/NomenclatureItem.hpp'
--- src/core/modules/NomenclatureItem.hpp	2017-10-30 23:02:25 +0000
+++ src/core/modules/NomenclatureItem.hpp	2017-11-03 04:14:28 +0000
@@ -125,10 +125,7 @@
 	//! @flags a set of flags with information types to include.
 	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
 	virtual Vec3f getInfoColor(void) const;
-	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const
-	{
-		return XYZ;
-	}
+	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const;
 	//! Get the visual magnitude of a nomenclature item. Dummy method, returns 99.
 	virtual float getVMagnitude(const StelCore* core) const;
 	//! Get the angular size of nomenclature item.
@@ -160,9 +157,14 @@
 	float getLongitude(void) const {return longitude;}
 
 private:
+<<<<<<< TREE
 	bool initialized;
 	Vec3d XYZpc;                         // holds planetocentric position (from longitude/latitude)
 	Vec3d XYZ;                         // holds J2000 position
+=======
+	mutable Vec3d XYZ;                         // holds J2000 position
+	mutable double jde;                // jde time of XYZ value
+>>>>>>> MERGE-SOURCE
 	static Vec3f color;
 	static bool hideLocalNomenclature;
 

=== modified file 'src/core/modules/NomenclatureMgr.cpp'
--- src/core/modules/NomenclatureMgr.cpp	2017-10-29 07:28:02 +0000
+++ src/core/modules/NomenclatureMgr.cpp	2017-11-03 04:14:28 +0000
@@ -355,7 +355,7 @@
 				{
 					NomenclatureItemP nom = NomenclatureItemP(new NomenclatureItem(p, featureId, name, context, ntype, latitude, longitude, size));
 					if (!nom.isNull())
-						nomenclatureItems.append(nom);
+						nomenclatureItems.insert(p, nom);
 
 					readOk++;
 				}				
@@ -379,11 +379,29 @@
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
 	StelPainter painter(prj);
 	painter.setFont(font);
+	const SphericalCap& viewportRegion = painter.getProjector()->getBoundingCap();
 
-	foreach (const NomenclatureItemP& nItem, nomenclatureItems)
+	foreach(PlanetP p, nomenclatureItems.uniqueKeys())
 	{
-		if (nItem && nItem->initialized)
-			nItem->draw(core, &painter);
+		// Early exit if the planet is not visible or too small to render the
+		// labels.
+		const Vec3d equPos = p->getJ2000EquatorialPos(core);
+		const double r = p->getRadius() * p->getSphereScale();
+		double angularSize = atan2(r, equPos.length());
+		double screenSize = angularSize * painter.getProjector()->getPixelPerRadAtCenter();
+		if (screenSize < 50) continue;
+		Vec3d n = equPos; n.normalize();
+		SphericalCap boundingCap(n, cos(angularSize));
+		if (!viewportRegion.intersects(boundingCap)) continue;
+		if (p->getVMagnitude(core) >= 20.) continue;
+
+		// Render all the items of this planet.
+		for (auto i = nomenclatureItems.find(p); i != nomenclatureItems.end() && i.key() == p; ++i)
+		{
+			const NomenclatureItemP& nItem = i.value();
+			if (nItem)
+				nItem->draw(core, &painter);
+		}
 	}
 
 	if (GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
@@ -412,7 +430,7 @@
 	}
 }
 
-QList<StelObjectP> NomenclatureMgr::searchAround(const Vec3d& av, double limitFov, const StelCore*) const
+QList<StelObjectP> NomenclatureMgr::searchAround(const Vec3d& av, double limitFov, const StelCore* core) const
 {
 	QList<StelObjectP> result;
 
@@ -423,14 +441,11 @@
 
 	foreach(const NomenclatureItemP& nItem, nomenclatureItems)
 	{
-		if (nItem->initialized && nItem->XYZ.lengthSquared() > 0)
+		equPos = nItem->getJ2000EquatorialPos(core);
+		equPos.normalize();
+		if (equPos[0]*v[0] + equPos[1]*v[1] + equPos[2]*v[2]>=cosLimFov)
 		{
-			equPos = nItem->XYZ;
-			equPos.normalize();
-			if (equPos[0]*v[0] + equPos[1]*v[1] + equPos[2]*v[2]>=cosLimFov)
-			{
-				result.append(qSharedPointerCast<StelObject>(nItem));
-			}
+			result.append(qSharedPointerCast<StelObject>(nItem));
 		}
 	}
 
@@ -445,7 +460,9 @@
 		foreach(const NomenclatureItemP& nItem, nomenclatureItems)
 		{
 			if (nItem->getNomenclatureType()!=NomenclatureItem::niSatelliteFeature && nItem->getEnglishName().toUpper() == englishName.toUpper())
+			{
 				return qSharedPointerCast<StelObject>(nItem);
+			}
 		}
 	}
 
@@ -459,7 +476,9 @@
 		foreach(const NomenclatureItemP& nItem, nomenclatureItems)
 		{
 			if (nItem->getNomenclatureType()!=NomenclatureItem::niSatelliteFeature && nItem->getNameI18n().toUpper() == nameI18n.toUpper())
+			{
 				return qSharedPointerCast<StelObject>(nItem);
+			}
 		}
 	}
 

=== modified file 'src/core/modules/NomenclatureMgr.hpp'
--- src/core/modules/NomenclatureMgr.hpp	2017-10-21 18:57:30 +0000
+++ src/core/modules/NomenclatureMgr.hpp	2017-11-03 04:14:28 +0000
@@ -26,7 +26,7 @@
 #include "NomenclatureItem.hpp"
 
 #include <QFont>
-#include <QList>
+#include <QMultiHash>
 
 class StelPainter;
 class QSettings;
@@ -136,7 +136,7 @@
 	QFont font;
 	QSettings* conf;
 	StelTextureSP texPointer;	
-	QList<NomenclatureItemP> nomenclatureItems;
+	QMultiHash<PlanetP, NomenclatureItemP> nomenclatureItems;
 };
 
 #endif /*_NOMENCLATUREMGR_HPP_*/