Revision: 41099
http://brlcad.svn.sourceforge.net/brlcad/?rev=41099&view=rev
Author: brlcad
Date: 2010-10-19 06:10:35 +0000 (Tue, 19 Oct 2010)
Log Message:
-----------
remove boolean, pointer, and DEGRAD. replace with the usual.
Modified Paths:
--------------
brlcad/trunk/src/burst/Hm.c
brlcad/trunk/src/burst/Hm.h
brlcad/trunk/src/burst/Sc.c
brlcad/trunk/src/burst/Sc.h
brlcad/trunk/src/burst/burst.h
brlcad/trunk/src/burst/extern.h
brlcad/trunk/src/burst/fb.c
brlcad/trunk/src/burst/glob.c
brlcad/trunk/src/burst/grid.c
brlcad/trunk/src/burst/idents.c
brlcad/trunk/src/burst/prnt.c
brlcad/trunk/src/burst/trie.c
brlcad/trunk/src/burst/ui.c
Modified: brlcad/trunk/src/burst/Hm.c
===================================================================
--- brlcad/trunk/src/burst/Hm.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/Hm.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -88,9 +88,9 @@
(_co)++;\
}
-static boolean HmDirty = 0;
-static boolean HmMyxflag = 0;
-static boolean HmPkgInit = 0;
+static int HmDirty = 0;
+static int HmMyxflag = 0;
+static int HmPkgInit = 0;
static HmWindow *windows = NULL;
@@ -732,10 +732,10 @@
Initialize position of top-level menu. Specify maximum
number of menu items visable at once. Place these values
in global variables. Determine as best we can whether MYX
- is available and place boolean result in HmMyxflag. Return
+ is available and place int result in HmMyxflag. Return
true for success and false for failure to open "/dev/tty".
*/
-boolean
+int
HmInit( int x, int y, int maxvis )
{
if ( (HmTtyFd = open( "/dev/tty", O_RDONLY )) == (-1)
@@ -779,12 +779,12 @@
}
/*
- boolean HmFitMenu( HmWindow *nwin, HmWindow *cwin )
+ int HmFitMenu( HmWindow *nwin, HmWindow *cwin )
If nwin->menup will fit below cwin->menup on screen, store
position in nwin, and return 1. Otherwise, return 0.
*/
-static boolean
+static int
HmFitMenu( HmWindow *nwin, HmWindow *cwin )
{
if ( cwin == (HmWindow *) NULL )
Modified: brlcad/trunk/src/burst/Hm.h
===================================================================
--- brlcad/trunk/src/burst/Hm.h 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/Hm.h 2010-10-19 06:10:35 UTC (rev 41099)
@@ -49,7 +49,7 @@
HmItem *(*generator)();
short prevtop;
short prevhit;
- boolean sticky;
+ int sticky;
}
HmMenu;
@@ -129,7 +129,7 @@
HmItem *(*generator)();/* If item == 0, generates items. */
short prevtop; /* Top entry currently visable */
short prevhit; /* Offset from top of last select */
- boolean sticky; /* If true, menu stays around after SELECT,
+ int sticky; /* If true, menu stays around after SELECT,
and until QUIT. */
}
HmMenu;
@@ -154,7 +154,7 @@
/**
-boolean HmInit( int x, int y, int maxvis )
+int HmInit( int x, int y, int maxvis )
HmInit() must be called before any other routines in the
Hm package to initialize the screen position of the top-left
@@ -179,7 +179,7 @@
This routine returns true or false on success or failure to open
"/dev/tty".
**/
-extern boolean HmInit( int x, int y, int maxvis );
+extern int HmInit( int x, int y, int maxvis );
extern FILE *HmTtyFp;
extern int HmLftMenu;
extern int HmTopMenu;
Modified: brlcad/trunk/src/burst/Sc.c
===================================================================
--- brlcad/trunk/src/burst/Sc.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/Sc.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -161,7 +161,7 @@
prints appropriate diagnostics on STDERR if $TERM is not set or
there is a problem in retrieving the corresponding termcap entry.
*/
-boolean
+int
ScInit( FILE *fp ) {
char *term; /* Name of terminal from environment. */
out_fp = fp;
@@ -197,7 +197,7 @@
/*
Clear from the cursor to the end of that line.
*/
-boolean
+int
ScClrEOL( void ) {
if ( ScCE == NULL )
return 0;
@@ -208,7 +208,7 @@
/*
Reset the scrolling region to the entire screen.
*/
-boolean
+int
ScClrScrlReg( void ) {
if ( ScCS == NULL )
return 0;
@@ -219,7 +219,7 @@
/*
End standout mode.
*/
-boolean
+int
ScClrStandout( void ) {
if ( ScSE == NULL )
return 0;
@@ -230,7 +230,7 @@
/*
Clear the screen and "home" the cursor.
*/
-boolean
+int
ScClrText( void ) {
if ( ScCL == NULL )
return 0;
@@ -241,7 +241,7 @@
/*
Insert a the line under the cursor.
*/
-boolean
+int
ScInsertLn( void ) {
if ( ScAL == NULL )
return 0;
@@ -252,7 +252,7 @@
/*
Delete the line under the cursor.
*/
-boolean
+int
ScDeleteLn( void ) {
if ( ScDL == NULL )
return 0;
@@ -263,7 +263,7 @@
/*
Scroll backward 1 line.
*/
-boolean
+int
ScDnScroll( void ) {
if ( ScSR == NULL )
return 0;
@@ -274,7 +274,7 @@
/*
Move the cursor to the top-left corner of the screen.
*/
-boolean
+int
ScHmCursor( void ) {
if ( ScHO == NULL )
return 0;
@@ -286,7 +286,7 @@
Move the cursor to screen coordinates x, y (for column and row,
respectively).
*/
-boolean
+int
ScMvCursor( int x, int y ) {
if ( ScCM == NULL )
return 0;
@@ -300,7 +300,7 @@
Set the scrolling region to be from "top" line to "btm" line,
inclusive.
*/
-boolean
+int
ScSetScrlReg( int top, int btm ) {
if ( ScCS == NULL )
return 0;
@@ -311,7 +311,7 @@
/*
Begin standout mode.
*/
-boolean
+int
ScSetStandout( void ) {
if ( ScSO == NULL )
return 0;
@@ -322,7 +322,7 @@
/*
Scroll text forward 1 line.
*/
-boolean
+int
ScUpScroll( void ) {
if ( ScSF == NULL )
return 0;
Modified: brlcad/trunk/src/burst/Sc.h
===================================================================
--- brlcad/trunk/src/burst/Sc.h 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/Sc.h 2010-10-19 06:10:35 UTC (rev 41099)
@@ -41,7 +41,7 @@
#include "./burst.h"
/**
- boolean ScInit( FILE *fp )
+ int ScInit( FILE *fp )
ScInit() must be invoked before any other function in the Sc
package. Stream fp must be open for writing and all terminal
@@ -75,7 +75,7 @@
there is a problem in retrieving the corresponding termcap
entry.
**/
- extern boolean ScInit( FILE *fp );
+ extern int ScInit( FILE *fp );
/**
@@ -90,40 +90,40 @@
be sure of this.
char *ScCE (clear from under the cursor to end of line)
-boolean ScClrEOL( void )
+int ScClrEOL( void )
char *ScCS (change scrolling region)
-boolean ScClrScrlReg( void )
+int ScClrScrlReg( void )
char *ScSE (end standout mode)
-boolean ScClrStandout( void )
+int ScClrStandout( void )
char *ScCL (clear screen, and home cursor)
-boolean ScClrText( void )
+int ScClrText( void )
char *ScAL (insert a line under the cursor)
-boolean ScInsertLn( void )
+int ScInsertLn( void )
char *ScDL (delete the line under the cursor)
-boolean ScDeleteLn( void )
+int ScDeleteLn( void )
char *ScSR (scroll text backwards 1 line)
-boolean ScDnScroll( void )
+int ScDnScroll( void )
char *ScHO (move cursor to top-left corner of screen)
-boolean ScHmCursor( void )
+int ScHmCursor( void )
char *ScCM (move cursor to column and row <x, y>)
-boolean ScMvCursor( x, y )
+int ScMvCursor( x, y )
char *ScCS (set scrolling region from top to btm incl.)
-boolean ScSetScrlReg( top, btm )
+int ScSetScrlReg( top, btm )
char *ScSO (begin standout mode)
-boolean ScSetStandout( void )
+int ScSetStandout( void )
char *ScSF (scroll text forwards 1 line)
-boolean ScUpScroll( void )
+int ScUpScroll( void )
**/
extern char *ScBC;
@@ -144,18 +144,18 @@
extern int ScLI;
extern int ScCO;
-extern boolean ScClrEOL( void );
-extern boolean ScClrScrlReg( void );
-extern boolean ScClrStandout( void );
-extern boolean ScClrText( void );
-extern boolean ScDeleteLn( void );
-extern boolean ScDnScroll( void );
-extern boolean ScHmCursor( void );
-extern boolean ScInsertLn( void );
-extern boolean ScMvCursor( int x, int y );
-extern boolean ScSetScrlReg( int top, int btm );
-extern boolean ScSetStandout( void );
-extern boolean ScUpScroll( void );
+extern int ScClrEOL( void );
+extern int ScClrScrlReg( void );
+extern int ScClrStandout( void );
+extern int ScClrText( void );
+extern int ScDeleteLn( void );
+extern int ScDnScroll( void );
+extern int ScHmCursor( void );
+extern int ScInsertLn( void );
+extern int ScMvCursor( int x, int y );
+extern int ScSetScrlReg( int top, int btm );
+extern int ScSetStandout( void );
+extern int ScUpScroll( void );
#define ScTCAPSIZ 1024
#define ScTERMSIZ 80
Modified: brlcad/trunk/src/burst/burst.h
===================================================================
--- brlcad/trunk/src/burst/burst.h 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/burst.h 2010-10-19 06:10:35 UTC (rev 41099)
@@ -36,13 +36,7 @@
# define NSIG 64
#endif
-/* ANSI C definitions */
-typedef int boolean;
-typedef genptr_t pointer; /* generic pointer */
-
-#define DEGRAD 57.2957795130823208767981548141051703324054724665642
-
/* menu configuration */
#define MENU_LFT 1
#define MENU_TOP 2
@@ -80,7 +74,7 @@
#define DFL_BARRIERS 100
#define DFL_BDIST 0.0
#define DFL_CELLSIZE 101.6
-#define DFL_CONEANGLE (45.0/DEGRAD)
+#define DFL_CONEANGLE (45.0/RAD2DEG)
#define DFL_DEFLECT 0
#define DFL_DITHER 0
#define DFL_ELEVATION 0.0
Modified: brlcad/trunk/src/burst/extern.h
===================================================================
--- brlcad/trunk/src/burst/extern.h 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/extern.h 2010-10-19 06:10:35 UTC (rev 41099)
@@ -47,15 +47,15 @@
extern Colors *findColors();
extern Func *getTrie();
extern Trie *addTrie();
-extern boolean chkEntryNorm();
-extern boolean chkExitNorm();
-extern boolean closFbDevice();
-extern boolean imageInit();
-extern boolean initUi();
-extern boolean openFbDevice();
-extern boolean findIdents();
-extern boolean readColors();
-extern boolean readIdents();
+extern int chkEntryNorm();
+extern int chkExitNorm();
+extern int closFbDevice();
+extern int imageInit();
+extern int initUi();
+extern int openFbDevice();
+extern int findIdents();
+extern int readColors();
+extern int readIdents();
extern int notify();
extern int roundToInt();
extern void closeUi();
@@ -138,17 +138,17 @@
extern unsigned char pixtarg[3];
extern Trie *cmdtrie;
-extern boolean batchmode;
-extern boolean cantwarhead;
-extern boolean deflectcone;
-extern boolean dithercells;
-extern boolean fatalerror;
-extern boolean groundburst;
-extern boolean reportoverlaps;
-extern boolean reqburstair;
-extern boolean shotburst;
-extern boolean tty;
-extern boolean userinterrupt;
+extern int batchmode;
+extern int cantwarhead;
+extern int deflectcone;
+extern int dithercells;
+extern int fatalerror;
+extern int groundburst;
+extern int reportoverlaps;
+extern int reqburstair;
+extern int shotburst;
+extern int tty;
+extern int userinterrupt;
extern char airfile[];
extern char armorfile[];
Modified: brlcad/trunk/src/burst/fb.c
===================================================================
--- brlcad/trunk/src/burst/fb.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/fb.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -37,10 +37,10 @@
#include "./extern.h"
-boolean
+int
imageInit()
{
- boolean needopen = 0;
+ int needopen = 0;
static char lastfbfile[LNBUFSZ]={0}; /* last fbfile */
devwid = 512;
devhgt = 512;
@@ -82,11 +82,11 @@
Must be called after gridInit() so that gridsz is setup.
*/
-boolean
+int
openFbDevice( devname )
char *devname;
{
- boolean ret = 1;
+ int ret = 1;
notify( "Opening frame buffer", NOTIFY_APPEND );
if ( zoom < 1 )
{
@@ -133,7 +133,7 @@
return ret;
}
-boolean
+int
closFbDevice()
{
int ret;
Modified: brlcad/trunk/src/burst/glob.c
===================================================================
--- brlcad/trunk/src/burst/glob.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/glob.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -57,18 +57,18 @@
unsigned char pixtarg[3] = { 255, 255, 255 }; /* shot hit target */
Trie *cmdtrie = NULL;
-boolean batchmode = 0; /* are we processing batch input now */
-boolean cantwarhead = 0; /* pitch or yaw will be applied to warhead */
-boolean deflectcone = DFL_DEFLECT; /* cone axis deflects towards normal */
-boolean dithercells = DFL_DITHER; /* if true, randomize shot within cell
*/
-boolean fatalerror; /* must abort ray tracing */
-boolean groundburst = 0; /* if true, burst on imaginary ground */
-boolean reportoverlaps = DFL_OVERLAPS;
+int batchmode = 0; /* are we processing batch input now */
+int cantwarhead = 0; /* pitch or yaw will be applied to warhead */
+int deflectcone = DFL_DEFLECT; /* cone axis deflects towards normal */
+int dithercells = DFL_DITHER; /* if true, randomize shot within cell */
+int fatalerror; /* must abort ray tracing */
+int groundburst = 0; /* if true, burst on imaginary ground */
+int reportoverlaps = DFL_OVERLAPS;
/* if true, overlaps are reported */
-boolean reqburstair = 1; /* if true, burst air required for shotburst */
-boolean shotburst = 0; /* if true, burst along shotline */
-boolean tty = 1; /* if true, full screen display is used */
-boolean userinterrupt; /* has the ray trace been interrupted */
+int reqburstair = 1; /* if true, burst air required for shotburst */
+int shotburst = 0; /* if true, burst along shotline */
+int tty = 1; /* if true, full screen display is used */
+int userinterrupt; /* has the ray trace been interrupted */
char airfile[LNBUFSZ]={0}; /* input file name for burst air ids */
char armorfile[LNBUFSZ]={0}; /* input file name for burst armor ids */
Modified: brlcad/trunk/src/burst/grid.c
===================================================================
--- brlcad/trunk/src/burst/grid.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/grid.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -65,10 +65,10 @@
static struct application ag; /* global application structure (zeroed out) */
/* functions local to this module */
-static boolean doBursts();
-static boolean burstPoint();
-static boolean burstRay();
-static boolean gridShot();
+static int doBursts();
+static int burstPoint();
+static int burstRay();
+static int gridShot();
static fastf_t max();
static fastf_t min();
static int f_BurstHit();
@@ -146,7 +146,7 @@
}
/*
- boolean doBursts(void)
+ int doBursts(void)
This routine gets called when explicit burst points are being
input. Crank through all burst points. Return code of 0
@@ -154,10 +154,10 @@
rt_shootray() or an error or EOF in getting the next set of
burst point coordinates.
*/
-static boolean
+static int
doBursts()
{
- boolean status = 1;
+ int status = 1;
noverlaps = 0;
VMOVE(ag.a_ray.r_dir, viewdir);
@@ -584,12 +584,12 @@
fastf_t exitnorm[3]; /* normal at exit */
/* Get entry normal. */
getRtHitNorm(pp->pt_inhit, pp->pt_inseg->seg_stp,
- &ap->a_ray, (boolean) pp->pt_inflip, entrynorm);
+ &ap->a_ray, (int) pp->pt_inflip, entrynorm);
(void) chkEntryNorm(pp, &ap->a_ray, entrynorm,
"shotline entry normal");
/* Get exit normal. */
getRtHitNorm(pp->pt_outhit, pp->pt_outseg->seg_stp,
- &ap->a_ray, (boolean) pp->pt_outflip, exitnorm);
+ &ap->a_ray, (int) pp->pt_outflip, exitnorm);
(void) chkExitNorm(pp, &ap->a_ray, exitnorm,
"shotline exit normal");
@@ -771,7 +771,7 @@
/*
void getRtHitNorm(struct hit *hitp, struct soltab *stp,
- struct xray *rayp, boolean flipped, fastf_t normvec[3])
+ struct xray *rayp, int flipped, fastf_t normvec[3])
Fill normal and hit point into hit struct and if the flipped
flag is set, reverse the normal. Return a private copy of the
@@ -784,13 +784,13 @@
struct hit *hitp;
struct soltab *stp;
struct xray *rayp;
- boolean flipped;
+ int flipped;
fastf_t normvec[3];
{
RT_HIT_NORMAL(normvec, hitp, stp, rayp, flipped);
}
-boolean
+int
chkEntryNorm(pp, rayp, normvec, purpose)
struct partition *pp;
struct xray *rayp;
@@ -801,7 +801,7 @@
static int flipct = 0;
static int totalct = 0;
struct soltab *stp = pp->pt_inseg->seg_stp;
- boolean ret = 1;
+ int ret = 1;
totalct++;
/* Dot product of ray direction with normal *should* be negative. */
f = VDOT(rayp->r_dir, normvec);
@@ -841,7 +841,7 @@
return ret;
}
-boolean
+int
chkExitNorm(pp, rayp, normvec, purpose)
struct partition *pp;
struct xray *rayp;
@@ -852,7 +852,7 @@
static int flipct = 0;
static int totalct = 0;
struct soltab *stp = pp->pt_outseg->seg_stp;
- boolean ret = 1;
+ int ret = 1;
totalct++;
/* Dot product of ray direction with normal *should* be positive. */
f = VDOT(rayp->r_dir, normvec);
@@ -1339,17 +1339,17 @@
}
/*
- boolean gridShot(void)
+ int gridShot(void)
This routine is the grid-level raytracing task; suitable for a
multi-tasking process. Return code of 0 would indicate a
failure in the application routine given to rt_shootray() or an
error or EOF in getting the next set of firing coordinates.
*/
-static boolean
+static int
gridShot()
{
- boolean status = 1;
+ int status = 1;
struct application a;
a = ag;
a.a_resource = RESOURCE_NULL;
@@ -1647,7 +1647,7 @@
This routine dispatches the burst point ray tracing task burstRay().
RETURN CODES: 0 for fatal ray tracing error, 1 otherwise.
*/
-static boolean
+static int
burstPoint(ap, normal, bpt)
struct application *ap;
fastf_t *normal;
@@ -1685,14 +1685,14 @@
return burstRay();
}
-static boolean
+static int
burstRay()
{
/* Need local copy of all but readonly variables for concurrent
threads of execution. */
struct application a_spall;
fastf_t phi;
- boolean hitcrit = 0;
+ int hitcrit = 0;
a_spall = a_burst;
a_spall.a_resource = RESOURCE_NULL;
for (; ! userinterrupt;)
Modified: brlcad/trunk/src/burst/idents.c
===================================================================
--- brlcad/trunk/src/burst/idents.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/idents.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -38,7 +38,7 @@
#define DEBUG_IDENTS 0
-boolean
+int
findIdents( ident, idp )
int ident;
Ids *idp;
@@ -93,7 +93,7 @@
free( (char *) idp->i_next );
}
-boolean
+int
readIdents( idlist, fp )
Ids *idlist;
FILE *fp;
@@ -126,7 +126,7 @@
return 1;
}
-boolean
+int
readColors( colorlist, fp )
Colors *colorlist;
FILE *fp;
Modified: brlcad/trunk/src/burst/prnt.c
===================================================================
--- brlcad/trunk/src/burst/prnt.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/prnt.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -208,8 +208,8 @@
&& fprintf(outfp,
"%c % 9.4f % 8.4f % 5.2f % 10.2f %-6s % 9.6f\n",
PB_ASPECT_INIT,
- viewazim*DEGRAD, /* attack azimuth in degrees */
- viewelev*DEGRAD, /* attack elevation in degrees
*/
+ viewazim*RAD2DEG, /* attack azimuth in degrees
*/
+ viewelev*RAD2DEG, /* attack elevation in
degrees */
bdist*unitconv, /* BDIST */
projarea, /* projected area associated with
burst pt. */
units == U_INCHES ? "inches" :
@@ -229,8 +229,8 @@
&& fprintf(shotlnfp,
"%c % 9.4f % 8.4f % 7.2f % 7.2f %7.2f %7.2f
%7.2f %-6s\n",
PS_ASPECT_INIT,
- viewazim*DEGRAD, /* attack azimuth in degrees */
- viewelev*DEGRAD, /* attack elevation in degrees
*/
+ viewazim*RAD2DEG, /* attack azimuth in degrees
*/
+ viewelev*RAD2DEG, /* attack elevation in
degrees */
cellsz*unitconv, /* shotline separation */
modlrt*unitconv, /* maximum Y'-coordinate of
target */
modllf*unitconv, /* minimum Y'-coordinate of
target */
@@ -358,7 +358,7 @@
/*
void prntSeg(struct application *ap, struct partition *cpp, int space,
fastf_t entrynorm[3], fastf_t exitnorm[3],
- boolean burstflag)
+ int burstflag)
Burst Point Library and Shotline file: information about each component
hit along path of main penetrator (shotline).
@@ -371,7 +371,7 @@
int space;
fastf_t entrynorm[3];
fastf_t exitnorm[3];
- boolean burstflag; /* Was a burst generated by this partition? */
+ int burstflag; /* Was a burst generated by this partition? */
{
fastf_t icosobliquity; /* cosine of obliquity at entry */
fastf_t ocosobliquity; /* cosine of obliquity at exit */
@@ -393,7 +393,7 @@
else
{
rotangle = atan2(exitnorm[Y], exitnorm[X]);
- rotangle *= DEGRAD; /* convert to degrees */
+ rotangle *= RAD2DEG; /* convert to degrees */
if (rotangle < 0.0)
rotangle += 360.0;
}
@@ -431,7 +431,7 @@
if (shotlnfile[0] == NUL)
return;
entryangle = AproxEq(icosobliquity, 1.0, COS_TOL) ?
- 0.0 : acos(icosobliquity) * DEGRAD;
+ 0.0 : acos(icosobliquity) * RAD2DEG;
if ( (normthickness =
getNormThickness(ap, cpp, icosobliquity, entrynorm)) <= 0.0
&& fatalerror)
@@ -447,7 +447,7 @@
return;
}
exitangle = AproxEq(ocosobliquity, 1.0, COS_TOL) ?
- 0.0 : acos(ocosobliquity) * DEGRAD;
+ 0.0 : acos(ocosobliquity) * RAD2DEG;
if (fprintf(shotlnfp,
"%c % 8.2f % 7.3f % 7.2f %4d % 8.2f % 8.2f %2d % 7.2f % 7.2f\n",
PS_SHOT_INTERSECT,
@@ -539,7 +539,7 @@
struct xray *rayp = &ap->a_ray;
/* Get entry/exit normals and fill in hit points */
getRtHitNorm(ihitp, pp->pt_inseg->seg_stp, rayp,
- (boolean) pp->pt_inflip, entrynorm);
+ (int) pp->pt_inflip, entrynorm);
if (! chkEntryNorm(pp, rayp, entrynorm,
"spall ray component entry normal"))
{
@@ -549,7 +549,7 @@
#endif
}
getRtHitNorm(ohitp, pp->pt_outseg->seg_stp, rayp,
- (boolean) pp->pt_outflip, exitnorm);
+ (int) pp->pt_outflip, exitnorm);
if (! chkExitNorm(pp, rayp, exitnorm,
"spall ray component exit normal"))
{
Modified: brlcad/trunk/src/burst/trie.c
===================================================================
--- brlcad/trunk/src/burst/trie.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/trie.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -171,9 +171,6 @@
{
Trie *tp = triep;
static char name_buf[MAX_TRIE_LEVEL+1], *namep;
-#if DEBUG_TRIE
- brst_log( "prntTrie(triep=0x%x, level=%d)\n", triep, level );
-#endif
if ( tp == TRIE_NULL )
return;
if ( tp->n.t_altr != TRIE_NULL )
@@ -272,7 +269,7 @@
return buf;
}
-#if false
+#if 0
/*
Func *getFuncNm( char *inbuf, int bufsz, char *msg, Trie **triepp )
TENEX-style name completion.
Modified: brlcad/trunk/src/burst/ui.c
===================================================================
--- brlcad/trunk/src/burst/ui.c 2010-10-19 06:05:28 UTC (rev 41098)
+++ brlcad/trunk/src/burst/ui.c 2010-10-19 06:10:35 UTC (rev 41099)
@@ -383,7 +383,7 @@
HmItem *itemp;
Ftable *ftp = tp;
int cnt;
- boolean done = 0;
+ int done = 0;
if ( ftp == NULL )
return NULL;
for ( cnt = 0; ftp->name != NULL; ftp++ )
@@ -498,7 +498,7 @@
return;
}
-boolean
+int
initUi()
{
if ( tty )
@@ -552,14 +552,14 @@
{ "Attack elevation", "", "%lf", "degrees" },
};
Input *ip = input;
- GetVar( viewazim, ip, DEGRAD );
- GetVar( viewelev, ip, DEGRAD );
+ GetVar( viewazim, ip, RAD2DEG );
+ GetVar( viewelev, ip, RAD2DEG );
(void) snprintf( scrbuf, LNBUFSZ, "%s\t%g %g",
itemp != NULL ? itemp->text : cmdname,
viewazim, viewelev );
logCmd( scrbuf );
- viewazim /= DEGRAD;
- viewelev /= DEGRAD;
+ viewazim /= RAD2DEG;
+ viewelev /= RAD2DEG;
return;
}
@@ -798,12 +798,12 @@
{ "Cone angle", "", "%lf", "degrees" },
};
Input *ip = input;
- GetVar( conehfangle, ip, DEGRAD );
+ GetVar( conehfangle, ip, RAD2DEG );
(void) snprintf( scrbuf, LNBUFSZ, "%s\t\t%g",
itemp != NULL ? itemp->text : cmdname,
conehfangle );
logCmd( scrbuf );
- conehfangle /= DEGRAD;
+ conehfangle /= RAD2DEG;
return;
}
@@ -960,8 +960,8 @@
Mexecute( itemp )
HmItem *itemp;
{
- static boolean gottree = 0;
- boolean loaderror = 0;
+ static int gottree = 0;
+ int loaderror = 0;
(void) snprintf( scrbuf, LNBUFSZ,
"%s",
itemp != NULL ? itemp->text : cmdname );
@@ -982,7 +982,7 @@
}
prntTimer( "dir" );
notify( NULL, NOTIFY_DELETE );
- /* Add air into boolean trees, must be set after rt_dirbuild() and
+ /* Add air into int trees, must be set after rt_dirbuild() and
before rt_gettree().
*/
rtip->useair = 1;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
