Changeset 3192 for code/branches/pch/src/orxonox/objects/collisionshapes

Timestamp:

Jun 18, 2009, 10:00:15 AM (16 years ago)

Author:

rgrieder

Message:

Replaced <OgrePrerequisites.h> with "util/OgreForwardRefs.h": I haven't yet realised that OgrePrerequisites.h includes about every single std header by including the OgreMemoryManager.h file.
And while at it, I took care of some type conversions (partially revealed by the missing OgrePrerequisites.h that disabled warnings)

File:

• code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc (modified) (1 diff)

code/branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc

@@ -126 +126 @@
     bool CollisionShape::hasTransform() const
     {
-        return (!this->position_.positionEquals(Vector3(0, 0, 0), 0.001) ||
-                !this->orientation_.equals(Quaternion(1,0,0,0), Degree(0.1)));
+        return (!this->position_.positionEquals(Vector3(0, 0, 0), 0.001f) ||
+                !this->orientation_.equals(Quaternion(1,0,0,0), Degree(0.1f)));
     }