Changeset 10193 for code/trunk/src/libraries/tools/DebugDrawer.cc

Timestamp:

Jan 11, 2015, 10:06:04 PM (9 years ago)

Author:

landauf

Message:

details, made debug drawer more configurable

File:

• code/trunk/src/libraries/tools/DebugDrawer.cc (modified) (5 diffs)

code/trunk/src/libraries/tools/DebugDrawer.cc

@@ -146 +146 @@
         Ogre::Matrix4 transform(rotation);
         transform.setTrans(centre + rotation * Ogre::Vector3(0, height / 2, 0));
-        this->buildCircle(transform, radius, segmentsCount, colour, alpha);
+        this->buildCircle(transform, radius, segmentsCount, colour);
         this->buildFilledCircle(transform, radius, segmentsCount, colour, true, alpha);
 
         transform.setTrans(centre + rotation * Ogre::Vector3(0, -height / 2, 0));
-        this->buildCircle(transform, radius, segmentsCount, colour, alpha);
+        this->buildCircle(transform, radius, segmentsCount, colour);
         this->buildFilledCircle(transform, radius, segmentsCount, colour, false, alpha);
 
@@ -181 +181 @@
         Ogre::Matrix4 transform(rotation);
         transform.setTrans(centre + rotation * Ogre::Vector3(0, -height / 2, 0));
-        this->buildCircle(transform, radius, segmentsCount, colour, alpha);
+        this->buildCircle(transform, radius, segmentsCount, colour);
         this->buildFilledCircle(transform, radius, segmentsCount, colour, false, alpha);
 
@@ -300 +300 @@
     void DebugDrawer::drawCircle(const Ogre::Vector3& centre, const Ogre::Quaternion& rotation, float radius, const Ogre::ColourValue& colour, bool isFilled)
     {
-        int segmentsCount = std::min(100.0, radius / 2.5);
+        int segmentsCount = std::min<int>(100, (int) (radius / 2.5));
 
         Ogre::Matrix4 transform(rotation);
@@ -312 +312 @@
     void DebugDrawer::drawCylinder(const Ogre::Vector3& centre, const Ogre::Quaternion& rotation, float radius, float height, const Ogre::ColourValue& colour, bool isFilled)
     {
-        int segmentsCount = std::min(100.0, radius / 2.5);
+        int segmentsCount = std::min<int>(100, (int) (radius / 2.5));
 
         if (isFilled)
@@ -322 +322 @@
     void DebugDrawer::drawCone(const Ogre::Vector3& centre, const Ogre::Quaternion& rotation, float radius, float height, const Ogre::ColourValue& colour, bool isFilled)
     {
-        int segmentsCount = std::min(100.0, radius / 2.5);
+        int segmentsCount = std::min<int>(100, (int) (radius / 2.5));
 
         if (isFilled)