StelSphereGeometry.cpp   StelSphereGeometry.cpp 
skipping to change at line 704 skipping to change at line 704
octahedronPolygon.getBoundingCap(res.n, res.d); octahedronPolygon.getBoundingCap(res.n, res.d);
return res; return res;
} }
struct TriangleSerializer struct TriangleSerializer
{ {
TriangleSerializer(const TriangleSerializer& ts) : triangleList(ts.t riangleList) {} TriangleSerializer(const TriangleSerializer& ts) : triangleList(ts.t riangleList) {}
TriangleSerializer() {} TriangleSerializer() {}
inline void operator()(const Vec3d* v1, const Vec3d* v2, const Vec3d * v3, inline void operator()(const Vec3d* v1, const Vec3d* v2, const Vec3d * v3,
const Vec2f* , const Vec2 const Vec2f* , const Vec2f* , const Vec2f* ,
f* , const Vec2f* , const Vec3f* , const Vec3f* , const Vec3f* ,
// GZ NEW
unsigned int , unsigned i nt , unsigned int ) unsigned int , unsigned i nt , unsigned int )
{ {
QVariantList triangle; QVariantList triangle;
double ra, dec; double ra, dec;
QVariantList l; QVariantList l;
StelUtils::rectToSphe(&ra, &dec, *v1); StelUtils::rectToSphe(&ra, &dec, *v1);
l << ra*180./M_PI << dec*180./M_PI; l << ra*180./M_PI << dec*180./M_PI;
triangle << QVariant(l); triangle << QVariant(l);
l.clear(); l.clear();
StelUtils::rectToSphe(&ra, &dec, *v2); StelUtils::rectToSphe(&ra, &dec, *v2);
skipping to change at line 1141 skipping to change at line 1142
if (!ok) if (!ok)
throw std::runtime_error(qPrintable(QString("invalid Ra,Dec pair: \"%1\" (expect 2 double values in degree)").arg(vRaDec.toString()))); throw std::runtime_error(qPrintable(QString("invalid Ra,Dec pair: \"%1\" (expect 2 double values in degree)").arg(vRaDec.toString())));
} }
struct TriangleDumper struct TriangleDumper
{ {
TriangleDumper(const TriangleDumper& ts) : triangleList(ts.triangleL ist) {} TriangleDumper(const TriangleDumper& ts) : triangleList(ts.triangleL ist) {}
TriangleDumper() {} TriangleDumper() {}
inline void operator()(const Vec3d* v1, const Vec3d* v2, const Vec3d * v3, inline void operator()(const Vec3d* v1, const Vec3d* v2, const Vec3d * v3,
const Vec2f* , const Vec2 const Vec2f* , const Vec2f* , const Vec2f* ,
f* , const Vec2f* , const Vec3f* , const Vec3f* , const Vec3f* ,
// GZ NEW
unsigned int , unsigned i nt , unsigned int ) unsigned int , unsigned i nt , unsigned int )
{ {
QVector<Vec3d> triangle; QVector<Vec3d> triangle;
triangle << *v1 << *v2 << *v3; triangle << *v1 << *v2 << *v3;
triangleList.append(triangle); triangleList.append(triangle);
} }
QVector<QVector<Vec3d > > triangleList; QVector<QVector<Vec3d > > triangleList;
}; };
 End of changes. 2 change blocks. 
4 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/