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

Added build problem with using float Matrix.

Browse Source
This commit is contained in:
Robert Osfield
2012-02-28 11:37:09 +00:00
parent 11c9ec4f7d
commit 84ca21655e
4 changed files with 114 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/osg/Matrixd
View File

@@ -28,6 +28,7 @@ class OSG_EXPORT Matrixd
public:
typedef double value_type;
typedef float other_value_type;
inline Matrixd() { makeIdentity(); }
inline Matrixd( const Matrixd& mat) { set(mat.ptr()); }
@@ -144,13 +145,19 @@ class OSG_EXPORT Matrixd
double zNear, double zFar);
/** Get the orthographic settings of the orthographic projection matrix.
* Note, if matrix is not an orthographic matrix then invalid values
* Note, if matrix is not an orthographic matrix then invalid values
* will be returned.
*/
bool getOrtho(double& left, double& right,
double& bottom, double& top,
double& zNear, double& zFar) const;
/** float version of getOrtho(..) */
bool getOrtho(float& left, float& right,
float& bottom, float& top,
float& zNear, float& zFar) const;
/** Set to a 2D orthographic projection.
* See glOrtho2D for further details.
*/
@@ -176,6 +183,11 @@ class OSG_EXPORT Matrixd
double& bottom, double& top,
double& zNear, double& zFar) const;
/** float version of getFrustum(..) */
bool getFrustum(float& left, float& right,
float& bottom, float& top,
float& zNear, float& zFar) const;
/** Set to a symmetrical perspective projection.
* See gluPerspective for further details.
* Aspect ratio is defined as width/height.
@@ -186,7 +198,7 @@ class OSG_EXPORT Matrixd
/** Get the frustum settings of a symmetric perspective projection
* matrix.
* Return false if matrix is not a perspective matrix,
* where parameter values are undefined.
* where parameter values are undefined.
* Note, if matrix is not a symmetric perspective matrix then the
* shear will be lost.
* Asymmetric matrices occur when stereo, power walls, caves and
@@ -196,6 +208,10 @@ class OSG_EXPORT Matrixd
bool getPerspective(double& fovy, double& aspectRatio,
double& zNear, double& zFar) const;
/** float version of getPerspective(..) */
bool getPerspective(float& fovy, float& aspectRatio,
float& zNear, float& zFar) const;
/** Set the position and orientation to be a view matrix,
* using the same convention as gluLookAt.
*/

20
include/osg/Matrixf
View File

@@ -28,6 +28,7 @@ class OSG_EXPORT Matrixf
public:
typedef float value_type;
typedef double other_value_type;
inline Matrixf() { makeIdentity(); }
inline Matrixf( const Matrixf& mat) { set(mat.ptr()); }
@@ -144,13 +145,19 @@ class OSG_EXPORT Matrixf
double zNear, double zFar);
/** Get the orthographic settings of the orthographic projection matrix.
* Note, if matrix is not an orthographic matrix then invalid values
* Note, if matrix is not an orthographic matrix then invalid values
* will be returned.
*/
bool getOrtho(double& left, double& right,
double& bottom, double& top,
double& zNear, double& zFar) const;
/** float version of getOrtho(..) */
bool getOrtho(float& left, float& right,
float& bottom, float& top,
float& zNear, float& zFar) const;
/** Set to a 2D orthographic projection.
* See glOrtho2D for further details.
*/
@@ -176,6 +183,11 @@ class OSG_EXPORT Matrixf
double& bottom, double& top,
double& zNear, double& zFar) const;
/** float version of getFrustum(..) */
bool getFrustum(float& left, float& right,
float& bottom, float& top,
float& zNear, float& zFar) const;
/** Set to a symmetrical perspective projection.
* See gluPerspective for further details.
* Aspect ratio is defined as width/height.
@@ -186,7 +198,7 @@ class OSG_EXPORT Matrixf
/** Get the frustum settings of a symmetric perspective projection
* matrix.
* Return false if matrix is not a perspective matrix,
* where parameter values are undefined.
* where parameter values are undefined.
* Note, if matrix is not a symmetric perspective matrix then the
* shear will be lost.
* Asymmetric matrices occur when stereo, power walls, caves and
@@ -196,6 +208,10 @@ class OSG_EXPORT Matrixf
bool getPerspective(double& fovy, double& aspectRatio,
double& zNear, double& zFar) const;
/** float version of getPerspective(..) */
bool getPerspective(float& fovy, float& aspectRatio,
float& zNear, float& zFar) const;
/** Set the position and orientation to be a view matrix,
* using the same convention as gluLookAt.
*/

90
src/osg/Matrix_implementation.cpp
View File

@@ -823,9 +823,9 @@ void Matrix_implementation::makeOrtho(double left, double right,
SET_ROW(3, tx, ty, tz, 1.0 )
}
bool Matrix_implementation::getOrtho(double& left, double& right,
double& bottom, double& top,
double& zNear, double& zFar) const
bool Matrix_implementation::getOrtho(Matrix_implementation::value_type& left, Matrix_implementation::value_type& right,
Matrix_implementation::value_type& bottom, Matrix_implementation::value_type& top,
Matrix_implementation::value_type& zNear, Matrix_implementation::value_type& zFar) const
{
if (_mat[0][3]!=0.0 || _mat[1][3]!=0.0 || _mat[2][3]!=0.0 || _mat[3][3]!=1.0) return false;
@@ -841,6 +841,26 @@ bool Matrix_implementation::getOrtho(double& left, double& right,
return true;
}
bool Matrix_implementation::getOrtho(Matrix_implementation::other_value_type& left, Matrix_implementation::other_value_type& right,
Matrix_implementation::other_value_type& bottom, Matrix_implementation::other_value_type& top,
Matrix_implementation::other_value_type& zNear, Matrix_implementation::other_value_type& zFar) const
{
Matrix_implementation::value_type temp_left, temp_right, temp_bottom, temp_top, temp_zNear, temp_zFar;
if (getOrtho(temp_left, temp_right, temp_bottom, temp_top, temp_zNear, temp_zFar))
{
left = temp_left;
right = temp_right;
bottom = temp_bottom;
top = temp_top;
zNear = temp_zNear;
zFar = temp_zFar;
return true;
}
else
{
return false;
}
}
void Matrix_implementation::makeFrustum(double left, double right,
double bottom, double top,
@@ -857,17 +877,17 @@ void Matrix_implementation::makeFrustum(double left, double right,
SET_ROW(3, 0.0, 0.0, D, 0.0 )
}
bool Matrix_implementation::getFrustum(double& left, double& right,
double& bottom, double& top,
double& zNear, double& zFar) const
bool Matrix_implementation::getFrustum(Matrix_implementation::value_type& left, Matrix_implementation::value_type& right,
Matrix_implementation::value_type& bottom, Matrix_implementation::value_type& top,
Matrix_implementation::value_type& zNear, Matrix_implementation::value_type& zFar) const
{
if (_mat[0][3]!=0.0 || _mat[1][3]!=0.0 || _mat[2][3]!=-1.0 || _mat[3][3]!=0.0)
return false;
// note: near and far must be used inside this method instead of zNear and zFar
// because zNear and zFar are references and they may point to the same variable.
double temp_near = _mat[3][2] / (_mat[2][2]-1.0);
double temp_far = _mat[3][2] / (1.0+_mat[2][2]);
Matrix_implementation::value_type temp_near = _mat[3][2] / (_mat[2][2]-1.0);
Matrix_implementation::value_type temp_far = _mat[3][2] / (1.0+_mat[2][2]);
left = temp_near * (_mat[2][0]-1.0) / _mat[0][0];
right = temp_near * (1.0+_mat[2][0]) / _mat[0][0];
@@ -881,6 +901,26 @@ bool Matrix_implementation::getFrustum(double& left, double& right,
return true;
}
bool Matrix_implementation::getFrustum(Matrix_implementation::other_value_type& left, Matrix_implementation::other_value_type& right,
Matrix_implementation::other_value_type& bottom, Matrix_implementation::other_value_type& top,
Matrix_implementation::other_value_type& zNear, Matrix_implementation::other_value_type& zFar) const
{
Matrix_implementation::value_type temp_left, temp_right, temp_bottom, temp_top, temp_zNear, temp_zFar;
if (getFrustum(temp_left, temp_right, temp_bottom, temp_top, temp_zNear, temp_zFar))
{
left = temp_left;
right = temp_right;
bottom = temp_bottom;
top = temp_top;
zNear = temp_zNear;
zFar = temp_zFar;
return true;
}
else
{
return false;
}
}
void Matrix_implementation::makePerspective(double fovy,double aspectRatio,
double zNear, double zFar)
@@ -894,18 +934,18 @@ void Matrix_implementation::makePerspective(double fovy,double aspectRatio,
makeFrustum(left,right,bottom,top,zNear,zFar);
}
bool Matrix_implementation::getPerspective(double& fovy,double& aspectRatio,
double& zNear, double& zFar) const
bool Matrix_implementation::getPerspective(Matrix_implementation::value_type& fovy, Matrix_implementation::value_type& aspectRatio,
Matrix_implementation::value_type& zNear, Matrix_implementation::value_type& zFar) const
{
double right = 0.0;
double left = 0.0;
double top = 0.0;
double bottom = 0.0;
Matrix_implementation::value_type right = 0.0;
Matrix_implementation::value_type left = 0.0;
Matrix_implementation::value_type top = 0.0;
Matrix_implementation::value_type bottom = 0.0;
// note: near and far must be used inside this method instead of zNear and zFar
// because zNear and zFar are references and they may point to the same variable.
double temp_near = 0.0;
double temp_far = 0.0;
Matrix_implementation::value_type temp_near = 0.0;
Matrix_implementation::value_type temp_far = 0.0;
// get frustum and compute results
bool r = getFrustum(left,right,bottom,top,temp_near,temp_far);
@@ -919,6 +959,24 @@ bool Matrix_implementation::getPerspective(double& fovy,double& aspectRatio,
return r;
}
bool Matrix_implementation::getPerspective(Matrix_implementation::other_value_type& fovy, Matrix_implementation::other_value_type& aspectRatio,
Matrix_implementation::other_value_type& zNear, Matrix_implementation::other_value_type& zFar) const
{
Matrix_implementation::value_type temp_fovy, temp_aspectRatio, temp_zNear, temp_zFar;
if (getPerspective(temp_fovy, temp_aspectRatio, temp_zNear, temp_zFar))
{
fovy = temp_fovy;
aspectRatio = temp_aspectRatio;
zNear = temp_zNear;
zFar = temp_zFar;
return true;
}
else
{
return false;
}
}
void Matrix_implementation::makeLookAt(const Vec3d& eye,const Vec3d& center,const Vec3d& up)
{
Vec3d f(center-eye);

8
src/osgShadow/ViewDependentShadowMap.cpp
View File

@@ -209,8 +209,8 @@ void VDSMCameraCullCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
OSG_INFO<<"RTT Projection matrix "<<projection<<std::endl;
double left, right, bottom, top, zNear, zFar;
double epsilon = 1e-6;
osg::Matrix::value_type left, right, bottom, top, zNear, zFar;
osg::Matrix::value_type epsilon = 1e-6;
if (fabs(projection(0,3))<epsilon && fabs(projection(1,3))<epsilon && fabs(projection(2,3))<epsilon )
{
projection.getOrtho(left, right,
@@ -533,8 +533,8 @@ ViewDependentShadowMap::Frustum::Frustum(osgUtil::CullVisitor* cv, double minZNe
if (cv->getComputeNearFarMode()!=osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR)
{
double zNear = osg::maximum(static_cast<double>(cv->getCalculatedNearPlane()),minZNear);
double zFar = osg::minimum(static_cast<double>(cv->getCalculatedFarPlane()),maxZFar);
osg::Matrix::value_type zNear = osg::maximum<osg::Matrix::value_type>(cv->getCalculatedNearPlane(),minZNear);
osg::Matrix::value_type zFar = osg::minimum<osg::Matrix::value_type>(cv->getCalculatedFarPlane(),maxZFar);
cv->clampProjectionMatrix(projectionMatrix, zNear, zFar);