Star.hpp   Star.hpp 
skipping to change at line 65 skipping to change at line 65
unsigned char componentIds; // 5 bits needed unsigned char componentIds; // 5 bits needed
Int32 x0; // 32 bits needed Int32 x0; // 32 bits needed
Int32 x1; // 32 bits needed Int32 x1; // 32 bits needed
unsigned char bV; // 7 bits needed unsigned char bV; // 7 bits needed
unsigned char mag; // 8 bits needed unsigned char mag; // 8 bits needed
Uint16 spInt; // 14 bits needed Uint16 spInt; // 14 bits needed
Int32 dx0,dx1,plx; Int32 dx0,dx1,plx;
enum {MaxPosVal=0x7FFFFFFF}; enum {MaxPosVal=0x7FFFFFFF};
StelObjectP createStelObject(const SpecialZoneArray<Star1> *a, StelObjectP createStelObject(const SpecialZoneArray<Star1> *a,
const SpecialZoneData<Star1> *z) co nst; const SpecialZoneData<Star1> *z) co nst;
void getJ2000Pos(const ZoneData *z,double movementFactor, Vec3d& pos) con st { void getJ2000Pos(const ZoneData *z,float movementFactor, Vec3f& pos) cons t {
pos = z->axis0; pos = z->axis0;
pos*=((double)(x0)+movementFactor*dx0); pos*=((float)(x0)+movementFactor*dx0);
pos+=((double)(x1)+movementFactor*dx1)*z->axis1; pos+=((float)(x1)+movementFactor*dx1)*z->axis1;
pos+=z->center; pos+=z->center;
} }
float getBV(void) const {return IndexToBV(bV);} float getBV(void) const {return IndexToBV(bV);}
bool hasName() const {return hip;} bool hasName() const {return hip;}
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__))
skipping to change at line 98 skipping to change at line 98
struct Star2 { // 10 byte struct Star2 { // 10 byte
int x0:20; int x0:20;
int x1:20; int x1:20;
int dx0:14; int dx0:14;
int dx1:14; int dx1:14;
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)};
StelObjectP createStelObject(const SpecialZoneArray<Star2> *a, StelObjectP createStelObject(const SpecialZoneArray<Star2> *a,
const SpecialZoneData<Star2> *z) co nst; const SpecialZoneData<Star2> *z) co nst;
void getJ2000Pos(const ZoneData *z,double movementFactor, Vec3d& pos) con st { void getJ2000Pos(const ZoneData *z,float movementFactor, Vec3f& pos) cons t {
pos = z->axis0; pos = z->axis0;
pos*=((double)(x0)+movementFactor*dx0); pos*=((float)(x0)+movementFactor*dx0);
pos+=((double)(x1)+movementFactor*dx1)*z->axis1; pos+=((float)(x1)+movementFactor*dx1)*z->axis1;
pos+=z->center; pos+=z->center;
} }
float getBV(void) const {return IndexToBV(bV);} float getBV(void) const {return IndexToBV(bV);}
QString getNameI18n(void) const {return QString();} QString getNameI18n(void) const {return QString();}
bool hasName() const {return false;} bool hasName() const {return false;}
void repack(bool fromBe); void repack(bool fromBe);
void print(void); void print(void);
} }
#if defined(__GNUC__) #if defined(__GNUC__)
__attribute__ ((__packed__)) __attribute__ ((__packed__))
skipping to change at line 129 skipping to change at line 129
#pragma pack(1) #pragma pack(1)
#endif #endif
struct Star3 { // 6 byte struct Star3 { // 6 byte
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)};
StelObjectP createStelObject(const SpecialZoneArray<Star3> *a, StelObjectP createStelObject(const SpecialZoneArray<Star3> *a,
const SpecialZoneData<Star3> *z) co nst; const SpecialZoneData<Star3> *z) co nst;
void getJ2000Pos(const ZoneData *z,double, Vec3d& pos) const { void getJ2000Pos(const ZoneData *z,float, Vec3f& pos) const {
pos = z->axis0; pos = z->axis0;
pos*=(double)(x0); pos*=(float)(x0);
pos+=z->center; pos+=z->center;
pos+=(double)(x1)*z->axis1; pos+=(float)(x1)*z->axis1;
} }
float getBV(void) const {return IndexToBV(bV);} float getBV(void) const {return IndexToBV(bV);}
QString getNameI18n(void) const {return QString();} QString getNameI18n(void) const {return QString();}
bool hasName() const {return false;} bool hasName() const {return false;}
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. 7 change blocks. 
9 lines changed or deleted 9 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/