lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated the Matrix3 class and documentation (internal stuff)

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1507 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-04-10 11:29:44 +00:00
parent a00a9c1cc2
commit 1e6161c750
5 changed files with 109 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SFML/Graphics/Drawable.cpp
View file

@ -339,7 +339,7 @@ const Matrix3& Drawable::GetMatrix() const
// First recompute it if needed
if (!myMatrixUpdated)
{
myMatrix.SetFromTransformations(myOrigin, myPosition, myRotation, myScale);
myMatrix = Matrix3::Transformation(myOrigin, myPosition, myRotation, myScale);
myMatrixUpdated = true;
}

2
src/SFML/Graphics/Renderer.cpp
View file

@ -137,7 +137,7 @@ void Renderer::SetModelView(const Matrix3& matrix)
////////////////////////////////////////////////////////////
void Renderer::ApplyModelView(const Matrix3& matrix)
{
myStates->modelView *= matrix;
myStates->modelView = myStates->modelView * matrix;
}

2
src/SFML/Graphics/View.cpp
View file

@ -199,7 +199,7 @@ const Matrix3& View::GetMatrix() const
// Recompute the matrix if needed
if (!myMatrixUpdated)
{
myMatrix.SetFromProjection(myCenter, mySize, myRotation);
myMatrix = Matrix3::Projection(myCenter, mySize, myRotation);
myMatrixUpdated = true;
}