Star.hpp   Star.hpp 
skipping to change at line 72 skipping to change at line 72
Uint16 spInt; // 14 bits needed Uint16 spInt; // 14 bits needed
Int32 dx0,dx1,plx; Int32 dx0,dx1,plx;
enum {MaxPosVal=0x7FFFFFFF}; enum {MaxPosVal=0x7FFFFFFF};
boost::intrusive_ptr<StelObject> boost::intrusive_ptr<StelObject>
createStelObject(const SpecialZoneArray<Star1> *a, createStelObject(const SpecialZoneArray<Star1> *a,
const SpecialZoneData<Star1> *z) const; const SpecialZoneData<Star1> *z) const;
Vec3d getJ2000Pos(const ZoneData *z,double movementFactor) const { Vec3d getJ2000Pos(const ZoneData *z,double movementFactor) const {
Vec3d pos = z->center Vec3d pos = z->center
+ (x0+movementFactor*dx0)*z->axis0 + (x0+movementFactor*dx0)*z->axis0
+ (x1+movementFactor*dx1)*z->axis1; + (x1+movementFactor*dx1)*z->axis1;
pos.normalize(); //pos.normalize();
return pos; return pos;
} }
float getBV(void) const {return IndexToBV(bV);} float getBV(void) const {return IndexToBV(bV);}
QString getNameI18n(void) const; QString getNameI18n(void) const;
void repack(bool fromBe); void repack(bool fromBe);
void print(void); void print(void);
} }
#if defined(__GNUC__) #if defined(__GNUC__)
__attribute__ ((__packed__)) __attribute__ ((__packed__))
#endif #endif
skipping to change at line 106 skipping to change at line 106
unsigned int bV:7; unsigned int bV:7;
unsigned int mag:5; unsigned int mag:5;
enum {MaxPosVal=((1<<19)-1)}; enum {MaxPosVal=((1<<19)-1)};
boost::intrusive_ptr<StelObject> boost::intrusive_ptr<StelObject>
createStelObject(const SpecialZoneArray<Star2> *a, createStelObject(const SpecialZoneArray<Star2> *a,
const SpecialZoneData<Star2> *z) const; const SpecialZoneData<Star2> *z) const;
Vec3d getJ2000Pos(const ZoneData *z,double movementFactor) const { Vec3d getJ2000Pos(const ZoneData *z,double movementFactor) const {
Vec3d pos = z->center Vec3d pos = z->center
+ (x0+movementFactor*dx0)*z->axis0 + (x0+movementFactor*dx0)*z->axis0
+ (x1+movementFactor*dx1)*z->axis1; + (x1+movementFactor*dx1)*z->axis1;
pos.normalize(); //pos.normalize();
return pos; return pos;
} }
float getBV(void) const {return IndexToBV(bV);} float getBV(void) const {return IndexToBV(bV);}
QString getNameI18n(void) const {return "";} QString getNameI18n(void) const {return "";}
void repack(bool fromBe); void repack(bool fromBe);
void print(void); void print(void);
} }
#if defined(__GNUC__) #if defined(__GNUC__)
__attribute__ ((__packed__)) __attribute__ ((__packed__))
#endif #endif
skipping to change at line 136 skipping to change at line 136
int x0:18; int x0:18;
int x1:18; int x1:18;
unsigned int bV:7; unsigned int bV:7;
unsigned int mag:5; unsigned int mag:5;
enum {MaxPosVal=((1<<17)-1)}; enum {MaxPosVal=((1<<17)-1)};
boost::intrusive_ptr<StelObject> boost::intrusive_ptr<StelObject>
createStelObject(const SpecialZoneArray<Star3> *a, createStelObject(const SpecialZoneArray<Star3> *a,
const SpecialZoneData<Star3> *z) const; const SpecialZoneData<Star3> *z) const;
Vec3d getJ2000Pos(const ZoneData *z,double) const { Vec3d getJ2000Pos(const ZoneData *z,double) const {
Vec3d pos = z->center + (double)(x0)*z->axis0 + (double)(x1)*z->axis1; Vec3d pos = z->center + (double)(x0)*z->axis0 + (double)(x1)*z->axis1;
pos.normalize(); //pos.normalize();
return pos; return pos;
} }
float getBV(void) const {return IndexToBV(bV);} float getBV(void) const {return IndexToBV(bV);}
QString getNameI18n(void) const {return "";} QString getNameI18n(void) const {return "";}
void repack(bool fromBe); void repack(bool fromBe);
void print(void); void print(void);
} }
#if defined(__GNUC__) #if defined(__GNUC__)
__attribute__ ((__packed__)) __attribute__ ((__packed__))
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 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/