Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2004-04-26 11:19:18 +0400
committerKester Maddock <Christopher.Maddock.1@uni.massey.ac.nz>2004-04-26 11:19:18 +0400
commit5df9926f491f532422b20cb3315321e245480129 (patch)
tree721cc3c04546ed023f074d9f124faf7428aa33bb /source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
parentf331fc8fbbae05530fe0d28b510a5c0deeb03968 (diff)
Fix MouseFocus Sensor objects for dynamic cameras. (Bug 1165)
Diffstat (limited to 'source/gameengine/Ketsji/KX_MouseFocusSensor.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_MouseFocusSensor.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
index 6f6f86bd782..3d6264674bc 100644
--- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
+++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
@@ -208,14 +208,11 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
);
/* camera to world */
- MT_Matrix4x4 camcs_wcs_matrix;
- cam->GetModelviewMatrix(camcs_wcs_matrix);
- camcs_wcs_matrix.invert();
+ MT_Matrix4x4 camcs_wcs_matrix = MT_Matrix4x4(cam->GetCameraToWorld());
- MT_Matrix4x4 clip_camcs_matrix;
/* badly defined, the first time round.... I wonder why... I might
* want to guard against floating point errors here.*/
- cam->GetProjectionMatrix(clip_camcs_matrix);
+ MT_Matrix4x4 clip_camcs_matrix = MT_Matrix4x4(cam->GetProjectionMatrix());
clip_camcs_matrix.invert();
/* shoot-points: clip to cam to wcs . win to clip was already done.*/
@@ -223,7 +220,7 @@ bool KX_MouseFocusSensor::ParentObjectHasFocus(void)
topoint = clip_camcs_matrix * topoint;
frompoint = camcs_wcs_matrix * frompoint;
topoint = camcs_wcs_matrix * topoint;
-
+
/* from hom wcs to 3d wcs: */
MT_Point3 frompoint3 = MT_Point3(frompoint[0]/frompoint[3],
frompoint[1]/frompoint[3],