[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14024] trunk/blender/source/blender/src/ drawimage.c: removed printf and also removed some unneeded stuff, correct angles aren't needed since its only comparing the 2 angles

[Campbell Barton]

Revision: 14024
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14024
Author:   campbellbarton
Date:     2008-03-09 16:07:01 +0100 (Sun, 09 Mar 2008)

Log Message:
-----------
removed printf and also removed some unneeded stuff, correct angles aren't needed since its only comparing the 2 angles

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawimage.c

Modified: trunk/blender/source/blender/src/drawimage.c
===================================================================
--- trunk/blender/source/blender/src/drawimage.c	2008-03-09 14:49:12 UTC (rev 14023)
+++ trunk/blender/source/blender/src/drawimage.c	2008-03-09 15:07:01 UTC (rev 14024)
@@ -678,21 +678,27 @@
 							VECSUB2D(av2, tface->uv[0], tface->uv[1]); Normalize2(av2);
 							VECSUB2D(av3, tface->uv[1], tface->uv[2]); Normalize2(av3);
 							VECSUB2D(av4, tface->uv[2], tface->uv[3]); Normalize2(av4);
-							uvang1 = 90-((NormalizedVecAngle2_2D(av1, av2) * 180.0/M_PI)-90);
-							uvang2 = 90-((NormalizedVecAngle2_2D(av2, av3) * 180.0/M_PI)-90);
-							uvang3 = 90-((NormalizedVecAngle2_2D(av3, av4) * 180.0/M_PI)-90);
-							uvang4 = 90-((NormalizedVecAngle2_2D(av4, av1) * 180.0/M_PI)-90);
 							
+							/* This is the correct angle however we are only comparing angles
+							 * uvang1 = 90-((NormalizedVecAngle2_2D(av1, av2) * 180.0/M_PI)-90);*/
+							uvang1 = NormalizedVecAngle2_2D(av1, av2)*180.0/M_PI;
+							uvang2 = NormalizedVecAngle2_2D(av2, av3)*180.0/M_PI;
+							uvang3 = NormalizedVecAngle2_2D(av3, av4)*180.0/M_PI;
+							uvang4 = NormalizedVecAngle2_2D(av4, av1)*180.0/M_PI;
+							
 							/* 3d angles */
 							VECSUB(av1, efa->v4->co, efa->v1->co); Normalize(av1);
 							VECSUB(av2, efa->v1->co, efa->v2->co); Normalize(av2);
 							VECSUB(av3, efa->v2->co, efa->v3->co); Normalize(av3);
 							VECSUB(av4, efa->v3->co, efa->v4->co); Normalize(av4);
-							ang1 = 90-((NormalizedVecAngle2(av1, av2) * 180.0/M_PI)-90);
-							ang2 = 90-((NormalizedVecAngle2(av2, av3) * 180.0/M_PI)-90);
-							ang3 = 90-((NormalizedVecAngle2(av3, av4) * 180.0/M_PI)-90);
-							ang4 = 90-((NormalizedVecAngle2(av4, av1) * 180.0/M_PI)-90);
 							
+							/* This is the correct angle however we are only comparing angles
+							 * ang1 = 90-((NormalizedVecAngle2(av1, av2) * 180.0/M_PI)-90);*/
+							ang1 = NormalizedVecAngle2(av1, av2)*180.0/M_PI;
+							ang2 = NormalizedVecAngle2(av2, av3)*180.0/M_PI;
+							ang3 = NormalizedVecAngle2(av3, av4)*180.0/M_PI;
+							ang4 = NormalizedVecAngle2(av4, av1)*180.0/M_PI;
+							
 							glBegin(GL_QUADS);
 							
 							weight_to_rgb(fabs(uvang1-ang1)/180.0, col, col+1, col+2);
@@ -707,7 +713,6 @@
 							weight_to_rgb(fabs(uvang4-ang4)/180.0, col, col+1, col+2);
 							glColor3fv(col);
 							glVertex2fv(tface->uv[3]);
-							printf("%f %f %f %f | %f %f %f %f\n", uvang1,uvang2,uvang3,uvang4,  ang1,ang2,ang3,ang4);
 							
 						} else {
 #if 0						/* Simple but slow, better reuse normalized vectors */
@@ -725,17 +730,22 @@
 							VECSUB2D(av1, tface->uv[2], tface->uv[0]); Normalize2(av1);
 							VECSUB2D(av2, tface->uv[0], tface->uv[1]); Normalize2(av2);
 							VECSUB2D(av3, tface->uv[1], tface->uv[2]); Normalize2(av3);
-							uvang1 = 90-((NormalizedVecAngle2_2D(av1, av2) * 180.0/M_PI)-90);
-							uvang2 = 90-((NormalizedVecAngle2_2D(av2, av3) * 180.0/M_PI)-90);
-							uvang3 = 90-((NormalizedVecAngle2_2D(av3, av1) * 180.0/M_PI)-90);
 							
+							/* This is the correct angle however we are only comparing angles
+							 * uvang1 = 90-((NormalizedVecAngle2_2D(av1, av2) * 180.0/M_PI)-90); */
+							uvang1 = NormalizedVecAngle2_2D(av1, av2)*180.0/M_PI;
+							uvang2 = NormalizedVecAngle2_2D(av2, av3)*180.0/M_PI;
+							uvang3 = NormalizedVecAngle2_2D(av3, av1)*180.0/M_PI;
+							
 							/* 3d angles */
 							VECSUB(av1, efa->v3->co, efa->v1->co); Normalize(av1);
 							VECSUB(av2, efa->v1->co, efa->v2->co); Normalize(av2);
 							VECSUB(av3, efa->v2->co, efa->v3->co); Normalize(av3);
-							ang1 = 90-((NormalizedVecAngle2(av1, av2) * 180.0/M_PI)-90);
-							ang2 = 90-((NormalizedVecAngle2(av2, av3) * 180.0/M_PI)-90);
-							ang3 = 90-((NormalizedVecAngle2(av3, av1) * 180.0/M_PI)-90);
+							/* This is the correct angle however we are only comparing angles
+							 * ang1 = 90-((NormalizedVecAngle2(av1, av2) * 180.0/M_PI)-90); */
+							ang1 = NormalizedVecAngle2(av1, av2)*180.0/M_PI;
+							ang2 = NormalizedVecAngle2(av2, av3)*180.0/M_PI;
+							ang3 = NormalizedVecAngle2(av3, av1)*180.0/M_PI;
 							
 							
 							glBegin(GL_TRIANGLES);