Menu
▾
▴
[Csp-commits] APPLICATIONS/SimData/Include/SimData GeoPos.h,1.10.2.1,1.10.2.2 LogStream.h,1.9,1.9.2.1 Matrix3.h,1.14.2.1,1.14.2.2 Quat.h,1.8.2.1,1.8.2.2 TypeAdapter.h,1.22,1.22.2.1 Vector3.h,1.16.2.1,1.16.2.2
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv7999/Include/SimData
Modified Files:
Tag: b0_4_0
GeoPos.h LogStream.h Matrix3.h Quat.h TypeAdapter.h Vector3.h
Log Message:
Index: GeoPos.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/GeoPos.h,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** GeoPos.h 22 Aug 2003 00:21:45 -0000 1.10.2.1
--- GeoPos.h 18 Sep 2003 02:09:48 -0000 1.10.2.2
***************
*** 621,626 ****
/** Construct a UTM.
*/
! UTM(double easting, double northing, char zone, char designator, double alt=0.0) {
! set(easting, northing, zone, designator, alt);
}
--- 621,626 ----
/** Construct a UTM.
*/
! UTM(double easting_, double northing_, char zone_, char designator_, double alt=0.0) {
! set(easting_, northing_, zone_, designator_, alt);
}
***************
*** 645,659 ****
/** Set the current position from UTM coordinates.
*
! * @param easting UTM easting
! * @param northing UTM northing
! * @param zone UTM zone
! * @param designator UTM zone letter
! * @param alt altitude above the reference ellipse (in meters)
*/
! void set(double easting, double northing, char zone, char designator, double alt=0.0) {
! _E = easting;
! _N = northing;
! _zone = zone;
! _designator = designator;
_alt = alt;
// XXX check values
--- 645,660 ----
/** Set the current position from UTM coordinates.
*
! * @param easting_ UTM easting
! * @param northing_ UTM northing
! * @param zone_ UTM zone
! * @param designator_ UTM zone letter
! * @param alt_ altitude above the reference ellipse (in meters)
*/
! void set(double easting_, double northing_,
! char zone_, char designator_, double alt=0.0) {
! _E = easting_;
! _N = northing_;
! _zone = zone_;
! _designator = designator_;
_alt = alt;
// XXX check values
***************
*** 662,671 ****
/** Set the current position from UTM coordinates.
*
! * @param easting UTM easting
! * @param northing UTM northing
! * @param zone UTM zone (e.g. "10T")
! * @param alt altitude above the reference ellipse (in meters)
*/
! void set(double easting, double northing, const char *zone, double alt = 0.0);
/** Get the easting coordinate.
--- 663,672 ----
/** Set the current position from UTM coordinates.
*
! * @param easting_ UTM easting
! * @param northing_ UTM northing
! * @param zone_ UTM zone (e.g. "10T")
! * @param alt_ altitude above the reference ellipse (in meters)
*/
! void set(double easting_, double northing_, const char *zone_, double alt = 0.0);
/** Get the easting coordinate.
***************
*** 732,736 ****
/** Construct a new ECEF
*/
! ECEF(double x, double y, double z): Vector3(x, y, z) {}
/** Copy constructor to convert from UTM
--- 733,737 ----
/** Construct a new ECEF
*/
! ECEF(double x_, double y_, double z_): Vector3(x_, y_, z_) {}
/** Copy constructor to convert from UTM
Index: LogStream.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/LogStream.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** LogStream.h 15 Aug 2003 01:17:06 -0000 1.9
--- LogStream.h 18 Sep 2003 02:09:48 -0000 1.9.2.1
***************
*** 210,219 ****
* @param out output stream
*/
! logstream( std::ostream& out )
: logstream_base(),
ostream(&lbuf), // msvc6 accepts ostream(&lbuf) _using std::ostream_, but not std::ostream(&lbuf) ...
m_out(NULL)
{
! lbuf.set_sb(out.rdbuf());
}
--- 210,219 ----
* @param out output stream
*/
! logstream(std::ostream& out_)
: logstream_base(),
ostream(&lbuf), // msvc6 accepts ostream(&lbuf) _using std::ostream_, but not std::ostream(&lbuf) ...
m_out(NULL)
{
! lbuf.set_sb(out_.rdbuf());
}
***************
*** 234,240 ****
* @param out output stream
*/
! void setOutput( std::ostream& out ) {
_close();
! lbuf.set_sb( out.rdbuf() );
}
--- 234,240 ----
* @param out output stream
*/
! void setOutput(std::ostream& out_) {
_close();
! lbuf.set_sb(out_.rdbuf() );
}
Index: Matrix3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Matrix3.h,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -C2 -d -r1.14.2.1 -r1.14.2.2
*** Matrix3.h 22 Aug 2003 00:21:45 -0000 1.14.2.1
--- Matrix3.h 18 Sep 2003 02:09:48 -0000 1.14.2.2
***************
*** 142,159 ****
/** Get the value (reference) of a matrix element.
*/
! inline double& operator()(int row, int col) { return _mat[row][col]; }
/** Get the (const) value of a matrix element.
*/
! inline double operator()(int row, int col) const { return _mat[row][col]; }
#endif // SWIG
/** Get the value of a matrix element.
*/
! inline double getElement(int row, int col) { return _mat[row][col]; }
/** Set the value of a matrix element.
*/
! inline void setElement(int row, int col, double value) { _mat[row][col]=value; }
/** Return true if all elements are valid floating point numbers.
--- 142,159 ----
/** Get the value (reference) of a matrix element.
*/
! inline double& operator()(int row_, int col_) { return _mat[row_][col_]; }
/** Get the (const) value of a matrix element.
*/
! inline double operator()(int row_, int col_) const { return _mat[row_][col_]; }
#endif // SWIG
/** Get the value of a matrix element.
*/
! inline double getElement(int row_, int col_) { return _mat[row_][col_]; }
/** Set the value of a matrix element.
*/
! inline void setElement(int row_, int col_, double value) { _mat[row_][col_]=value; }
/** Return true if all elements are valid floating point numbers.
***************
*** 183,188 ****
/** Set this matrix from a double[9] array.
*/
! inline void set(double const * const ptr) {
! std::copy(ptr, ptr+9, (double*)(_mat));
}
--- 183,188 ----
/** Set this matrix from a double[9] array.
*/
! inline void set(double const * const ptr_) {
! std::copy(ptr_, ptr_+9, (double*)(_mat));
}
Index: Quat.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quat.h,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** Quat.h 22 Aug 2003 00:21:45 -0000 1.8.2.1
--- Quat.h 18 Sep 2003 02:09:48 -0000 1.8.2.2
***************
*** 99,103 ****
* Specifiy the four real-valued components.
*/
! inline Quat(double x, double y, double z, double w): _x(x), _y(y), _z(z), _w(w) {}
/** Construct a new quaternion representing a rotation.
--- 99,106 ----
* Specifiy the four real-valued components.
*/
! inline Quat(double x_, double y_, double z_, double w_):
! _x(x_), _y(y_), _z(z_), _w(w_)
! {
! }
/** Construct a new quaternion representing a rotation.
***************
*** 138,143 ****
/** Set the components.
*/
! inline void set(double x, double y, double z, double w) {
! _x = x; _y = y; _z = z; _w = w;
}
--- 141,146 ----
/** Set the components.
*/
! inline void set(double x_, double y_, double z_, double w_) {
! _x = x_; _y = y_; _z = z_; _w = w_;
}
***************
*** 228,238 ****
/// Unary multiply --- adjusted relative to osg for active transformations!
inline Quat& operator*=(const Quat& rhs) {
! double x = rhs._w*_x + rhs._x*_w - rhs._y*_z + rhs._z*_y;
! double y = rhs._w*_y + rhs._x*_z + rhs._y*_w - rhs._z*_x;
! double z = rhs._w*_z - rhs._x*_y + rhs._y*_x + rhs._z*_w;
_w = rhs._w*_w - rhs._x*_x - rhs._y*_y - rhs._z*_z;
! _z = z;
! _y = y;
! _x = x;
return *this;
}
--- 231,241 ----
/// Unary multiply --- adjusted relative to osg for active transformations!
inline Quat& operator*=(const Quat& rhs) {
! double x_ = rhs._w*_x + rhs._x*_w - rhs._y*_z + rhs._z*_y;
! double y_ = rhs._w*_y + rhs._x*_z + rhs._y*_w - rhs._z*_x;
! double z_ = rhs._w*_z - rhs._x*_y + rhs._y*_x + rhs._z*_w;
_w = rhs._w*_w - rhs._x*_x - rhs._y*_y - rhs._z*_z;
! _z = z_;
! _y = y_;
! _x = x_;
return *this;
}
Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** TypeAdapter.h 20 Aug 2003 02:47:10 -0000 1.22
--- TypeAdapter.h 18 Sep 2003 02:09:48 -0000 1.22.2.1
***************
*** 212,218 ****
} else {
// last chance, is it a path?
! Path const *p = dynamic_cast<Path const *>(var.o);
! TypeCheck(p!=NULL, "dynamic cast of BaseType* to LinkBase failed");
! x = LinkBase(*(const_cast<Path *>(p)), 0);
}
}
--- 212,218 ----
} else {
// last chance, is it a path?
! Path const *path = dynamic_cast<Path const *>(var.o);
! TypeCheck(path!=NULL, "dynamic cast of BaseType* to LinkBase failed");
! x = LinkBase(*(const_cast<Path *>(path)), 0);
}
}
Index: Vector3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Vector3.h,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** Vector3.h 22 Aug 2003 00:21:45 -0000 1.16.2.1
--- Vector3.h 18 Sep 2003 02:09:48 -0000 1.16.2.2
***************
*** 78,82 ****
Vector3(): _x(0.0), _y(0.0), _z(0.0) {}
/// Construct and initialize a new vector.
! Vector3(double x, double y, double z): _x(x), _y(y), _z(z) {}
/// Copy constructor.
Vector3(const Vector3& v): BaseType(v), _x(v._x), _y(v._y), _z(v._z) {}
--- 78,82 ----
Vector3(): _x(0.0), _y(0.0), _z(0.0) {}
/// Construct and initialize a new vector.
! Vector3(double x_, double y_, double z_): _x(x_), _y(y_), _z(z_) {}
/// Copy constructor.
Vector3(const Vector3& v): BaseType(v), _x(v._x), _y(v._y), _z(v._z) {}
***************
*** 97,101 ****
/// Set the vector components.
! inline void set(double x, double y, double z) { _x=x; _y=y; _z=z; }
#ifndef SWIG
--- 97,101 ----
/// Set the vector components.
! inline void set(double x_, double y_, double z_) { _x=x_; _y=y_; _z=z_; }
#ifndef SWIG
|
