Revision: 53742
http://brlcad.svn.sourceforge.net/brlcad/?rev=53742&view=rev
Author: brlcad
Date: 2012-11-17 05:57:22 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
found the cause of solids regression failure. more structparse tables existed
in need of using %g for doubles.
Modified Paths:
--------------
brlcad/trunk/src/conv/g-vrml.c
brlcad/trunk/src/conv/g-x3d.c
brlcad/trunk/src/liboptical/sh_air.c
brlcad/trunk/src/liboptical/sh_billboard.c
brlcad/trunk/src/liboptical/sh_brdf.c
brlcad/trunk/src/liboptical/sh_camo.c
brlcad/trunk/src/liboptical/sh_cook.c
brlcad/trunk/src/liboptical/sh_fbm.c
brlcad/trunk/src/liboptical/sh_fire.c
brlcad/trunk/src/liboptical/sh_gauss.c
brlcad/trunk/src/liboptical/sh_grass.c
brlcad/trunk/src/liboptical/sh_noise.c
brlcad/trunk/src/liboptical/sh_plastic.c
brlcad/trunk/src/liboptical/sh_rtrans.c
brlcad/trunk/src/liboptical/sh_scloud.c
brlcad/trunk/src/liboptical/sh_text.c
brlcad/trunk/src/liboptical/sh_xxx.c
brlcad/trunk/src/mged/dm-X.c
brlcad/trunk/src/mged/dm-ogl.c
brlcad/trunk/src/mged/dm-rtgl.c
brlcad/trunk/src/mged/dm-tk.c
brlcad/trunk/src/mged/dm-wgl.c
brlcad/trunk/src/mged/set.c
brlcad/trunk/src/remrt/protocol.h
brlcad/trunk/src/rt/reshoot.c
brlcad/trunk/src/rt/view.c
Modified: brlcad/trunk/src/conv/g-vrml.c
===================================================================
--- brlcad/trunk/src/conv/g-vrml.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/conv/g-vrml.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -78,8 +78,8 @@
{"%s", TXT_NAME_SIZE, "ma_shader", PL_OA(shader),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "shine",PL_O(shininess),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "sh",PL_O(shininess),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "transmit",PL_O(transparency),BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
- {"%f", 1, "tr",PL_O(transparency),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "transmit",PL_O(transparency),BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
+ {"%g", 1, "tr",PL_O(transparency),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "angle",PL_O(lt_angle),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "fract",PL_O(lt_fraction),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "aim",PL_OA(lt_dir),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/conv/g-x3d.c
===================================================================
--- brlcad/trunk/src/conv/g-x3d.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/conv/g-x3d.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -92,11 +92,11 @@
{"%s", TXT_NAME_SIZE, "ma_shader", PL_OA(shader),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "shine", PL_O(shininess),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "sh", PL_O(shininess),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "transmit", PL_O(transparency),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "tr", PL_O(transparency),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "angle", PL_O(lt_angle),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "fract", PL_O(lt_fraction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "aim", PL_OA(lt_dir),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "transmit", PL_O(transparency),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "tr", PL_O(transparency),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 1, "angle", PL_O(lt_angle),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 1, "fract", PL_O(lt_fraction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "aim", PL_OA(lt_dir),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "w", PL_O(tx_w),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", PL_O(tx_n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%s", TXT_NAME_SIZE, "file", PL_OA(tx_file),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/liboptical/sh_air.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_air.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_air.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -59,10 +59,10 @@
static void dpm_hook(register const struct bu_structparse *sdp, register const
char *name, char *base, const char *value);
struct bu_structparse air_parse[] = {
- {"%f", 1, "dpm", SHDR_O(d_p_mm), dpm_hook, NULL, NULL },
- {"%f", 1, "scale", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "s", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "delta", SHDR_O(delta), bu_mm_cvt,
NULL, NULL },
+ {"%g", 1, "dpm", SHDR_O(d_p_mm), dpm_hook, NULL, NULL },
+ {"%g", 1, "scale", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "s", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "delta", SHDR_O(delta), bu_mm_cvt,
NULL, NULL },
{"%f", 1, "d", SHDR_O(delta), bu_mm_cvt, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_billboard.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_billboard.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_billboard.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -114,7 +114,7 @@
{"%ld", 1, "w", SHDR_O(img_width), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"%ld", 1, "n", SHDR_O(img_height), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"%d", 1, "t", SHDR_O(img_threshold), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
- {"%f", 1, "h", SHDR_O(img_scale), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
+ {"%g", 1, "h", SHDR_O(img_scale), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
{"%V", 1, "f", SHDR_O(img_filename), new_image, NULL, NULL },
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_brdf.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_brdf.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_brdf.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -64,20 +64,20 @@
#define BRDF_O(m) bu_offsetof(struct brdf_specific, m)
struct bu_structparse brdf_parse[] = {
- {"%f", 1, "specular", BRDF_O(specular_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "sp", BRDF_O(specular_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "diffuse", BRDF_O(diffuse_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "di", BRDF_O(diffuse_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "rough", BRDF_O(rms_slope),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "rms", BRDF_O(rms_slope),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "transmit", BRDF_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "tr", BRDF_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "reflect", BRDF_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "re", BRDF_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ri", BRDF_O(refrac_index),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "extinction_per_meter", BRDF_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "extinction", BRDF_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ex", BRDF_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "specular", BRDF_O(specular_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "sp", BRDF_O(specular_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "diffuse", BRDF_O(diffuse_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "di", BRDF_O(diffuse_refl),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "rough", BRDF_O(rms_slope),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "rms", BRDF_O(rms_slope),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "transmit", BRDF_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "tr", BRDF_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "reflect", BRDF_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "re", BRDF_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ri", BRDF_O(refrac_index),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "extinction_per_meter", BRDF_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "extinction", BRDF_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ex", BRDF_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_camo.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_camo.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_camo.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -126,13 +126,13 @@
void color_fix(register const struct bu_structparse *sdp, register const char
*name, char *base, const char *value);
struct bu_structparse camo_print_tab[] = {
- {"%f", 1, "lacunarity", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "size", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
+ {"%g", 1, "lacunarity", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "size", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
{"%f", 3, "vscale", SHDR_AO(noise_vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "thresh1", SHDR_O(t1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "thresh2", SHDR_O(t2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "thresh1", SHDR_O(t1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "thresh2", SHDR_O(t2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "color1", SHDR_AO(c1), color_fix,
NULL, NULL },
{"%f", 3, "color2", SHDR_AO(c2), color_fix,
NULL, NULL },
{"%f", 3, "color3", SHDR_AO(c3), color_fix,
NULL, NULL },
@@ -142,15 +142,15 @@
struct bu_structparse camo_parse[] = {
- {"%f", 1, "lacunarity", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "l", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "o", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "t1", SHDR_O(t1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "t2", SHDR_O(t2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "size", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
- {"%f", 1, "s", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
+ {"%g", 1, "lacunarity", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "l", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "o", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "t1", SHDR_O(t1),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "t2", SHDR_O(t2),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "size", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
+ {"%g", 1, "s", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
{"%f", 3, "vscale", SHDR_AO(noise_vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "vs", SHDR_AO(noise_vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "v", SHDR_AO(noise_vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/liboptical/sh_cook.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_cook.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_cook.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -59,18 +59,18 @@
#define CL_O(m) bu_offsetof(struct cook_specific, m)
struct bu_structparse cook_parse[] = {
- {"%f", 1, "m", CL_O(m),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "specular", CL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "sp", CL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "diffuse", CL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "di", CL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "transmit", CL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "tr", CL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "reflect", CL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "re", CL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ri", CL_O(refrac_index),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "extinction", CL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ex", CL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "m", CL_O(m),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "specular", CL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "sp", CL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "diffuse", CL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "di", CL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "transmit", CL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "tr", CL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "reflect", CL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "re", CL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ri", CL_O(refrac_index),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "extinction", CL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ex", CL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_fbm.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_fbm.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_fbm.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -61,15 +61,15 @@
#define FBM_AO(m) bu_offsetofarray(struct fbm_specific, m)
struct bu_structparse fbm_parse[] = {
- {"%f", 1, "lacunarity", FBM_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", FBM_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", FBM_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "gain", FBM_O(gain),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "distortion", FBM_O(distortion),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "l", FBM_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "lacunarity", FBM_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", FBM_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", FBM_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "gain", FBM_O(gain),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "distortion", FBM_O(distortion),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "l", FBM_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "o", FBM_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "g", FBM_O(gain),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "d", FBM_O(distortion),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "g", FBM_O(gain),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "d", FBM_O(distortion),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "scale", FBM_AO(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_fire.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_fire.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_fire.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -128,10 +128,10 @@
{"%d", 1, "debug", SHDR_O(fire_debug),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "flicker", SHDR_O(fire_flicker),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "stretch", SHDR_O(fire_stretch),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "lacunarity", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "scale", SHDR_O(noise_size), bu_mm_cvt,
NULL, NULL },
+ {"%g", 1, "lacunarity", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 3, "scale", SHDR_O(noise_size), bu_mm_cvt,
NULL, NULL },
{"%f", 3, "vscale", SHDR_AO(noise_vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "delta", SHDR_AO(noise_delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "max", SHDR_AO(fire_max),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
@@ -143,10 +143,10 @@
{"%p", 1, "fire_print_tab", bu_byteoffset(fire_print_tab[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "f", SHDR_O(fire_flicker),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 1, "st", SHDR_O(fire_stretch),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "l", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "o", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "s", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
+ {"%g", 1, "l", SHDR_O(noise_lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(noise_h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "o", SHDR_O(noise_octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "s", SHDR_O(noise_size), bu_mm_cvt, NULL, NULL },
{"%f", 3, "v", SHDR_AO(noise_vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "vs", SHDR_AO(noise_vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%f", 3, "d", SHDR_AO(noise_delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/liboptical/sh_gauss.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_gauss.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_gauss.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -117,13 +117,13 @@
* structure above
*/
struct bu_structparse gauss_print_tab[] = {
- {"%f", 1, "sigma", SHDR_O(gauss_sigma),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "sigma", SHDR_O(gauss_sigma),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
struct bu_structparse gauss_parse_tab[] = {
{"%p", 1, "gauss_print_tab", bu_byteoffset(gauss_print_tab[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "s", SHDR_O(gauss_sigma),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "s", SHDR_O(gauss_sigma),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_grass.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_grass.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_grass.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -187,32 +187,32 @@
* structure above
*/
struct bu_structparse grass_print_tab[] = {
- {"%f", 2, "cell", SHDR_AO(cell),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ppc", SHDR_O(ppc),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ppcd", SHDR_O(ppcd),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "t", SHDR_O(t),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "width", SHDR_O(blade_width),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "size", SHDR_O(size),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%d", 1, "nsegs", SHDR_O(nsegs),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "seg_ratio", SHDR_O(seg_ratio),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 2, "cell", SHDR_AO(cell),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ppc", SHDR_O(ppc),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ppcd", SHDR_O(ppcd),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "t", SHDR_O(t),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "width", SHDR_O(blade_width),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "size", SHDR_O(size),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%d", 1, "nsegs", SHDR_O(nsegs),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "seg_ratio", SHDR_O(seg_ratio),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
struct bu_structparse grass_parse_tab[] = {
{"%p", 1, "grass_print_tab", bu_byteoffset(grass_print_tab[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 2, "c", SHDR_AO(cell),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "p", SHDR_O(ppc),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "pd", SHDR_O(ppcd),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "l", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "o", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "s", SHDR_O(size),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "w", SHDR_O(blade_width),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%d", 1, "n", SHDR_O(nsegs),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "r", SHDR_O(seg_ratio),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%d", 1, "d", SHDR_O(debug),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 2, "c", SHDR_AO(cell),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "p", SHDR_O(ppc),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "pd", SHDR_O(ppcd),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "l", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "o", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "s", SHDR_O(size),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "w", SHDR_O(blade_width),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%d", 1, "n", SHDR_O(nsegs),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "r", SHDR_O(seg_ratio),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%d", 1, "d", SHDR_O(debug),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_noise.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_noise.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_noise.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -134,37 +134,37 @@
* structure above
*/
struct bu_structparse noise_print_tab[] = {
- {"%f", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "size", SHDR_O(size), bu_mm_cvt, NULL, NULL },
- {"%f", 1, "angle", SHDR_O(max_angle),
noise_deg_to_rad, NULL, NULL },
- {"%f", 3, "vscale", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "min", SHDR_O(minval),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "size", SHDR_O(size), bu_mm_cvt, NULL, NULL },
+ {"%g", 1, "angle", SHDR_O(max_angle), noise_deg_to_rad, NULL,
NULL },
+ {"%f", 3, "vscale", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "min", SHDR_O(minval),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
struct bu_structparse noise_parse_tab[] = {
{"%p", 1, "noise_print_tab", bu_byteoffset(noise_print_tab[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "l", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "o", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "d", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "size", SHDR_O(size), bu_mm_cvt, NULL, NULL },
- {"%f", 1, "s", SHDR_O(size), bu_mm_cvt,
NULL, NULL },
- {"%f", 1, "angle", SHDR_O(max_angle),
noise_deg_to_rad, NULL, NULL },
- {"%f", 1, "ang", SHDR_O(max_angle), noise_deg_to_rad, NULL,
NULL },
- {"%f", 1, "a", SHDR_O(max_angle),
noise_deg_to_rad, NULL, NULL },
- {"%f", 3, "vscale", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "vs", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "v", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "min", SHDR_O(minval),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "l", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "o", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "d", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "size", SHDR_O(size), bu_mm_cvt, NULL, NULL },
+ {"%g", 1, "s", SHDR_O(size), bu_mm_cvt, NULL, NULL },
+ {"%g", 1, "angle", SHDR_O(max_angle), noise_deg_to_rad, NULL,
NULL },
+ {"%g", 1, "ang", SHDR_O(max_angle), noise_deg_to_rad, NULL,
NULL },
+ {"%g", 1, "a", SHDR_O(max_angle), noise_deg_to_rad, NULL,
NULL },
+ {"%f", 3, "vscale", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "vs", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "v", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "min", SHDR_O(minval),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_plastic.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_plastic.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_plastic.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -54,20 +54,20 @@
struct bu_structparse phong_parse[] = {
{"%d", 1, "shine", PL_O(shine),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "sh", PL_O(shine),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "specular", PL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "sp", PL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "diffuse", PL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "di", PL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "transmit", PL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "tr", PL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "reflect", PL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "re", PL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ri", PL_O(refrac_index),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "extinction_per_meter", PL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "extinction", PL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "ex", PL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "emission", PL_O(emission),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "em", PL_O(emission),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "specular", PL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "sp", PL_O(wgt_specular),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "diffuse", PL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "di", PL_O(wgt_diffuse),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "transmit", PL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "tr", PL_O(transmit),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "reflect", PL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "re", PL_O(reflect),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ri", PL_O(refrac_index),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "extinction_per_meter", PL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "extinction", PL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "ex", PL_O(extinction),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 3, "emission", PL_O(emission),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 3, "em", PL_O(emission),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_rtrans.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_rtrans.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_rtrans.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -57,8 +57,8 @@
#define SHDR_AO(m) bu_offsetofarray(struct rtrans_specific, m)
struct bu_structparse rtrans_parse[] = {
- {"%f", 1, "threshold", SHDR_O(threshold),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "t", SHDR_O(threshold),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "threshold", SHDR_O(threshold),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "t", SHDR_O(threshold),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_scloud.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_scloud.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_scloud.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -72,32 +72,32 @@
#define SHDR_AO(m) bu_offsetofarray(struct scloud_specific, m)
struct bu_structparse scloud_pr[] = {
- {"%f", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "scale", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "vscale", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "Max", SHDR_O(max_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "min", SHDR_O(min_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "scale", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "vscale", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "Max", SHDR_O(max_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "min", SHDR_O(min_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
struct bu_structparse scloud_parse[] = {
- {"%f", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "scale", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "l", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "M", SHDR_O(max_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "Max", SHDR_O(max_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "m", SHDR_O(min_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "min", SHDR_O(min_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "o", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "s", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "vs", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "d", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 1, "lacunarity", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "H", SHDR_O(h_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "octaves", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "scale", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "delta", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "l", SHDR_O(lacunarity),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "M", SHDR_O(max_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "Max", SHDR_O(max_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "m", SHDR_O(min_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "min", SHDR_O(min_d_p_mm),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "o", SHDR_O(octaves),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "s", SHDR_O(scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "vs", SHDR_AO(vscale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "d", SHDR_AO(delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_text.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_text.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_text.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -70,10 +70,10 @@
{"%V", 1, "texture", TX_O(tx_name), BU_STRUCTPARSE_FUNC_NULL,
NULL, NULL },
{"%d", 1, "w", TX_O(tx_w),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "n", TX_O(tx_n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%d", 1, "l", TX_O(tx_n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }, {
- /*compat*/"%d", 1, "trans_valid", TX_O(tx_trans_valid),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%d", 1, "l", TX_O(tx_n),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%d", 1, "trans_valid", TX_O(tx_trans_valid),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },/*compat*/
{"%d", 1, "t", TX_O(tx_trans_valid),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 2, "uv", TX_AO(tx_scale), BU_STRUCTPARSE_FUNC_NULL, NULL,
NULL },
+ {"%f", 2, "uv", TX_AO(tx_scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "m", TX_O(tx_mirror),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -695,7 +695,7 @@
struct bu_structparse ckr_parse[] = {
{"%d", 3, "a", bu_offsetofarray(struct ckr_specific, ckr_a),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 3, "b", bu_offsetofarray(struct ckr_specific, ckr_b),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "s", bu_offsetof(struct ckr_specific, ckr_scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "s", bu_offsetof(struct ckr_specific, ckr_scale),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/liboptical/sh_xxx.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_xxx.c 2012-11-16 22:53:59 UTC (rev
53741)
+++ brlcad/trunk/src/liboptical/sh_xxx.c 2012-11-17 05:57:22 UTC (rev
53742)
@@ -115,20 +115,20 @@
* structure above
*/
struct bu_structparse xxx_print_tab[] = {
- {"%f", 1, "val", SHDR_O(xxx_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "dist", SHDR_O(xxx_dist),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "delta", SHDR_AO(xxx_delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "max", SHDR_AO(xxx_max),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 3, "min", SHDR_AO(xxx_min),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 1, "val", SHDR_O(xxx_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "dist", SHDR_O(xxx_dist),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "delta", SHDR_AO(xxx_delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "max", SHDR_AO(xxx_max),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%f", 3, "min", SHDR_AO(xxx_min),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
struct bu_structparse xxx_parse_tab[] = {
{"%p", 1, "xxx_print_tab", bu_byteoffset(xxx_print_tab[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "v", SHDR_O(xxx_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "dist", SHDR_O(xxx_dist), bu_mm_cvt, NULL, NULL },
- {"%f", 3, "d", SHDR_AO(xxx_delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
+ {"%g", 1, "v", SHDR_O(xxx_val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "dist", SHDR_O(xxx_dist), bu_mm_cvt, NULL, NULL },
+ {"%f", 3, "d", SHDR_AO(xxx_delta),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/mged/dm-X.c
===================================================================
--- brlcad/trunk/src/mged/dm-X.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/mged/dm-X.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -68,7 +68,7 @@
struct bu_structparse X_vparse[] = {
- {"%f", 1, "bound", DM_O(dm_bound), dirty_hook,
NULL, NULL},
+ {"%g", 1, "bound", DM_O(dm_bound), dirty_hook,
NULL, NULL},
{"%d", 1, "useBound", DM_O(dm_boundFlag), dirty_hook, NULL, NULL},
{"%d", 1, "zclip", DM_O(dm_zclip), zclip_hook,
NULL, NULL},
{"%d", 1, "debug", DM_O(dm_debugLevel),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
Modified: brlcad/trunk/src/mged/dm-ogl.c
===================================================================
--- brlcad/trunk/src/mged/dm-ogl.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/mged/dm-ogl.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -95,13 +95,13 @@
{"%d", 1, "lighting", Ogl_MV_O(lighting_on),
establish_lighting, NULL, NULL },
{"%d", 1, "transparency", Ogl_MV_O(transparency_on),
establish_transparency, NULL, NULL },
{"%d", 1, "fastfog", Ogl_MV_O(fastfog), do_fogHint,
NULL, NULL },
- {"%f", 1, "density", Ogl_MV_O(fogdensity), dirty_hook,
NULL, NULL },
+ {"%g", 1, "density", Ogl_MV_O(fogdensity), dirty_hook,
NULL, NULL },
{"%d", 1, "has_zbuf", Ogl_MV_O(zbuf),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "has_rgb", Ogl_MV_O(rgb),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "has_doublebuffer", Ogl_MV_O(doublebuffer),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "depth", Ogl_MV_O(depth),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "debug", Ogl_MV_O(debug), debug_hook,
NULL, NULL },
- {"%f", 1, "bound", Ogl_MV_O(bound), bound_hook,
NULL, NULL },
+ {"%g", 1, "bound", Ogl_MV_O(bound), bound_hook,
NULL, NULL },
{"%d", 1, "useBound", Ogl_MV_O(boundFlag), boundFlag_hook,
NULL, NULL },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/mged/dm-rtgl.c
===================================================================
--- brlcad/trunk/src/mged/dm-rtgl.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/mged/dm-rtgl.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -78,13 +78,13 @@
{"%d", 1, "lighting", Rtgl_MV_O(lighting_on),
establish_lighting },
{"%d", 1, "transparency", Rtgl_MV_O(transparency_on),
establish_transparency },
{"%d", 1, "fastfog", Rtgl_MV_O(fastfog), do_fogHint },
- {"%f", 1, "density", Rtgl_MV_O(fogdensity), dirty_hook },
+ {"%g", 1, "density", Rtgl_MV_O(fogdensity), dirty_hook },
{"%d", 1, "has_zbuf", Rtgl_MV_O(zbuf),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "has_rgb", Rtgl_MV_O(rgb),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "has_doublebuffer", Rtgl_MV_O(doublebuffer),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "depth", Rtgl_MV_O(depth),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "debug", Rtgl_MV_O(debug), debug_hook },
- {"%f", 1, "bound", Rtgl_MV_O(bound), bound_hook },
+ {"%g", 1, "bound", Rtgl_MV_O(bound), bound_hook },
{"%d", 1, "useBound", Rtgl_MV_O(boundFlag), boundFlag_hook },
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL }
};
Modified: brlcad/trunk/src/mged/dm-tk.c
===================================================================
--- brlcad/trunk/src/mged/dm-tk.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/mged/dm-tk.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -55,7 +55,7 @@
static Tk_GenericProc tk_doevent;
struct bu_structparse tk_vparse[] = {
- {"%f", 1, "bound", DM_O(dm_bound), dirty_hook,
NULL, NULL},
+ {"%g", 1, "bound", DM_O(dm_bound), dirty_hook,
NULL, NULL},
{"%d", 1, "useBound", DM_O(dm_boundFlag), dirty_hook, NULL, NULL},
{"%d", 1, "zclip", DM_O(dm_zclip), zclip_hook,
NULL, NULL},
{"%d", 1, "debug", DM_O(dm_debugLevel),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
Modified: brlcad/trunk/src/mged/dm-wgl.c
===================================================================
--- brlcad/trunk/src/mged/dm-wgl.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/mged/dm-wgl.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -80,13 +80,13 @@
{"%d", 1, "lighting", Wgl_MV_O(lighting_on),
establish_lighting },
{"%d", 1, "transparency", Wgl_MV_O(transparency_on),
establish_transparency },
{"%d", 1, "fastfog", Wgl_MV_O(fastfog), do_fogHint },
- {"%f", 1, "density", Wgl_MV_O(fogdensity), dirty_hook },
+ {"%g", 1, "density", Wgl_MV_O(fogdensity), dirty_hook },
{"%d", 1, "has_zbuf", Wgl_MV_O(zbuf),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "has_rgb", Wgl_MV_O(rgb),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "has_doublebuffer", Wgl_MV_O(doublebuffer),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "depth", Wgl_MV_O(depth),
BU_STRUCTPARSE_FUNC_NULL },
{"%d", 1, "debug", Wgl_MV_O(debug), debug_hook },
- {"%f", 1, "bound", Wgl_MV_O(bound), bound_hook },
+ {"%g", 1, "bound", Wgl_MV_O(bound), bound_hook },
{"%d", 1, "useBound", Wgl_MV_O(boundFlag), boundFlag_hook
},
{"", 0, (char *)0, 0,
BU_STRUCTPARSE_FUNC_NULL }
};
Modified: brlcad/trunk/src/mged/set.c
===================================================================
--- brlcad/trunk/src/mged/set.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/mged/set.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -121,13 +121,13 @@
{"%c", 1, "rotate_about", MV_O(mv_rotate_about),
set_rotate_about, NULL, NULL },
{"%c", 1, "transform", MV_O(mv_transform),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "predictor", MV_O(mv_predictor),
predictor_hook, NULL, NULL },
- {"%f", 1, "predictor_advance", MV_O(mv_predictor_advance),
predictor_hook, NULL, NULL },
- {"%f", 1, "predictor_length", MV_O(mv_predictor_length),
predictor_hook, NULL, NULL },
- {"%f", 1, "perspective", MV_O(mv_perspective),
set_perspective, NULL, NULL },
+ {"%g", 1, "predictor_advance", MV_O(mv_predictor_advance),
predictor_hook, NULL, NULL },
+ {"%g", 1, "predictor_length", MV_O(mv_predictor_length),
predictor_hook, NULL, NULL },
+ {"%g", 1, "perspective", MV_O(mv_perspective),
set_perspective, NULL, NULL },
{"%d", 1, "perspective_mode", MV_O(mv_perspective_mode),
establish_perspective, NULL, NULL },
{"%d", 1, "toggle_perspective", MV_O(mv_toggle_perspective),
toggle_perspective, NULL, NULL },
- {"%f", 1, "nmg_eu_dist", MV_O(mv_nmg_eu_dist),
nmg_eu_dist_set, NULL, NULL },
- {"%f", 1, "eye_sep_dist", MV_O(mv_eye_sep_dist),
set_dirty_flag, NULL, NULL },
+ {"%g", 1, "nmg_eu_dist", MV_O(mv_nmg_eu_dist),
nmg_eu_dist_set, NULL, NULL },
+ {"%g", 1, "eye_sep_dist", MV_O(mv_eye_sep_dist),
set_dirty_flag, NULL, NULL },
{"%s", LINE, "union_op", MV_O(mv_union_lexeme[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%s", LINE, "intersection_op",
MV_O(mv_intersection_lexeme[0]),BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%s", LINE, "difference_op", MV_O(mv_difference_lexeme[0]),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
Modified: brlcad/trunk/src/remrt/protocol.h
===================================================================
--- brlcad/trunk/src/remrt/protocol.h 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/remrt/protocol.h 2012-11-17 05:57:22 UTC (rev 53742)
@@ -69,8 +69,8 @@
{"%d", 1, "li_endpix", LINE_O(li_endpix),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "li_frame", LINE_O(li_frame),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%d", 1, "li_nrays", LINE_O(li_nrays),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "li_cpusec", LINE_O(li_cpusec),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
- {"%f", 1, "li_percent", LINE_O(li_percent),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "li_cpusec", LINE_O(li_cpusec),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
+ {"%g", 1, "li_percent", LINE_O(li_percent),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"", 0, NULL, 0,
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
Modified: brlcad/trunk/src/rt/reshoot.c
===================================================================
--- brlcad/trunk/src/rt/reshoot.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/rt/reshoot.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -128,8 +128,8 @@
{"%V", 1, "region", bu_offsetof(struct reg_hit, regname),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL },
{"%V", 1, "in", bu_offsetof(struct reg_hit, in_primitive),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%V", 1, "out", bu_offsetof(struct reg_hit, out_primitive),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%f", 1, "indist", bu_offsetof(struct reg_hit, indist),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%f", 1, "outdist", bu_offsetof(struct reg_hit, outdist),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%g", 1, "indist", bu_offsetof(struct reg_hit, indist),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%g", 1, "outdist", bu_offsetof(struct reg_hit, outdist),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL }
};
@@ -169,7 +169,7 @@
double val;
} vs;
static struct bu_structparse val_sp[] = {
- {"%f", 1, "val", bu_offsetof(struct valstruct, val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%g", 1, "val", bu_offsetof(struct valstruct, val),
BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
};
/* examine each partition until we get back to the head */
Modified: brlcad/trunk/src/rt/view.c
===================================================================
--- brlcad/trunk/src/rt/view.c 2012-11-16 22:53:59 UTC (rev 53741)
+++ brlcad/trunk/src/rt/view.c 2012-11-17 05:57:22 UTC (rev 53742)
@@ -173,8 +173,8 @@
{"%d", 1, "overlay", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%d", 1, "ov", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%d", 1, "ambSamples", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%f", 1, "ambRadius", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
- {"%f", 1, "ambOffset", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%g", 1, "ambRadius", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
+ {"%g", 1, "ambOffset", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"%d", 1, "ambSlow", 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL},
{"", 0, (char *)0, 0, BU_STRUCTPARSE_FUNC_NULL, NULL, NULL}
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
