Revision: 56512
http://sourceforge.net/p/brlcad/code/56512
Author: brlcad
Date: 2013-08-04 17:45:24 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
more dead code elimination
Modified Paths:
--------------
brlcad/trunk/src/libdm/dm-ogl.c
brlcad/trunk/src/libdm/dm-rtgl.c
brlcad/trunk/src/libdm/dm-tk.c
brlcad/trunk/src/libdm/dm-wgl.c
brlcad/trunk/src/libdm/dm_obj.c
Modified: brlcad/trunk/src/libdm/dm-ogl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-ogl.c 2013-08-04 17:38:21 UTC (rev 56511)
+++ brlcad/trunk/src/libdm/dm-ogl.c 2013-08-04 17:45:24 UTC (rev 56512)
@@ -1977,12 +1977,9 @@
backDiffuseColorLight[2] = wireColor[2] * 0.9;
backDiffuseColorLight[3] = wireColor[3];
-#if 1
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambientColor);
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specularColor);
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuseColor);
-#endif
-
} else {
glColor3ub((GLubyte)r, (GLubyte)g, (GLubyte)b);
}
Modified: brlcad/trunk/src/libdm/dm-rtgl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-rtgl.c 2013-08-04 17:38:21 UTC (rev 56511)
+++ brlcad/trunk/src/libdm/dm-rtgl.c 2013-08-04 17:45:24 UTC (rev 56512)
@@ -1549,7 +1549,6 @@
for (BU_LIST_FOR (rtgljob.currItem, ptInfoList, head)) {
used = rtgljob.currItem->used;
-#if 1
glBegin(GL_POINTS);
for (i = 0; i < used; i += 3) {
@@ -1565,11 +1564,6 @@
}
}
glEnd();
-#else
- glNormalPointer(GL_FLOAT, 0, &(rtgljob.currItem->norms));
- glVertexPointer(3, GL_FLOAT, 0, &(rtgljob.currItem->points));
- glDrawArrays(GL_POINTS, 0, (used / 3));
-#endif
}
} while ((entry = bu_hash_tbl_next(&record)) != NULL);
Modified: brlcad/trunk/src/libdm/dm-tk.c
===================================================================
--- brlcad/trunk/src/libdm/dm-tk.c 2013-08-04 17:38:21 UTC (rev 56511)
+++ brlcad/trunk/src/libdm/dm-tk.c 2013-08-04 17:45:24 UTC (rev 56512)
@@ -184,17 +184,11 @@
bu_log("which eye = %d\t", which_eye);
bu_log("transformation matrix = \n");
-#if 1
+
bu_log("%g %g %g %g\n", mat[0], mat[1], mat[2], mat[3]);
bu_log("%g %g %g %g\n", mat[4], mat[5], mat[6], mat[7]);
bu_log("%g %g %g %g\n", mat[8], mat[9], mat[10], mat[11]);
bu_log("%g %g %g %g\n", mat[12], mat[13], mat[14], mat[15]);
-#else
- bu_log("%g %g %g %g\n", mat[0], mat[4], mat[8], mat[12]);
- bu_log("%g %g %g %g\n", mat[1], mat[5], mat[9], mat[13]);
- bu_log("%g %g %g %g\n", mat[2], mat[6], mat[10], mat[14]);
- bu_log("%g %g %g %g\n", mat[3], mat[7], mat[11], mat[15]);
-#endif
}
MAT_COPY(((struct x_vars *)dmp->dm_vars.priv_vars)->xmat, mat);
@@ -210,7 +204,6 @@
HIDDEN int
tk_drawVList(struct dm *dmp, struct bn_vlist *vp)
{
-#if 1
static vect_t spnt, lpnt, pnt;
struct bn_vlist *tvp;
XSegment segbuf[1024]; /* XDrawSegments list */
@@ -442,7 +435,6 @@
((struct x_vars *)dmp->dm_vars.priv_vars)->gc, segbuf,
nseg);
}
-#endif
return TCL_OK;
}
Modified: brlcad/trunk/src/libdm/dm-wgl.c
===================================================================
--- brlcad/trunk/src/libdm/dm-wgl.c 2013-08-04 17:38:21 UTC (rev 56511)
+++ brlcad/trunk/src/libdm/dm-wgl.c 2013-08-04 17:45:24 UTC (rev 56512)
@@ -146,11 +146,9 @@
backDiffuseColorDark[2] = wireColor[2] * 0.9;
backDiffuseColorDark[3] = wireColor[3];
-#if 1
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambientColor);
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specularColor);
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuseColor);
-#endif
} else {
glColor3ub((GLubyte)r, (GLubyte)g, (GLubyte)b);
}
@@ -290,7 +288,6 @@
if (dmp->dm_top) {
/* Make xtkwin a toplevel window */
-#if 1
Tcl_DString ds;
Tcl_DStringInit(&ds);
@@ -305,13 +302,6 @@
((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin =
Tk_NameToWindow(interp, bu_vls_addr(&dmp->dm_pathName), tkwin);
Tcl_DStringFree(&ds);
-#else
- ((struct dm_xvars *)dmp->dm_vars.pub_vars)->xtkwin =
- Tk_CreateWindowFromPath(interp,
- tkwin,
- bu_vls_addr(&dmp->dm_pathName),
- bu_vls_addr(&dmp->dm_dName));
-#endif
((struct dm_xvars *)dmp->dm_vars.pub_vars)->top = ((struct dm_xvars
*)dmp->dm_vars.pub_vars)->xtkwin;
} else {
char *cp;
Modified: brlcad/trunk/src/libdm/dm_obj.c
===================================================================
--- brlcad/trunk/src/libdm/dm_obj.c 2013-08-04 17:38:21 UTC (rev 56511)
+++ brlcad/trunk/src/libdm/dm_obj.c 2013-08-04 17:45:24 UTC (rev 56512)
@@ -715,7 +715,6 @@
return TCL_ERROR;
}
-#if 1
memset(&gdas, 0, sizeof(struct ged_data_axes_state));
VMOVE(gdas.gdas_points[0], modelAxesPos);
gdas.gdas_size = axesSize;
@@ -725,7 +724,6 @@
dm_draw_data_axes(dmop->dmo_dmp,
viewSize,
&gdas);
-#endif
bu_vls_free(&vls);
return TCL_OK;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
