Fixed Geometry module failures.

Removed default parameter from Transform.
Removed the TransformXX typedefs.
Removed references to TransformXX from unit tests and docs.
Assigning Transforms to a sub-group is now forbidden at compile time.
Products should now properly support the Isometry flag.
Fixed alignment checks in MapBase.
This commit is contained in:
Hauke Heibel
2010-08-17 20:03:50 +02:00
parent 87aafc9169
commit 85fdcdf055
19 changed files with 93 additions and 89 deletions

View File

@@ -217,7 +217,7 @@ void Camera::updateViewMatrix(void) const
}
}
const Transform3f& Camera::viewMatrix(void) const
const Affine3f& Camera::viewMatrix(void) const
{
updateViewMatrix();
return mViewMatrix;

View File

@@ -90,7 +90,7 @@ class Camera
void setTarget(const Eigen::Vector3f& target);
inline const Eigen::Vector3f& target(void) { return mTarget; }
const Eigen::Transform3f& viewMatrix(void) const;
const Eigen::Affine3f& viewMatrix(void) const;
const Eigen::Matrix4f& projectionMatrix(void) const;
void rotateAroundTarget(const Eigen::Quaternionf& q);
@@ -116,7 +116,7 @@ class Camera
Frame mFrame;
mutable Eigen::Transform3f mViewMatrix;
mutable Eigen::Affine3f mViewMatrix;
mutable Eigen::Matrix4f mProjectionMatrix;
mutable bool mViewIsUptodate;

View File

@@ -92,7 +92,7 @@ class FancySpheres
Vector3f ax1 = ax0.unitOrthogonal();
Quaternionf q;
q.setFromTwoVectors(Vector3f::UnitZ(), ax0);
Transform3f t = Translation3f(c) * q * Scaling(mRadii[i]+radius);
Affine3f t = Translation3f(c) * q * Scaling(mRadii[i]+radius);
for (int j=0; j<5; ++j)
{
Vector3f newC = c + ( (AngleAxisf(angles[j*2+1], ax0)
@@ -113,7 +113,7 @@ class FancySpheres
glEnable(GL_NORMALIZE);
for (int i=0; i<end; ++i)
{
Transform3f t = Translation3f(mCenters[i]) * Scaling(mRadii[i]);
Affine3f t = Translation3f(mCenters[i]) * Scaling(mRadii[i]);
gpu.pushMatrix(GL_MODELVIEW);
gpu.multMatrix(t.matrix(),GL_MODELVIEW);
mIcoSphere.draw(2);