|
@@ -1218,11 +1218,13 @@ void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rota
|
|
Matrix matRotation = MatrixRotate(rotationAxis, rotationAngle*DEG2RAD);
|
|
Matrix matRotation = MatrixRotate(rotationAxis, rotationAngle*DEG2RAD);
|
|
Matrix matScale = MatrixScale(scale.x, scale.y, scale.z);
|
|
Matrix matScale = MatrixScale(scale.x, scale.y, scale.z);
|
|
Matrix matTranslation = MatrixTranslate(position.x, position.y, position.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)
|
|
// Combine model transformation matrix (model.transform) with matrix generated by function parameters (matTransform)
|
|
//Matrix matModel = MatrixMultiply(model.transform, matTransform); // Transform to world-space coordinates
|
|
//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?
|
|
model.material.colDiffuse = tint; // TODO: Multiply tint color by diffuse color?
|
|
|
|
|
|
rlglDrawMesh(model.mesh, model.material, model.transform);
|
|
rlglDrawMesh(model.mesh, model.material, model.transform);
|