Revision: 56525
http://sourceforge.net/p/brlcad/code/56525
Author: brlcad
Date: 2013-08-04 19:33:27 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
rename all of these functions so they're consistently fmt_verb_noun() with the
format prefixing the function name so it's clear what groups with what.
Modified Paths:
--------------
brlcad/trunk/src/libged/bot_dump.c
Modified: brlcad/trunk/src/libged/bot_dump.c
===================================================================
--- brlcad/trunk/src/libged/bot_dump.c 2013-08-04 19:29:01 UTC (rev 56524)
+++ brlcad/trunk/src/libged/bot_dump.c 2013-08-04 19:33:27 UTC (rev 56525)
@@ -120,7 +120,7 @@
static struct _ged_obj_material *
-get_obj_material(int red, int green, int blue, fastf_t transparency)
+obj_get_material(int red, int green, int blue, fastf_t transparency)
{
struct _ged_obj_material *gomp;
@@ -156,7 +156,7 @@
static void
-free_obj_materials() {
+obj_free_materials() {
struct _ged_obj_material *gomp;
while (BU_LIST_WHILE(gomp, _ged_obj_material, &HeadObjMaterials)) {
@@ -168,7 +168,7 @@
static void
-write_sat_header(FILE *fp)
+sat_write_header(FILE *fp)
{
time_t now;
@@ -192,7 +192,7 @@
static void
-write_bot_sat(struct rt_bot_internal *bot, FILE *fp, char *UNUSED(name))
+sat_write_bot(struct rt_bot_internal *bot, FILE *fp, char *UNUSED(name))
{
int i, j;
fastf_t *vertices;
@@ -372,7 +372,7 @@
static void
-write_bot_dxf(struct rt_bot_internal *bot, FILE *fp, char *name)
+dxf_write_bot(struct rt_bot_internal *bot, FILE *fp, char *name)
{
fastf_t *vertices;
int num_faces, *faces;
@@ -412,7 +412,7 @@
static void
-write_bot_obj(struct rt_bot_internal *bot, FILE *fp, char *name)
+obj_write_bot(struct rt_bot_internal *bot, FILE *fp, char *name)
{
int num_vertices;
fastf_t *vertices;
@@ -427,7 +427,7 @@
struct _ged_obj_material *gomp;
if (using_dbot_dump) {
- gomp = get_obj_material(curr_obj_red,
+ gomp = obj_get_material(curr_obj_red,
curr_obj_green,
curr_obj_blue,
curr_obj_alpha);
@@ -482,7 +482,7 @@
static void
-write_bot_stl(struct rt_bot_internal *bot, FILE *fp, char *name)
+stl_write_bot(struct rt_bot_internal *bot, FILE *fp, char *name)
{
fastf_t *vertices;
int num_faces, *faces;
@@ -529,7 +529,7 @@
static void
-write_bot_stl_binary(struct rt_bot_internal *bot, int fd, char *UNUSED(name))
+stl_write_bot_binary(struct rt_bot_internal *bot, int fd, char *UNUSED(name))
{
fastf_t *vertices;
size_t num_faces;
@@ -647,7 +647,7 @@
perror("write");
}
- write_bot_stl_binary(bot, fd, dp->d_namep);
+ stl_write_bot_binary(bot, fd, dp->d_namep);
/* Re-position pointer to 80th byte */
lseek(fd, 80, SEEK_SET);
@@ -674,25 +674,25 @@
fprintf(fp,
"0\nSECTION\n2\nHEADER\n999\n%s (BOT from
%s)\n0\nENDSEC\n0\nSECTION\n2\nENTITIES\n",
dp->d_namep, db_name);
- write_bot_dxf(bot, fp, dp->d_namep);
+ dxf_write_bot(bot, fp, dp->d_namep);
fprintf(fp, "0\nENDSEC\n0\nEOF\n");
break;
case OTYPE_OBJ:
v_offset = 1;
fprintf(fp, "mtllib %s\n",
bu_vls_addr(&obj_materials_file));
- write_bot_obj(bot, fp, dp->d_namep);
+ obj_write_bot(bot, fp, dp->d_namep);
break;
case OTYPE_SAT:
curr_line_num = 0;
- write_sat_header(fp);
+ sat_write_header(fp);
- write_bot_sat(bot, fp, dp->d_namep);
+ sat_write_bot(bot, fp, dp->d_namep);
fprintf(fp, "End-of-ACIS-data\n");
break;
case OTYPE_STL:
default:
- write_bot_stl(bot, fp, dp->d_namep);
+ stl_write_bot(bot, fp, dp->d_namep);
break;
}
@@ -703,7 +703,7 @@
} else {
if (binary && output_type == OTYPE_STL) {
total_faces += bot->num_faces;
- write_bot_stl_binary(bot, fd, dp->d_namep);
+ stl_write_bot_binary(bot, fd, dp->d_namep);
} else if (binary && output_type != OTYPE_STL) {
bu_log("Unsupported binary file type - only STL is currently
supported\n");
return;
@@ -712,17 +712,17 @@
if (fp) {
switch (output_type) {
case OTYPE_DXF:
- write_bot_dxf(bot, fp, dp->d_namep);
+ dxf_write_bot(bot, fp, dp->d_namep);
break;
case OTYPE_OBJ:
- write_bot_obj(bot, fp, dp->d_namep);
+ obj_write_bot(bot, fp, dp->d_namep);
break;
case OTYPE_SAT:
- write_bot_sat(bot, fp, dp->d_namep);
+ sat_write_bot(bot, fp, dp->d_namep);
break;
case OTYPE_STL:
default:
- write_bot_stl(bot, fp, dp->d_namep);
+ stl_write_bot(bot, fp, dp->d_namep);
break;
}
} else {
@@ -939,7 +939,7 @@
argv[argc-1]);
break;
case OTYPE_SAT:
- write_sat_header(fp);
+ sat_write_header(fp);
break;
default:
break;
@@ -1070,7 +1070,7 @@
if (gdasp->gdas_draw) {
struct _ged_obj_material *gomp;
- gomp = get_obj_material(gdasp->gdas_color[0],
+ gomp = obj_get_material(gdasp->gdas_color[0],
gdasp->gdas_color[1],
gdasp->gdas_color[2],
1);
@@ -1148,7 +1148,7 @@
halfAxesSize = gdasp->gdas_size * 0.5;
- gomp = get_obj_material(gdasp->gdas_color[0],
+ gomp = obj_get_material(gdasp->gdas_color[0],
gdasp->gdas_color[1],
gdasp->gdas_color[2],
1);
@@ -1222,7 +1222,7 @@
if (gdlsp->gdls_draw) {
struct _ged_obj_material *gomp;
- gomp = get_obj_material(gdlsp->gdls_color[0],
+ gomp = obj_get_material(gdlsp->gdls_color[0],
gdlsp->gdls_color[1],
gdlsp->gdls_color[2],
1);
@@ -1253,7 +1253,7 @@
static void
-write_data_obj(struct ged *gedp, FILE *fp)
+obj_write_data(struct ged *gedp, FILE *fp)
{
write_data_arrows(&gedp->ged_gvp->gv_data_arrows, fp, 0);
write_data_arrows(&gedp->ged_gvp->gv_sdata_arrows, fp, 1);
@@ -1298,11 +1298,11 @@
}
bu_vls_free(&filepath);
- write_data_obj(gedp, data_fp);
+ obj_write_data(gedp, data_fp);
fclose(data_fp);
} else
if (fp) {
- write_data_obj(gedp, fp);
+ obj_write_data(gedp, fp);
} else {
bu_vls_printf(gedp->ged_result_str, "data_dump: bad FILE
fp\n");
return GED_ERROR;
@@ -1411,7 +1411,7 @@
argv[argc-1]);
break;
case OTYPE_SAT:
- write_sat_header(fp);
+ sat_write_header(fp);
break;
default:
break;
@@ -1579,7 +1579,7 @@
if (output_type == OTYPE_OBJ) {
bu_vls_free(&obj_materials_file);
- free_obj_materials();
+ obj_free_materials();
fclose(obj_materials_fp);
}
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
