|
@@ -912,7 +912,7 @@ RMAPI Vector3 Vector3Unproject(Vector3 source, Matrix projection, Matrix view)
|
|
{
|
|
{
|
|
Vector3 result = { 0 };
|
|
Vector3 result = { 0 };
|
|
|
|
|
|
- // Calculate unproject matrix (multiply view matrix by projection matrix) and invert it
|
|
|
|
|
|
+ // Calculate unprojected matrix (multiply view matrix by projection matrix) and invert it
|
|
Matrix matViewProj = { // MatrixMultiply(view, projection);
|
|
Matrix matViewProj = { // MatrixMultiply(view, projection);
|
|
view.m0*projection.m0 + view.m1*projection.m4 + view.m2*projection.m8 + view.m3*projection.m12,
|
|
view.m0*projection.m0 + view.m1*projection.m4 + view.m2*projection.m8 + view.m3*projection.m12,
|
|
view.m0*projection.m1 + view.m1*projection.m5 + view.m2*projection.m9 + view.m3*projection.m13,
|
|
view.m0*projection.m1 + view.m1*projection.m5 + view.m2*projection.m9 + view.m3*projection.m13,
|
|
@@ -975,7 +975,7 @@ RMAPI Vector3 Vector3Unproject(Vector3 source, Matrix projection, Matrix view)
|
|
// Create quaternion from source point
|
|
// Create quaternion from source point
|
|
Quaternion quat = { source.x, source.y, source.z, 1.0f };
|
|
Quaternion quat = { source.x, source.y, source.z, 1.0f };
|
|
|
|
|
|
- // Multiply quat point by unproject matrix
|
|
|
|
|
|
+ // Multiply quat point by unprojecte matrix
|
|
Quaternion qtransformed = { // QuaternionTransform(quat, matViewProjInv)
|
|
Quaternion qtransformed = { // QuaternionTransform(quat, matViewProjInv)
|
|
matViewProjInv.m0*quat.x + matViewProjInv.m4*quat.y + matViewProjInv.m8*quat.z + matViewProjInv.m12*quat.w,
|
|
matViewProjInv.m0*quat.x + matViewProjInv.m4*quat.y + matViewProjInv.m8*quat.z + matViewProjInv.m12*quat.w,
|
|
matViewProjInv.m1*quat.x + matViewProjInv.m5*quat.y + matViewProjInv.m9*quat.z + matViewProjInv.m13*quat.w,
|
|
matViewProjInv.m1*quat.x + matViewProjInv.m5*quat.y + matViewProjInv.m9*quat.z + matViewProjInv.m13*quat.w,
|