[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49315] branches/soc-2012-bratwurst/source /blender/editors/transform/transform_manipulator.c: Another iteration of the manipulator.

[Jorge Rodriguez]

Revision: 49315
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49315
Author:   vino
Date:     2012-07-28 00:50:38 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Another iteration of the manipulator. The 2-dimension scaling blocks have become lines instead, but the same block area is used to control them. Thus, it has the same function but is a bit less visually cluttered.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_manipulator.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/transform/transform_manipulator.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/transform/transform_manipulator.c	2012-07-28 00:08:26 UTC (rev 49314)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform_manipulator.c	2012-07-28 00:50:38 UTC (rev 49315)
@@ -1247,11 +1247,21 @@
 		glPopMatrix();
 
 		glPushMatrix();
-			glTranslatef(dz*0.3f, 0.0, dz*0.3f);
-			if(G.f & G_PICKSEL) glLoadName(MAN_SCALE_XZ);
-			manipulator_setcolor(v3d, 'Z', colcode, axisBlendAngle(rv3d->twangle[2]), MAN_SCALE_XZ);
-			glScalef(2, 0.3, 2);
-			drawsolidcube(cywid);
+			if(G.f & G_PICKSEL) {
+				glLoadName(MAN_SCALE_XZ);
+				glTranslatef(dz*0.3f, 0.0, dz*0.3f);
+				glScalef(2, 0.3, 2);
+				drawsolidcube(cywid);
+			} else {
+				manipulator_setcolor(v3d, 'Z', colcode, axisBlendAngle(rv3d->twangle[2]), MAN_SCALE_XZ);
+				glScalef(0.45, 0.45, 0.45);
+				glBegin(GL_LINES);
+					glVertex3f(1, 0, 0);
+					glVertex3f(1, 0, 1);
+					glVertex3f(1, 0, 1);
+					glVertex3f(0, 0, 1);
+				glEnd();
+			}
 		glPopMatrix();
 	}
 
@@ -1265,11 +1275,21 @@
 		glPopMatrix();
 
 		glPushMatrix();
-			glTranslatef(dz*0.3f, dz*0.3f, 0.0);
-			if(G.f & G_PICKSEL) glLoadName(MAN_SCALE_XY);
-			manipulator_setcolor(v3d, 'X', colcode, axisBlendAngle(rv3d->twangle[0]), MAN_SCALE_XY);
-			glScalef(2, 2, 0.3);
-			drawsolidcube(cywid);
+			if(G.f & G_PICKSEL) {
+				glLoadName(MAN_SCALE_XY);
+				glTranslatef(dz*0.3f, dz*0.3f, 0.0);
+				glScalef(2, 2, 0.3);
+				drawsolidcube(cywid);
+			} else {
+				manipulator_setcolor(v3d, 'X', colcode, axisBlendAngle(rv3d->twangle[0]), MAN_SCALE_XY);
+				glScalef(0.45, 0.45, 0.45);
+				glBegin(GL_LINES);
+					glVertex3f(1, 0, 0);
+					glVertex3f(1, 1, 0);
+					glVertex3f(1, 1, 0);
+					glVertex3f(0, 1, 0);
+				glEnd();
+			}
 		glPopMatrix();
 	}
 
@@ -1283,11 +1303,21 @@
 		glPopMatrix();
 
 		glPushMatrix();
-			glTranslatef(0.0, dz*0.3f, dz*0.3f);
-			if(G.f & G_PICKSEL) glLoadName(MAN_SCALE_YZ);
-			manipulator_setcolor(v3d, 'Y', colcode, axisBlendAngle(rv3d->twangle[1]), MAN_SCALE_YZ);
-			glScalef(0.3, 2, 2);
-			drawsolidcube(cywid);
+			if(G.f & G_PICKSEL) {
+				glLoadName(MAN_SCALE_YZ);
+				glTranslatef(0.0, dz*0.3f, dz*0.3f);
+				glScalef(0.3, 2, 2);
+				drawsolidcube(cywid);
+			} else {
+				manipulator_setcolor(v3d, 'Y', colcode, axisBlendAngle(rv3d->twangle[1]), MAN_SCALE_YZ);
+				glScalef(0.45, 0.45, 0.45);
+				glBegin(GL_LINES);
+					glVertex3f(0, 1, 0);
+					glVertex3f(0, 1, 1);
+					glVertex3f(0, 1, 1);
+					glVertex3f(0, 0, 1);
+				glEnd();
+			}
 		glPopMatrix();
 	}
 
@@ -1391,7 +1421,7 @@
 		glPopMatrix();
 
 		glPushMatrix();
-			glTranslatef(0.0, 0.0, dz*0.75f);
+			glTranslatef(0.0, 0.0, dz*0.72f);
 			if(G.f & G_PICKSEL) glLoadName(MAN_TRANS_XZ);
 			manipulator_setcolor(v3d, 'Z', colcode, axisBlendAngle(rv3d->twangle[2]), MAN_TRANS_XZ);
 			glScalef(1.3, 0.3, 1.3);
@@ -1410,7 +1440,7 @@
 		glPopMatrix();
 
 		glPushMatrix();
-			glTranslatef(dz*0.75f, 0.0, 0.0);
+			glTranslatef(dz*0.72f, 0.0, 0.0);
 			if(G.f & G_PICKSEL) glLoadName(MAN_TRANS_XY);
 			manipulator_setcolor(v3d, 'X', colcode, axisBlendAngle(rv3d->twangle[0]), MAN_TRANS_XY);
 			glScalef(1.3, 1.3, 0.3);
@@ -1429,7 +1459,7 @@
 		glPopMatrix();
 
 		glPushMatrix();
-			glTranslatef(0.0, dz*0.75f, 0.0);
+			glTranslatef(0.0, dz*0.72f, 0.0);
 			if(G.f & G_PICKSEL) glLoadName(MAN_TRANS_YZ);
 			manipulator_setcolor(v3d, 'Y', colcode, axisBlendAngle(rv3d->twangle[1]), MAN_TRANS_YZ);
 			glScalef(0.3, 1.3, 1.3);