X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmatrix.h;h=ce21b46f1192aab039ddbdd53b391a3e4e21b43c;hb=a6d952c0a2effd65ee4e82caffe1b96ccd36f84e;hp=5c20d60c7d333b2a4c468bf9c7fcd250dc1ee312;hpb=2b779717e42b514210f7128cf9aee2276650e003;p=libs%2Fgl.git diff --git a/source/matrix.h b/source/matrix.h index 5c20d60c..ce21b46f 100644 --- a/source/matrix.h +++ b/source/matrix.h @@ -27,6 +27,7 @@ public: void multiply(const Matrix &); void translate(double x, double y, double z) { translate(Vector3(x, y, z)); } void translate(const Vector3 &); + void rotate(const Angle &a, double x, double y, double z) { rotate(a, Vector3(x, y, z)); } void rotate(const Angle &, const Vector3 &); void rotate(double a, double x, double y, double z) { rotate(Angle::from_radians(a), Vector3(x, y, z)); } void rotate(double a, const Vector3 &x) { rotate(Angle::from_radians(a), x); } @@ -44,7 +45,8 @@ public: static Matrix translation(double x, double y, double z) { return translation(Vector3(x, y, z)); } static Matrix translation(const Vector3 &); - static Matrix rotation(const Angle &a, const Vector3 &); + static Matrix rotation(const Angle &a, double x, double y, double z) { return rotation(a, Vector3(x, y, z)); } + static Matrix rotation(const Angle &, const Vector3 &); static Matrix rotation(double a, double x, double y, double z) { return rotation(Angle::from_radians(a), Vector3(x, y, z)); } static Matrix rotation(double a, const Vector3 &x) { return rotation(Angle::from_radians(a), x); } static Matrix rotation_deg(double a, double x, double y, double z) { return rotation(Angle::from_degrees(a), Vector3(x, y, z)); } @@ -59,7 +61,7 @@ public: static Matrix ortho_topleft(double, double); static Matrix frustum(double, double, double, double, double, double); static Matrix frustum_centered(double, double, double, double); - static Matrix perspective(double, double, double, double); + static Matrix perspective(const Angle &, double, double, double); }; class MatrixStack