From 4867a33379fe194b9a76cbd079695145280d8ed3 Mon Sep 17 00:00:00 2001
From: cignoni <paolo.cignoni@isti.cnr.it>
Date: Wed, 17 Feb 2016 11:11:19 +0000
Subject: [PATCH] corrected error in the formula of supertoroid: wrong radii
 usage

---
 vcg/complex/algorithms/create/platonic.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vcg/complex/algorithms/create/platonic.h b/vcg/complex/algorithms/create/platonic.h
index d600425a..ddd89391 100644
--- a/vcg/complex/algorithms/create/platonic.h
+++ b/vcg/complex/algorithms/create/platonic.h
@@ -615,13 +615,13 @@ void SuperToroid(MeshType &m, float hRingRadius, float vRingRadius, float vSquar
   m.Clear();
   ScalarType angleStepV = (2.0f*M_PI)/vRingDiv;
   ScalarType angleStepH = (2.0f*M_PI)/hRingDiv;
-  auto fnC=[](float a, float b){
-     return math::Sgn(cos(a))*pow(abs(cos(a)),b);
+  auto fnC=[](ScalarType a, ScalarType b){
+    return math::Sgn(cos(a))*pow(fabs(cos(a)),b);
   };
-  auto fnS=[](float a, float b){
-      return math::Sgn(sin(a))*pow(abs(sin(a)),b);
+  auto fnS=[](ScalarType a, ScalarType b){
+    return math::Sgn(sin(a))*pow(fabs(sin(a)),b);
   };
-  float u,v;
+  ScalarType u,v;
   int count;
   Allocator<MeshType>::AddVertices(m,(vRingDiv+1)*(hRingDiv+1));
   for(int i=0;i<hRingDiv+1;++i)
@@ -632,9 +632,9 @@ void SuperToroid(MeshType &m, float hRingRadius, float vRingRadius, float vSquar
     {
       CoordType p;
       v=float(j%vRingDiv)*angleStepV;
-      p[0]= (hRingRadius+fnC(u,vSquareness))*fnC(v,hSquareness);
-      p[1]= (vRingRadius+fnC(u,vSquareness))*fnS(v,hSquareness);
-      p[2] = fnS(u,vSquareness);
+      p[0]= (hRingRadius+vRingRadius*fnC(u,vSquareness))*fnC(v,hSquareness);
+      p[1]= (hRingRadius+vRingRadius*fnC(u,vSquareness))*fnS(v,hSquareness);
+      p[2] = vRingRadius*fnS(u,vSquareness);
       m.vert[i*(vRingDiv+1)+count].P() = p;
       count++;
     }