refactor

UGameEngine/entities/ugeentity.cpp

@@ -123,13 +123,8 @@ void UGEEntity::setColor(const QColor &color)
 
 Vector3D UGEEntity::getRealPoint(const Vector3D &pos)
 {
-    Matrix3x3 scale;
-    scale.setScalar(0, 0, _scale.getX());
-    scale.setScalar(1, 1, _scale.getY());
-    scale.setScalar(2, 2, _scale.getZ());
-    Vector3D p = scale.multMatrix(pos);
-    Matrix3x3 rot = getRotationMatrix(_rotation);
-    return (rot.multMatrix(p) + _position);
+    Matrix3x3 trans = getTransformationMatrix();
+    return (trans.multMatrix(pos) + _position);
 }
 
 ColorVector3D UGEEntity::getRealPoint(const ColorVector3D &pos)
@@ -142,9 +137,23 @@ TextureVector3D UGEEntity::getRealPoint(const TextureVector3D &pos)
     return TextureVector3D(pos.getTextureCoord(), getRealPoint((ColorVector3D)pos));
 }
 
-Matrix3x3 UGEEntity::getRotationMatrix(const Vector3D &rotation)
+Matrix3x3 UGEEntity::getTransformationMatrix() const
+{
+    return getRotationMatrix().multMatrix(getScaleMatrix());
+}
+
+Matrix3x3 UGEEntity::getScaleMatrix() const
+{
+    Matrix3x3 scale;
+    scale.setScalar(0, 0, _scale.getX());
+    scale.setScalar(1, 1, _scale.getY());
+    scale.setScalar(2, 2, _scale.getZ());
+    return scale;
+}
+
+Matrix3x3 UGEEntity::getRotationMatrix() const
 {
-    Vector3D r = Tools::degreeToRad(rotation);
+    Vector3D r = Tools::degreeToRad(_rotation);
 
     Matrix3x3 mx;
     mx.setToIdentity();

UGameEngine/entities/ugeentity.h

@@ -43,7 +43,9 @@ public:
     ColorVector3D getRealPoint(const ColorVector3D& pos);
     TextureVector3D getRealPoint(const TextureVector3D& pos);
 
-    Matrix3x3 getRotationMatrix(const Vector3D& rotation);
+    Matrix3x3 getTransformationMatrix() const;
+    Matrix3x3 getScaleMatrix() const;
+    Matrix3x3 getRotationMatrix() const;
 
     virtual void drawPoint(AbstractRenderDevice* device, const ColorVector3D& point);