Changeset 10193 for code/trunk/src/libraries/tools/DebugDrawer.cc
- Timestamp:
- Jan 11, 2015, 10:06:04 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/libraries/tools/DebugDrawer.cc
r10191 r10193 146 146 Ogre::Matrix4 transform(rotation); 147 147 transform.setTrans(centre + rotation * Ogre::Vector3(0, height / 2, 0)); 148 this->buildCircle(transform, radius, segmentsCount, colour , alpha);148 this->buildCircle(transform, radius, segmentsCount, colour); 149 149 this->buildFilledCircle(transform, radius, segmentsCount, colour, true, alpha); 150 150 151 151 transform.setTrans(centre + rotation * Ogre::Vector3(0, -height / 2, 0)); 152 this->buildCircle(transform, radius, segmentsCount, colour , alpha);152 this->buildCircle(transform, radius, segmentsCount, colour); 153 153 this->buildFilledCircle(transform, radius, segmentsCount, colour, false, alpha); 154 154 … … 181 181 Ogre::Matrix4 transform(rotation); 182 182 transform.setTrans(centre + rotation * Ogre::Vector3(0, -height / 2, 0)); 183 this->buildCircle(transform, radius, segmentsCount, colour , alpha);183 this->buildCircle(transform, radius, segmentsCount, colour); 184 184 this->buildFilledCircle(transform, radius, segmentsCount, colour, false, alpha); 185 185 … … 300 300 void DebugDrawer::drawCircle(const Ogre::Vector3& centre, const Ogre::Quaternion& rotation, float radius, const Ogre::ColourValue& colour, bool isFilled) 301 301 { 302 int segmentsCount = std::min (100.0, radius / 2.5);302 int segmentsCount = std::min<int>(100, (int) (radius / 2.5)); 303 303 304 304 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) 313 313 { 314 int segmentsCount = std::min (100.0, radius / 2.5);314 int segmentsCount = std::min<int>(100, (int) (radius / 2.5)); 315 315 316 316 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) 323 323 { 324 int segmentsCount = std::min (100.0, radius / 2.5);324 int segmentsCount = std::min<int>(100, (int) (radius / 2.5)); 325 325 326 326 if (isFilled)
Note: See TracChangeset
for help on using the changeset viewer.