[brlcad-commits] SF.net SVN: brlcad:[37873] brlcad/trunk/include/rtfunc.h

[<br...@us...>]

Revision: 37873
          http://brlcad.svn.sourceforge.net/brlcad/?rev=37873&view=rev
Author:   brlcad
Date:     2010-03-03 05:34:21 +0000 (Wed, 03 Mar 2010)

Log Message:
-----------
add _obj_ to naming convention (at least for now) to avoid conflicting with rt_prep() and add missing header ifndef wrapping.

Modified Paths:
--------------
    brlcad/trunk/include/rtfunc.h

Modified: brlcad/trunk/include/rtfunc.h
===================================================================
--- brlcad/trunk/include/rtfunc.h	2010-03-03 04:52:00 UTC (rev 37872)
+++ brlcad/trunk/include/rtfunc.h	2010-03-03 05:34:21 UTC (rev 37873)
@@ -30,135 +30,143 @@
  *
  */
 
+#ifndef __RTFUNC_H__
+#define __RTFUNC_H__
+
+
+#include "bu.h"
+#include "raytrace.h"
+
+
 /**
  * prep an object for ray tracing
  */
-RT_EXPORT extern int rt_prep(struct soltab *stp, struct rt_db_internal *ip, struct rt_i *rtip);
+RT_EXPORT extern int rt_obj_prep(struct soltab *stp, struct rt_db_internal *ip, struct rt_i *rtip);
 
 /**
  * shoot a ray at an object that has been prepped for ray tracing
  */
-RT_EXPORT extern int rt_shot(struct soltab *stp, register struct xray *rp, struct application *ap, struct seg *seghead);
+RT_EXPORT extern int rt_obj_shot(struct soltab *stp, register struct xray *rp, struct application *ap, struct seg *seghead);
 
 /**
  * TBD.
  */
-RT_EXPORT extern int rt_piece_shot(struct rt_piecestate *psp, struct rt_piecelist *plp, double dist_corr, struct xray *rp, struct application *ap, struct seg *seghead);
+RT_EXPORT extern int rt_obj_piece_shot(struct rt_piecestate *psp, struct rt_piecelist *plp, double dist_corr, struct xray *rp, struct application *ap, struct seg *seghead);
 
 /**
  * TBD.
  */
-RT_EXPORT extern void rt_piece_hitsegs(struct rt_piecestate *psp, struct seg *seghead, struct application *ap);
+RT_EXPORT extern void rt_obj_piece_hitsegs(struct rt_piecestate *psp, struct seg *seghead, struct application *ap);
 
 /**
  * print an objects parameters in debug/diagnostic form
  */
-RT_EXPORT extern void rt_print(const struct soltab *stp);
+RT_EXPORT extern void rt_obj_print(const struct soltab *stp);
 
 /**
  * calculate a normal on an object that has been hit via rt_shot()
  */
-RT_EXPORT extern void rt_norm(struct hit *hitp, struct soltab *stp, struct xray *rp);
+RT_EXPORT extern void rt_obj_norm(struct hit *hitp, struct soltab *stp, struct xray *rp);
 
 /**
  * calculate object uv parameterization for a given hit point
  */
-RT_EXPORT extern void rt_uv(struct application *ap, struct soltab *stp, struct hit *hitp, struct uvcoord *uvp);
+RT_EXPORT extern void rt_obj_uv(struct application *ap, struct soltab *stp, struct hit *hitp, struct uvcoord *uvp);
 
 /**
  * calculate object curvature for a given hit point
  */
-RT_EXPORT extern void rt_curve(struct curvature *cvp, struct hit *hitp, struct soltab *stp);
+RT_EXPORT extern void rt_obj_curve(struct curvature *cvp, struct hit *hitp, struct soltab *stp);
 
 /**
  * DEPRECATED: Unimplemented.
  */
-RT_EXPORT extern int rt_class();
+RT_EXPORT extern int rt_obj_class();
 
 /**
  * release the memory used by a solid
  */
-RT_EXPORT extern void rt_free(struct soltab *stp);
+RT_EXPORT extern void rt_obj_free(struct soltab *stp);
 
 /**
  * obtain a vlist wireframe representation of an object for plotting purposes
  */
-RT_EXPORT extern int rt_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol);
+RT_EXPORT extern int rt_obj_plot(struct bu_list *vhead, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol);
 
 /**
  * shoot an array of rays at a set of homogenous objects.
  */
-RT_EXPORT extern void rt_vshot(struct soltab *stp[], struct xray *rp[], struct seg segp[], int n, struct application *ap);
+RT_EXPORT extern void rt_obj_vshot(struct soltab *stp[], struct xray *rp[], struct seg segp[], int n, struct application *ap);
 
 /**
  * tessellate an object (into NMG form)
  */
-RT_EXPORT extern int rt_tess(struct nmgregion **r, struct model *m, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol);
+RT_EXPORT extern int rt_obj_tess(struct nmgregion **r, struct model *m, struct rt_db_internal *ip, const struct rt_tess_tol *ttol, const struct bn_tol *tol);
 
 /**
  * tessellate an object (into NURBS NMG form)
  */
-RT_EXPORT extern int rt_tnurb(struct nmgregion **r, struct model *m, struct rt_db_internal *ip, const struct bn_tol *tol);
+RT_EXPORT extern int rt_obj_tnurb(struct nmgregion **r, struct model *m, struct rt_db_internal *ip, const struct bn_tol *tol);
 
 /**
  * v5 object import from disk
  */
-RT_EXPORT extern int rt_import5(struct rt_db_internal *ip, const struct bu_external *ep, const mat_t mat, const struct db_i *dbip, struct resource *resp);
+RT_EXPORT extern int rt_obj_import5(struct rt_db_internal *ip, const struct bu_external *ep, const mat_t mat, const struct db_i *dbip, struct resource *resp);
 
 /**
  * v5 object export to disk
  */
-RT_EXPORT extern int rt_export5(struct bu_external *ep, const struct rt_db_internal *ip, double local2mm, const struct db_i *dbip, struct resource *resp);
+RT_EXPORT extern int rt_obj_export5(struct bu_external *ep, const struct rt_db_internal *ip, double local2mm, const struct db_i *dbip, struct resource *resp);
 
 /**
  * v4 object import from disk
  */
-RT_EXPORT extern int rt_import4(struct rt_db_internal *ip, const struct bu_external *ep, const mat_t mat, const struct db_i *dbip, struct resource *resp);
+RT_EXPORT extern int rt_obj_import4(struct rt_db_internal *ip, const struct bu_external *ep, const mat_t mat, const struct db_i *dbip, struct resource *resp);
 
 /**
  * v4 object export to disk
  */
-RT_EXPORT extern int rt_export4(struct bu_external *ep, const struct rt_db_internal *ip, double local2mm, const struct db_i *dbip, struct resource *resp);
+RT_EXPORT extern int rt_obj_export4(struct bu_external *ep, const struct rt_db_internal *ip, double local2mm, const struct db_i *dbip, struct resource *resp);
 
 /**
  * free the internal representation of an object
  */
-RT_EXPORT extern void rt_ifree(struct rt_db_internal *ip);
+RT_EXPORT extern void rt_obj_ifree(struct rt_db_internal *ip);
 
 /**
  * db object 'get' support, obtain a tcl list representation
  */
-RT_EXPORT extern int rt_get(struct bu_vls *logstr, const struct rt_db_internal *intern, const char *attr);
+RT_EXPORT extern int rt_obj_get(struct bu_vls *logstr, const struct rt_db_internal *intern, const char *attr);
 
 /**
  * db object 'adjust' support, modify a tcl list representation
  */
-RT_EXPORT extern int rt_adjust(struct bu_vls *logstr, struct rt_db_internal *intern, int argc, char **argv);
+RT_EXPORT extern int rt_obj_adjust(struct bu_vls *logstr, struct rt_db_internal *intern, int argc, char **argv);
 
 /**
  * describe an object in text form (used by the 'l' command)
  */
-RT_EXPORT extern int rt_describe(struct bu_vls *str, const struct rt_db_internal *ip, int verbose, double mm2local, struct resource *resp, struct db_i *db_i);
+RT_EXPORT extern int rt_obj_describe(struct bu_vls *str, const struct rt_db_internal *ip, int verbose, double mm2local, struct resource *resp, struct db_i *db_i);
 
 /**
  * create a 'default' object
  */
-RT_EXPORT extern void rt_make(const struct rt_functab *ftp, struct rt_db_internal *intern);
+RT_EXPORT extern void rt_obj_make(const struct rt_functab *ftp, struct rt_db_internal *intern);
 
 /**
  * apply a matrix transformation to an object (translation, rotation, scale)
  */
-RT_EXPORT extern int rt_xform(struct rt_db_internal *op, const mat_t mat, struct rt_db_internal *ip, int release, struct db_i *dbip, struct resource *resp);
+RT_EXPORT extern int rt_obj_xform(struct rt_db_internal *op, const mat_t mat, struct rt_db_internal *ip, int release, struct db_i *dbip, struct resource *resp);
 
 /**
  * obtain parameters for an object in libpc form
  */
-RT_EXPORT extern int rt_params(struct pc_pc_set *ps, const struct rt_db_internal *ip);
+RT_EXPORT extern int rt_obj_params(struct pc_pc_set *ps, const struct rt_db_internal *ip);
 
 /**
  * mirror an object about a plane
  */
-RT_EXPORT extern int rt_mirror(struct rt_db_internal *ip, const plane_t *plane);
+RT_EXPORT extern int rt_obj_mirror(struct rt_db_internal *ip, const plane_t *plane);
 
 #endif  /* __RTFUNC_H__ */
 /** @} */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.