FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fix for preprocessor _MP symbol clash with MFC.

Browse Source
This commit is contained in:
Don BURNS 2001-11-21 15:53:29 +00:00
parent c9535c68b4
commit 4ef08067b7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Camera
View File

@ -301,8 +301,8 @@ class SG_EXPORT Camera: public osg::Referenced
mutable ref_ptr<Matrix> _modelViewMatrix;
mutable ClippingVolume _clippingVolume;
mutable ref_ptr<Matrix> _MP;
mutable ref_ptr<Matrix> _inverseMP;
mutable ref_ptr<Matrix> _mp;
mutable ref_ptr<Matrix> _inversemp;
void calculateMatricesAndClippingVolume() const;

16
src/osg/Camera.cpp
View File

@ -667,11 +667,11 @@ void Camera::calculateMatricesAndClippingVolume() const
_clippingVolume.transformProvidingInverse(*_modelViewMatrix);
if (!_MP.valid()) _MP = new Matrix;
_MP->mult(*_modelViewMatrix,*_projectionMatrix);
if (!_mp.valid()) _mp = new Matrix;
_mp->mult(*_modelViewMatrix,*_projectionMatrix);
if (!_inverseMP.valid()) _inverseMP = new Matrix;
_inverseMP->invert(*_MP);
if (!_inversemp.valid()) _inversemp = new Matrix;
_inversemp->invert(*_mp);
_dirty = false;
}
@ -686,9 +686,9 @@ void Camera::ensureOrthogonalUpVector()
const bool Camera::project(const Vec3& obj,const Viewport& viewport,Vec3& win) const
{
if (_MP.valid())
if (_mp.valid())
{
Vec3 v = obj * (*_MP);
Vec3 v = obj * (*_mp);
win.set(
(float)viewport.x() + (float)viewport.width()*(v[0]+1.0f)*0.5f,
@ -704,7 +704,7 @@ const bool Camera::project(const Vec3& obj,const Viewport& viewport,Vec3& win) c
const bool Camera::unproject(const Vec3& win,const Viewport& viewport,Vec3& obj) const
{
if (_inverseMP.valid())
if (_inversemp.valid())
{
Vec3 v(
2.0f*(win[0]-(float)viewport.x())/viewport.width() - 1.0f,
@ -712,7 +712,7 @@ const bool Camera::unproject(const Vec3& win,const Viewport& viewport,Vec3& obj)
2.0f*(win[2]) - 1.0f
);
obj = v * (*_inverseMP);
obj = v * (*_inversemp);
return true;
}