diff options
| author | Ray <raysan5@gmail.com> | 2017-05-09 09:35:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 09:35:58 +0200 |
| commit | 0ca874c710aace697c5a383f41fc81abf34e2e06 (patch) | |
| tree | 804ea004f637c5514c15a116a9599a93564557ab /src/models.c | |
| parent | c785d84d30a232d9b44b6969a24103ab8da959b7 (diff) | |
| parent | 4c27412eff10f8ef633d97017dcb9e2faff4c4e1 (diff) | |
| download | raylib-0ca874c710aace697c5a383f41fc81abf34e2e06.tar.gz raylib-0ca874c710aace697c5a383f41fc81abf34e2e06.zip | |
Merge pull request #282 from raysan5/develop
Integrate Develop branch
Diffstat (limited to 'src/models.c')
| -rw-r--r-- | src/models.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/models.c b/src/models.c index fa6faf16..2459edf1 100644 --- a/src/models.c +++ b/src/models.c @@ -1218,11 +1218,13 @@ void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rota Matrix matRotation = MatrixRotate(rotationAxis, rotationAngle*DEG2RAD); Matrix matScale = MatrixScale(scale.x, scale.y, scale.z); Matrix matTranslation = MatrixTranslate(position.x, position.y, position.z); + + Matrix matTransform = MatrixMultiply(MatrixMultiply(matScale, matRotation), matTranslation); // Combine model transformation matrix (model.transform) with matrix generated by function parameters (matTransform) //Matrix matModel = MatrixMultiply(model.transform, matTransform); // Transform to world-space coordinates - model.transform = MatrixMultiply(MatrixMultiply(matScale, matRotation), matTranslation); + model.transform = MatrixMultiply(model.transform, matTransform); model.material.colDiffuse = tint; // TODO: Multiply tint color by diffuse color? rlglDrawMesh(model.mesh, model.material, model.transform); |