From: Mikko L. <laz...@us...> - 2004-06-15 19:29:57
|
Update of /cvsroot/rtk/rtk/src/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17052 Modified Files: Matrix.cpp Log Message: minor changes in method names Index: Matrix.cpp =================================================================== RCS file: /cvsroot/rtk/rtk/src/gui/Matrix.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Matrix.cpp 15 Jun 2004 19:13:59 -0000 1.1 --- Matrix.cpp 15 Jun 2004 19:29:44 -0000 1.2 *************** *** 56,60 **** #endif ! Matrix& Matrix::copy(const Matrix &m) { m11 = m.m11; m12 = m.m12; --- 56,60 ---- #endif ! Matrix& Matrix::CopyFrom(const Matrix &m) { m11 = m.m11; m12 = m.m12; *************** *** 66,70 **** } ! void Matrix::set_matrix(float M11, float M12, float M21, float M22, float X, float Y, bool trivial) { m11 = M11; m12 = M12; --- 66,70 ---- } ! void Matrix::SetMatrix(float M11, float M12, float M21, float M22, float X, float Y, bool trivial) { m11 = M11; m12 = M12; *************** *** 76,80 **** } ! void Matrix::translate(float dx, float dy) { if(trivial) { --- 76,80 ---- } ! void Matrix::Translate(float dx, float dy) { if(trivial) { *************** *** 92,96 **** } ! void Matrix::translate(int dx, int dy) { if(trivial) { --- 92,96 ---- } ! void Matrix::Translate(int dx, int dy) { if(trivial) { *************** *** 107,111 **** } ! void Matrix::transform(float &dx, float &dy) const { if(!trivial) { --- 107,111 ---- } ! void Matrix::Transform(float &dx, float &dy) const { if(!trivial) { *************** *** 119,123 **** } ! void Matrix::transform(int &dx, int &dy) const { if(!trivial) { --- 119,123 ---- } ! void Matrix::Transform(int &dx, int &dy) const { if(!trivial) { *************** *** 131,135 **** } ! void Matrix::transform_distance(float &dx, float &dy) const { if(trivial) return; --- 131,135 ---- } ! void Matrix::Transform_distance(float &dx, float &dy) const { if(trivial) return; *************** *** 139,143 **** } ! void Matrix::rotate(float degrees) { float s, c; // sin & cos --- 139,143 ---- } ! void Matrix::Rotate(float degrees) { float s, c; // sin & cos *************** *** 161,165 **** } ! void Matrix::scale(float factor_x, float factor_y) { if(factor_x != 1.0f) { --- 161,165 ---- } ! void Matrix::Scale(float factor_x, float factor_y) { if(factor_x != 1.0f) { *************** *** 175,179 **** } ! void Matrix::shear(float factor_h, float factor_v) { float t11 = factor_v * m21; --- 175,179 ---- } ! void Matrix::Shear(float factor_h, float factor_v) { float t11 = factor_v * m21; *************** *** 187,191 **** // Multiply this matrix by given values. ! void Matrix::multiply(float M11, float M12, float M21, float M22, float X, float Y) { if(trivial) { --- 187,191 ---- // Multiply this matrix by given values. ! void Matrix::Multiply(float M11, float M12, float M21, float M22, float X, float Y) { if(trivial) { |