[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44959] trunk/blender/source: code cleanup :
Campbell Barton
ideasman42 at gmail.com
Sun Mar 18 07:01:34 CET 2012
Revision: 44959
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44959
Author: campbellbarton
Date: 2012-03-18 06:01:33 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
code cleanup:
* replace 2D vector copy with copy_v2_v2().
* use puts rather then printf for single strings.
* style cleanup for drawobject.c indentation.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/report.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-18 04:21:47 UTC (rev 44958)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-03-18 06:01:33 UTC (rev 44959)
@@ -3024,7 +3024,7 @@
void DM_debug_print(DerivedMesh *dm)
{
char *str = DM_debug_info(dm);
- printf("%s", str);
+ puts(str);
fflush(stdout);
MEM_freeN(str);
}
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-03-18 04:21:47 UTC (rev 44958)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-03-18 06:01:33 UTC (rev 44959)
@@ -2312,8 +2312,7 @@
for (j=0; j < mf_len; j++) {
lof = CustomData_get(ldata, lindex[j], CD_ORIGSPACE_MLOOP);
- of->uv[j][0] = lof->uv[0];
- of->uv[j][1] = lof->uv[1];
+ copy_v2_v2(of->uv[j], lof->uv);
}
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/report.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/report.c 2012-03-18 04:21:47 UTC (rev 44958)
+++ trunk/blender/source/blender/blenkernel/intern/report.c 2012-03-18 06:01:33 UTC (rev 44959)
@@ -256,7 +256,7 @@
if (cstring == NULL)
return;
- printf("%s", cstring);
+ puts(cstring);
fflush(stdout);
MEM_freeN(cstring);
}
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-03-18 04:21:47 UTC (rev 44958)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2012-03-18 06:01:33 UTC (rev 44959)
@@ -409,22 +409,22 @@
float *c = faceGridData[(y + 1)*gridSize + x + 1];
float *d = faceGridData[(y + 1)*gridSize + x + 0];
- if (tface) {
- tf->uv[0][0] = a[0]; tf->uv[0][1] = a[1];
- tf->uv[1][0] = d[0]; tf->uv[1][1] = d[1];
- tf->uv[2][0] = c[0]; tf->uv[2][1] = c[1];
- tf->uv[3][0] = b[0]; tf->uv[3][1] = b[1];
+ if (tf) {
+ copy_v2_v2(tf->uv[0], a);
+ copy_v2_v2(tf->uv[1], d);
+ copy_v2_v2(tf->uv[2], c);
+ copy_v2_v2(tf->uv[3], b);
+ tf++;
}
- if (mloopuv) {
- mluv[0].uv[0] = a[0]; mluv[0].uv[1] = a[1];
- mluv[1].uv[0] = d[0]; mluv[1].uv[1] = d[1];
- mluv[2].uv[0] = c[0]; mluv[2].uv[1] = c[1];
- mluv[3].uv[0] = b[0]; mluv[3].uv[1] = b[1];
+ if (mluv) {
+ copy_v2_v2(mluv[0].uv, a);
+ copy_v2_v2(mluv[1].uv, d);
+ copy_v2_v2(mluv[2].uv, c);
+ copy_v2_v2(mluv[3].uv, b);
+ mluv += 4;
}
- tf++;
- mluv+=4;
}
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2012-03-18 04:21:47 UTC (rev 44958)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2012-03-18 06:01:33 UTC (rev 44959)
@@ -1674,7 +1674,7 @@
uc= uc+(text->undo_buf[i]<<24); i++;
c_len= BLI_str_utf8_from_unicode(uc, c);
c[c_len]= '\0';
- printf ("%s", c);
+ puts(c);
}
}
} else if (op==UNDO_STO || op==UNDO_CTO) {
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-03-18 04:21:47 UTC (rev 44958)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2012-03-18 06:01:33 UTC (rev 44959)
@@ -525,103 +525,105 @@
float v3[3]= {0.0, 0.0, 0.0};
switch(drawtype) {
-
- case OB_PLAINAXES:
- for (axis=0; axis<3; axis++) {
+
+ case OB_PLAINAXES:
+ for (axis=0; axis<3; axis++) {
+ glBegin(GL_LINES);
+
+ v1[axis]= size;
+ v2[axis]= -size;
+ glVertex3fv(v1);
+ glVertex3fv(v2);
+
+ /* reset v1 & v2 to zero */
+ v1[axis]= v2[axis]= 0.0f;
+
+ glEnd();
+ }
+ break;
+ case OB_SINGLE_ARROW:
+
glBegin(GL_LINES);
-
- v1[axis]= size;
- v2[axis]= -size;
+ /* in positive z direction only */
+ v1[2]= size;
glVertex3fv(v1);
glVertex3fv(v2);
+ glEnd();
- /* reset v1 & v2 to zero */
- v1[axis]= v2[axis]= 0.0f;
+ /* square pyramid */
+ glBegin(GL_TRIANGLES);
+ v2[0]= size * 0.035f; v2[1] = size * 0.035f;
+ v3[0]= size * -0.035f; v3[1] = size * 0.035f;
+ v2[2]= v3[2]= size * 0.75f;
+
+ for (axis=0; axis<4; axis++) {
+ if (axis % 2 == 1) {
+ v2[0] = -v2[0];
+ v3[1] = -v3[1];
+ }
+ else {
+ v2[1] = -v2[1];
+ v3[0] = -v3[0];
+ }
+
+ glVertex3fv(v1);
+ glVertex3fv(v2);
+ glVertex3fv(v3);
+
+ }
glEnd();
- }
- break;
- case OB_SINGLE_ARROW:
-
- glBegin(GL_LINES);
- /* in positive z direction only */
- v1[2]= size;
- glVertex3fv(v1);
- glVertex3fv(v2);
- glEnd();
-
- /* square pyramid */
- glBegin(GL_TRIANGLES);
-
- v2[0]= size * 0.035f; v2[1] = size * 0.035f;
- v3[0]= size * -0.035f; v3[1] = size * 0.035f;
- v2[2]= v3[2]= size * 0.75f;
-
- for (axis=0; axis<4; axis++) {
- if (axis % 2 == 1) {
- v2[0] = -v2[0];
- v3[1] = -v3[1];
- }
- else {
- v2[1] = -v2[1];
- v3[0] = -v3[0];
- }
-
- glVertex3fv(v1);
- glVertex3fv(v2);
- glVertex3fv(v3);
-
- }
- glEnd();
-
- break;
- case OB_CUBE:
- drawcube_size(size);
- break;
-
- case OB_CIRCLE:
- drawcircle_size(size);
- break;
-
- case OB_EMPTY_SPHERE:
- draw_empty_sphere(size);
- break;
- case OB_EMPTY_CONE:
- draw_empty_cone(size);
- break;
+ break;
+ case OB_CUBE:
+ drawcube_size(size);
+ break;
- case OB_ARROWS:
- default:
- for (axis=0; axis<3; axis++) {
- const int arrow_axis= (axis==0) ? 1:0;
+ case OB_CIRCLE:
+ drawcircle_size(size);
+ break;
- glBegin(GL_LINES);
-
- v2[axis]= size;
- glVertex3fv(v1);
- glVertex3fv(v2);
+ case OB_EMPTY_SPHERE:
+ draw_empty_sphere(size);
+ break;
+
+ case OB_EMPTY_CONE:
+ draw_empty_cone(size);
+ break;
+
+ case OB_ARROWS:
+ default:
+ {
+ for (axis=0; axis<3; axis++) {
+ const int arrow_axis= (axis==0) ? 1:0;
+
+ glBegin(GL_LINES);
+
+ v2[axis]= size;
+ glVertex3fv(v1);
+ glVertex3fv(v2);
- v1[axis]= size*0.85f;
- v1[arrow_axis]= -size*0.08f;
- glVertex3fv(v1);
- glVertex3fv(v2);
+ v1[axis]= size*0.85f;
+ v1[arrow_axis]= -size*0.08f;
+ glVertex3fv(v1);
+ glVertex3fv(v2);
- v1[arrow_axis]= size*0.08f;
- glVertex3fv(v1);
- glVertex3fv(v2);
-
- glEnd();
+ v1[arrow_axis]= size*0.08f;
+ glVertex3fv(v1);
+ glVertex3fv(v2);
+
+ glEnd();
- v2[axis]+= size*0.125f;
-
- draw_xyz_wire(v2, size, axis);
-
-
- /* reset v1 & v2 to zero */
- v1[arrow_axis]= v1[axis]= v2[axis]= 0.0f;
+ v2[axis]+= size*0.125f;
+
+ draw_xyz_wire(v2, size, axis);
+
+
+ /* reset v1 & v2 to zero */
+ v1[arrow_axis]= v1[axis]= v2[axis]= 0.0f;
+ }
+ break;
}
- break;
}
}
@@ -939,21 +941,21 @@
{
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[0]); glVertex3fv(cube[1]);glVertex3fv(cube[2]); glVertex3fv(cube[3]);
- glVertex3fv(cube[0]); glVertex3fv(cube[4]);glVertex3fv(cube[5]); glVertex3fv(cube[6]);
- glVertex3fv(cube[7]); glVertex3fv(cube[4]);
+ glVertex3fv(cube[0]); glVertex3fv(cube[1]);glVertex3fv(cube[2]); glVertex3fv(cube[3]);
+ glVertex3fv(cube[0]); glVertex3fv(cube[4]);glVertex3fv(cube[5]); glVertex3fv(cube[6]);
+ glVertex3fv(cube[7]); glVertex3fv(cube[4]);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[1]); glVertex3fv(cube[5]);
+ glVertex3fv(cube[1]); glVertex3fv(cube[5]);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[2]); glVertex3fv(cube[6]);
+ glVertex3fv(cube[2]); glVertex3fv(cube[6]);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[3]); glVertex3fv(cube[7]);
+ glVertex3fv(cube[3]); glVertex3fv(cube[7]);
glEnd();
}
@@ -963,25 +965,25 @@
static void drawcube_size(float size)
{
glBegin(GL_LINE_STRIP);
- glVertex3f(-size,-size,-size); glVertex3f(-size,-size,size);
- glVertex3f(-size,size,size); glVertex3f(-size,size,-size);
+ glVertex3f(-size,-size,-size); glVertex3f(-size,-size,size);
+ glVertex3f(-size,size,size); glVertex3f(-size,size,-size);
- glVertex3f(-size,-size,-size); glVertex3f(size,-size,-size);
- glVertex3f(size,-size,size); glVertex3f(size,size,size);
+ glVertex3f(-size,-size,-size); glVertex3f(size,-size,-size);
+ glVertex3f(size,-size,size); glVertex3f(size,size,size);
- glVertex3f(size,size,-size); glVertex3f(size,-size,-size);
+ glVertex3f(size,size,-size); glVertex3f(size,-size,-size);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3f(-size,-size,size); glVertex3f(size,-size,size);
+ glVertex3f(-size,-size,size); glVertex3f(size,-size,size);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3f(-size,size,size); glVertex3f(size,size,size);
+ glVertex3f(-size,size,size); glVertex3f(size,size,size);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3f(-size,size,-size); glVertex3f(size,size,-size);
+ glVertex3f(-size,size,-size); glVertex3f(size,size,-size);
glEnd();
}
@@ -995,21 +997,21 @@
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[0]); glVertex3fv(cube[1]);glVertex3fv(cube[2]); glVertex3fv(cube[3]);
- glVertex3fv(cube[0]); glVertex3fv(cube[4]);glVertex3fv(cube[5]); glVertex3fv(cube[6]);
- glVertex3fv(cube[7]); glVertex3fv(cube[4]);
+ glVertex3fv(cube[0]); glVertex3fv(cube[1]);glVertex3fv(cube[2]); glVertex3fv(cube[3]);
+ glVertex3fv(cube[0]); glVertex3fv(cube[4]);glVertex3fv(cube[5]); glVertex3fv(cube[6]);
+ glVertex3fv(cube[7]); glVertex3fv(cube[4]);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[1]); glVertex3fv(cube[5]);
+ glVertex3fv(cube[1]); glVertex3fv(cube[5]);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[2]); glVertex3fv(cube[6]);
+ glVertex3fv(cube[2]); glVertex3fv(cube[6]);
glEnd();
glBegin(GL_LINE_STRIP);
- glVertex3fv(cube[3]); glVertex3fv(cube[7]);
+ glVertex3fv(cube[3]); glVertex3fv(cube[7]);
glEnd();
glPopMatrix();
@@ -1027,8 +1029,8 @@
madd_v3_v3v3fl(end, mat[3], lavec, la->clipend);
glBegin(GL_LINE_STRIP);
- glVertex3fv(sta);
- glVertex3fv(end);
+ glVertex3fv(sta);
+ glVertex3fv(end);
glEnd();
glPointSize(3.0);
@@ -1150,7 +1152,7 @@
/* draw front side lighting */
glCullFace(GL_BACK);
- glBlendFunc(GL_ONE, GL_ONE);
+ glBlendFunc(GL_ONE, GL_ONE);
glColor4f(0.2f, 0.2f, 0.2f, 1.0f);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list