[EGIT] [core/efl] master 08/55: evas: torus is normalized in Evas_3D examples.

[Bogdan Devichev]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=88b30ef28c47106891d44f62798424c745ec1b8c

commit 88b30ef28c47106891d44f62798424c745ec1b8c
Author: Bogdan Devichev <b.devic...@samsung.com>
Date:   Wed Apr 15 17:03:24 2015 +0200

    evas: torus is normalized in Evas_3D examples.
    
    Reviewers: Hermet, raster, cedric
    
    Reviewed By: cedric
    
    Subscribers: cedric
    
    Differential Revision: https://phab.enlightenment.org/D2334
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 src/examples/evas/evas-3d-primitives.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/examples/evas/evas-3d-primitives.c 
b/src/examples/evas/evas-3d-primitives.c
index 41b3fde..393ee16 100644
--- a/src/examples/evas/evas-3d-primitives.c
+++ b/src/examples/evas/evas-3d-primitives.c
@@ -457,7 +457,7 @@ evas_3d_add_terrain_frame(Eo *mesh, int frame, int p, vec2 
tex_scale)
 }
 
 void
-evas_3d_add_torus_frame(Eo *mesh, int frame, float rratio, int p, vec2 
tex_scale)
+evas_3d_add_torus_frame(Eo *mesh, int frame, float ratio, int p, vec2 
tex_scale)
 {
    int vcount, icount, vccount, i, j;
    icount = p * p * 6;
@@ -470,6 +470,20 @@ evas_3d_add_torus_frame(Eo *mesh, int frame, float rratio, 
int p, vec2 tex_scale
 
    d = 2 * M_PI / p;
 
+   float rratio;
+
+   if ((ratio > 1.0) || (ratio < 0.0))
+     {
+        printf("Ratio of torus should be between 0.0 and 1.0. \n");
+        printf("Ratio = %f is a bad value, so 0.25 is used like default 
ratio.\n",
+                ratio);
+        rratio = 0.25;
+     }
+   else
+     {
+        rratio = ratio;
+     }
+
    for (j = 0; j < vccount; j++)
      {
         theta = j * d;
@@ -480,16 +494,16 @@ evas_3d_add_torus_frame(Eo *mesh, int frame, float 
rratio, int p, vec2 tex_scale
              fi = i * d;
              sinfi = sin(fi);
              cosfi = cos(fi);
-             vertices[i + j * vccount].x = (1 + rratio * cosfi) * costh;
-             vertices[i + j * vccount].y = (1 + rratio * cosfi) * sinth;
-             vertices[i + j * vccount].z = rratio * sinfi;
+             vertices[i + j * vccount].x = (1.0 - rratio + rratio * cosfi) * 
costh * 0.5;
+             vertices[i + j * vccount].y = (1.0 - rratio + rratio * cosfi) * 
sinth * 0.5;
+             vertices[i + j * vccount].z = rratio * sinfi * 0.5;
 
              normals[i + j * vccount].x = cosfi * costh;
              normals[i + j * vccount].y = cosfi * sinth;
              normals[i + j * vccount].z = sinfi;
 
-             tangents[i + j * vccount].x = - sinfi * costh;
-             tangents[i + j * vccount].y = - sinfi * sinth;
+             tangents[i + j * vccount].x = -sinfi * costh;
+             tangents[i + j * vccount].y = -sinfi * sinth;
              tangents[i + j * vccount].z = cosfi;
 
              _vec3_normalize(&normals[i + j * vccount]);

--