Thread: [brlcad-commits] SF.net SVN: brlcad:[44280] brlcad/trunk/include/raytrace.h (Page 3)
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <r_...@us...> - 2011-04-08 15:15:03
|
Revision: 44280 http://brlcad.svn.sourceforge.net/brlcad/?rev=44280&view=rev Author: r_weiss Date: 2011-04-08 15:14:56 +0000 (Fri, 08 Apr 2011) Log Message: ----------- Updated the header file 'raytrace.h' to include the definition of a new prototype function 'nmg_dump_model'. This new function is located in file 'nmg_tri.c'. This update supports the new prototype function 'nmg_triangulate_fu' (nmg triangulate faceuse). Preprocessor commands were added to disable this change by default. This code is a work in progress. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-04-08 15:06:51 UTC (rev 44279) +++ brlcad/trunk/include/raytrace.h 2011-04-08 15:14:56 UTC (rev 44280) @@ -4905,6 +4905,10 @@ RT_EXPORT BU_EXTERN(void nmg_triangulate_fu, (struct faceuse *fu, const struct bn_tol *tol)); +#ifdef TRI_PROTOTYPE +RT_EXPORT BU_EXTERN(void nmg_dump_model, + (struct model *m)); +#endif /* nmg_tri_mc.c */ RT_EXPORT BU_EXTERN(void nmg_triangulate_model_mc, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-04-13 12:39:58
|
Revision: 44339 http://brlcad.svn.sourceforge.net/brlcad/?rev=44339&view=rev Author: starseeker Date: 2011-04-13 12:39:47 +0000 (Wed, 13 Apr 2011) Log Message: ----------- whoops - helps to check in the headers too Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-04-13 12:37:11 UTC (rev 44338) +++ brlcad/trunk/include/raytrace.h 2011-04-13 12:39:47 UTC (rev 44339) @@ -2811,6 +2811,7 @@ struct db_full_path_list { struct bu_list l; struct db_full_path *path; + int local; }; RT_EXPORT BU_EXTERN(void db_free_full_path_list, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-04-16 23:05:39
|
Revision: 44412 http://brlcad.svn.sourceforge.net/brlcad/?rev=44412&view=rev Author: starseeker Date: 2011-04-16 23:05:31 +0000 (Sat, 16 Apr 2011) Log Message: ----------- Looks like we'll probably need this macro. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-04-16 15:02:45 UTC (rev 44411) +++ brlcad/trunk/include/raytrace.h 2011-04-16 23:05:31 UTC (rev 44412) @@ -6112,7 +6112,10 @@ */ RT_EXPORT BU_EXTERN(void db5_sync_comb_to_attr, (const struct rt_comb_internal *comb, struct bu_attribute_value_set *avs)); +/* Convenience macros */ +#define ATTR_STD(attr) db5_standard_attribute(db5_standardize_attribute(attr)) + #endif /* defined in binary_obj.c */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2011-04-29 20:10:40
|
Revision: 44537 http://brlcad.svn.sourceforge.net/brlcad/?rev=44537&view=rev Author: bob1961 Date: 2011-04-29 20:10:32 +0000 (Fri, 29 Apr 2011) Log Message: ----------- Added RT_APPLICATION_NULL macro. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-04-29 20:07:54 UTC (rev 44536) +++ brlcad/trunk/include/raytrace.h 2011-04-29 20:10:32 UTC (rev 44537) @@ -1671,6 +1671,7 @@ int b_return; }; +#define RT_APPLICATION_NULL ((struct application *)0) #define RT_AFN_NULL ((int (*)(struct application *, struct partition *, struct region *, struct region *, struct partition *))NULL) #define RT_CK_AP(_p) BU_CKMAG(_p, RT_AP_MAGIC, "struct application") #define RT_CK_APPLICATION(_p) BU_CKMAG(_p, RT_AP_MAGIC, "struct application") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-14 04:43:43
|
Revision: 44927 http://brlcad.svn.sourceforge.net/brlcad/?rev=44927&view=rev Author: brlcad Date: 2011-06-14 04:43:37 +0000 (Tue, 14 Jun 2011) Log Message: ----------- dbi_filename paths are not const if we have to free them! Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-14 04:42:04 UTC (rev 44926) +++ brlcad/trunk/include/raytrace.h 2011-06-14 04:43:37 UTC (rev 44927) @@ -815,7 +815,7 @@ double dbi_local2base; /**< @brief local2mm */ double dbi_base2local; /**< @brief unit conversion factors */ char * dbi_title; /**< @brief title from IDENT rec */ - char * const * dbi_filepath; /**< @brief search path for aux file opens (convenience var) */ + char ** dbi_filepath; /**< @brief search path for aux file opens (convenience var) */ /* THESE ELEMENTS ARE FOR LIBRT ONLY, AND MAY CHANGE */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-14 14:23:54
|
Revision: 44943 http://brlcad.svn.sourceforge.net/brlcad/?rev=44943&view=rev Author: brlcad Date: 2011-06-14 14:23:47 +0000 (Tue, 14 Jun 2011) Log Message: ----------- add a new RT_INIT_COMB_INTERNAL initialization macro for initializing rt_comb_internal structs. add a corresponding RT_FREE_COMB_INTERNAL() macro since we do initialize the vls strings potentially allocating memory (might want a bu_vls_init_empty() or vls INIT macro). Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-14 13:37:08 UTC (rev 44942) +++ brlcad/trunk/include/raytrace.h 2011-06-14 14:23:47 UTC (rev 44943) @@ -980,8 +980,44 @@ #define RT_CHECK_COMB_TCL(_interp, _p) BU_CKMAG_TCL(interp, _p, RT_COMB_MAGIC, "rt_comb_internal") #define RT_CK_COMB_TCL(_interp, _p) RT_CHECK_COMB_TCL(_interp, _p) +/** + * initialize an rt_comb_internal to empty. caller will need to free + * the shader/material members or call RT_FREE_COMB_INTERNAL(). + */ +#define RT_INIT_COMB_INTERNAL(_p) { \ + (_p)->magic = RT_COMB_MAGIC; \ + (_p)->tree = TREE_NULL; \ + (_p)->region_flag = 0; \ + (_p)->is_fastgen = REGION_NON_FASTGEN; \ + (_p)->region_id = 0; \ + (_p)->aircode = 0; \ + (_p)->GIFTmater = 0; \ + (_p)->los = 0; \ + (_p)->rgb_valid = 0; \ + (_p)->rgb[0] = 0; \ + (_p)->rgb[1] = 0; \ + (_p)->rgb[2] = 0; \ + (_p)->temperature = 0.0; \ + bu_vls_init(&(_p)->shader); \ + bu_vls_init(&(_p)->material); \ + (_p)->inherit = 0; \ + } /** + * release memory associated with an rt_comb_internal. the tree + * pointer is not released so callers will need to call RT_FREE_TREE() + * directly if a tree is set. however, the shader and material + * strings are released. + */ +#define RT_FREE_COMB_INTERNAL(_p) { \ + bu_vls_free(&(_p)->shader); \ + bu_vls_free(&(_p)->material); \ + (_p)->tree = TREE_NULL; \ + (_p)->magic = 0; \ + } + + +/** * R T _ B I N U N I F _ I N T E R N A L * * In-memory format for database uniform-array binary object. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-15 02:43:26
|
Revision: 44991 http://brlcad.svn.sourceforge.net/brlcad/?rev=44991&view=rev Author: brlcad Date: 2011-06-15 02:43:19 +0000 (Wed, 15 Jun 2011) Log Message: ----------- call BU_INIT_VLS() instead of bu_vls_init() here so we can avoid memory allocation Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-15 02:40:38 UTC (rev 44990) +++ brlcad/trunk/include/raytrace.h 2011-06-15 02:43:19 UTC (rev 44991) @@ -981,8 +981,7 @@ #define RT_CK_COMB_TCL(_interp, _p) RT_CHECK_COMB_TCL(_interp, _p) /** - * initialize an rt_comb_internal to empty. caller will need to free - * the shader/material members or call RT_FREE_COMB_INTERNAL(). + * initialize an rt_comb_internal to empty. */ #define RT_INIT_COMB_INTERNAL(_p) { \ (_p)->magic = RT_COMB_MAGIC; \ @@ -998,8 +997,8 @@ (_p)->rgb[1] = 0; \ (_p)->rgb[2] = 0; \ (_p)->temperature = 0.0; \ - bu_vls_init(&(_p)->shader); \ - bu_vls_init(&(_p)->material); \ + BU_INIT_VLS(&(_p)->shader); \ + BU_INIT_VLS(&(_p)->material); \ (_p)->inherit = 0; \ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-15 03:51:39
|
Revision: 44992 http://brlcad.svn.sourceforge.net/brlcad/?rev=44992&view=rev Author: brlcad Date: 2011-06-15 03:51:32 +0000 (Wed, 15 Jun 2011) Log Message: ----------- better comment wording. the struct itself isn't freed so don't say memory is released. callers still need to call bu_free(). Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-15 02:43:19 UTC (rev 44991) +++ brlcad/trunk/include/raytrace.h 2011-06-15 03:51:32 UTC (rev 44992) @@ -1003,10 +1003,11 @@ } /** - * release memory associated with an rt_comb_internal. the tree - * pointer is not released so callers will need to call RT_FREE_TREE() - * directly if a tree is set. however, the shader and material - * strings are released. + * deinitialize an rt_comb_internal. the tree pointer is not released + * so callers will need to call RT_FREE_TREE() or db_free_tree() + * directly if a tree is set. the shader and material strings are + * released. the comb itself will need to be released with bu_free() + * unless it resides on the stack. */ #define RT_FREE_COMB_INTERNAL(_p) { \ bu_vls_free(&(_p)->shader); \ @@ -1254,7 +1255,7 @@ } /** - * RT_FREE_TREE releases a tree union pointer. + * RT_FREE_TREE deinitializes a tree union pointer. * * This is a malloc-efficient replacement for bu_free(tp). Instead of * actually freeing the nodes, they are added to a single-linked list This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-15 13:18:49
|
Revision: 45013 http://brlcad.svn.sourceforge.net/brlcad/?rev=45013&view=rev Author: brlcad Date: 2011-06-15 13:18:38 +0000 (Wed, 15 Jun 2011) Log Message: ----------- update the one place where BU_INIT_VLS() was being called too. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-15 13:15:53 UTC (rev 45012) +++ brlcad/trunk/include/raytrace.h 2011-06-15 13:18:38 UTC (rev 45013) @@ -997,8 +997,8 @@ (_p)->rgb[1] = 0; \ (_p)->rgb[2] = 0; \ (_p)->temperature = 0.0; \ - BU_INIT_VLS(&(_p)->shader); \ - BU_INIT_VLS(&(_p)->material); \ + BU_VLS_INIT(&(_p)->shader); \ + BU_VLS_INIT(&(_p)->material); \ (_p)->inherit = 0; \ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-15 20:09:23
|
Revision: 45042 http://brlcad.svn.sourceforge.net/brlcad/?rev=45042&view=rev Author: brlcad Date: 2011-06-15 20:09:16 +0000 (Wed, 15 Jun 2011) Log Message: ----------- DBTR got expanded to DB_INTERNAL, no good. expand to DB_TRAVERSE. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-15 19:57:40 UTC (rev 45041) +++ brlcad/trunk/include/raytrace.h 2011-06-15 20:09:16 UTC (rev 45042) @@ -1137,7 +1137,7 @@ struct resource *resp; genptr_t client_data; }; -#define RT_DB_INTERNAL_INIT(_p) {(_p)->magic = RT_DB_TRAVERSE_MAGIC; \ +#define RT_DB_TRAVERSE_INIT(_p) {(_p)->magic = RT_DB_TRAVERSE_MAGIC; \ (_p)->dbip = GENPTR_NULL; (_p)->comb_enter_func = GENPTR_NULL; \ (_p)->comb_exit_func = GENPTR_NULL; (_p)->leaf_func = GENPTR_NULL; \ (_p)->resp = GENPTR_NULL; (_p)->client_data = GENPTR_NULL;} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_r...@us...> - 2011-06-16 14:24:32
|
Revision: 45067 http://brlcad.svn.sourceforge.net/brlcad/?rev=45067&view=rev Author: d_rossberg Date: 2011-06-16 14:24:21 +0000 (Thu, 16 Jun 2011) Log Message: ----------- quell warnings (and probable misinterpretation) in MSVC Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-16 14:09:40 UTC (rev 45066) +++ brlcad/trunk/include/raytrace.h 2011-06-16 14:24:21 UTC (rev 45067) @@ -2124,8 +2124,8 @@ int (*ft_adjust)(struct bu_vls *, struct rt_db_internal *, int /*argc*/, const char ** /*argv*/); int (*ft_form)(struct bu_vls *, const struct rt_functab *); - void (*ft_make)(const struct rt_functab *, struct rt_db_internal */*ip*/); - int (*ft_params)(struct pc_pc_set *, const struct rt_db_internal */*ip*/); + void (*ft_make)(const struct rt_functab *, struct rt_db_internal * /*ip*/); + int (*ft_params)(struct pc_pc_set *, const struct rt_db_internal * /*ip*/); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-06-18 15:39:37
|
Revision: 45105 http://brlcad.svn.sourceforge.net/brlcad/?rev=45105&view=rev Author: brlcad Date: 2011-06-18 15:39:30 +0000 (Sat, 18 Jun 2011) Log Message: ----------- quell doxygen warning, 'command inside argument documentation' Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-18 15:31:25 UTC (rev 45104) +++ brlcad/trunk/include/raytrace.h 2011-06-18 15:39:30 UTC (rev 45105) @@ -1086,21 +1086,21 @@ struct bu_attribute_value_set ts_attrs; /**< @brief attribute/value structure */ int ts_stop_at_regions; /**< @brief else stop at solids */ - int (*ts_region_start_func)(struct db_tree_state * /**< @brief tsp*/, - const struct db_full_path * /**< @brief pathp*/, - const struct rt_comb_internal * /**< @brief combp */, + int (*ts_region_start_func)(struct db_tree_state *tsp, + const struct db_full_path *pathp, + const struct rt_comb_internal *comb, genptr_t client_data - ); - union tree * (*ts_region_end_func)(struct db_tree_state * /**< @brief tsp*/, - const struct db_full_path * /**< @brief pathp*/, - union tree * /**< @brief curtree*/, + ); /**< @brief callback during DAG downward traversal called on region nodes */ + union tree * (*ts_region_end_func)(struct db_tree_state *tsp, + const struct db_full_path *pathp, + union tree *curtree, genptr_t client_data - ); - union tree * (*ts_leaf_func)(struct db_tree_state * /**< @brief tsp*/, - const struct db_full_path * /**< @brief pathp*/, - struct rt_db_internal * /**< @brief ip*/, + ); /**< @brief callback during DAG upward traversal called on region nodes */ + union tree * (*ts_leaf_func)(struct db_tree_state *tsp, + const struct db_full_path *pathp, + struct rt_db_internal *ip, genptr_t client_data - ); + ); /**< @brief callback during DAG traversal called on leaf primitive nodes */ const struct rt_tess_tol * ts_ttol; /**< @brief Tessellation tolerance */ const struct bn_tol * ts_tol; /**< @brief Math tolerance */ struct model ** ts_m; /**< @brief ptr to ptr to NMG "model" */ @@ -2036,34 +2036,34 @@ char ft_name[16]; char ft_label[8]; int ft_use_rpp; - int (*ft_prep)(struct soltab * /**< @brief stp*/, - struct rt_db_internal * /**< @brief ip*/, - struct rt_i * /**< @brief rtip*/); - int (*ft_shot)(struct soltab * /**< @brief stp*/, - struct xray * /**< @brief rp*/, - struct application * /**< @brief ap*/, /**< @brief has resource */ - struct seg * /**< @brief seghead*/); - void (*ft_print)(const struct soltab * /**< @brief stp*/); - void (*ft_norm)(struct hit * /**< @brief hitp*/, - struct soltab * /**< @brief stp*/, - struct xray * /**< @brief rp*/); - int (*ft_piece_shot)(struct rt_piecestate * /**< @brief psp*/, - struct rt_piecelist * /**< @brief plp*/, - double /**< @brief dist_correction to apply to hit distances */, - struct xray * /**< @brief ray transformed to be near cut cell */, - struct application * /**< @brief ap*/, /**< @brief has resource */ - struct seg * /**< @brief seghead*/); /**< @brief used only for PLATE mode hits */ - void (*ft_piece_hitsegs)(struct rt_piecestate * /**< @brief psp*/, - struct seg * /**< @brief seghead*/, - struct application * /**< @brief ap*/); /**< @brief has resource */ - void (*ft_uv)(struct application * /**< @brief ap*/, /**< @brief has resource */ - struct soltab * /**< @brief stp*/, - struct hit * /**< @brief hitp*/, - struct uvcoord * /**< @brief uvp*/); - void (*ft_curve)(struct curvature * /**< @brief cvp*/, - struct hit * /**< @brief hitp*/, - struct soltab * /**< @brief stp*/); - int (*ft_classify)(const struct soltab * /*stp*/, const vect_t /*min*/, const vect_t /*max*/, const struct bn_tol * /*tol*/); + int (*ft_prep)(struct soltab *stp, + struct rt_db_internal *ip, + struct rt_i *rtip); + int (*ft_shot)(struct soltab *stp, + struct xray *rp, + struct application *ap, /* has resource */ + struct seg *seghead); + void (*ft_print)(const struct soltab *stp); + void (*ft_norm)(struct hit *hitp, + struct soltab *stp, + struct xray *rp); + int (*ft_piece_shot)(struct rt_piecestate *psp, + struct rt_piecelist *plp, + double dist, /* correction to apply to hit distances */ + struct xray *ray, /* ray transformed to be near cut cell */ + struct application *ap, /* has resource */ + struct seg *seghead); /* used only for PLATE mode hits */ + void (*ft_piece_hitsegs)(struct rt_piecestate *psp, + struct seg *seghead, + struct application *ap); /* has resource */ + void (*ft_uv)(struct application *ap, /* has resource */ + struct soltab *stp, + struct hit *hitp, + struct uvcoord *uvp); + void (*ft_curve)(struct curvature *cvp, + struct hit *hitp, + struct soltab *stp); + int (*ft_classify)(const struct soltab */*stp*/, const vect_t /*min*/, const vect_t /*max*/, const struct bn_tol * /*tol*/); void (*ft_free)(struct soltab * /*stp*/); int (*ft_plot)(struct bu_list * /*vhead*/, struct rt_db_internal * /*ip*/, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eri...@us...> - 2011-06-20 14:50:15
|
Revision: 45120 http://brlcad.svn.sourceforge.net/brlcad/?rev=45120&view=rev Author: erikgreenwald Date: 2011-06-20 14:50:08 +0000 (Mon, 20 Jun 2011) Log Message: ----------- Some parsers freak out when they see */*stp*/, thinking it's an end of comment. Adding a space seems to make them happy. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-20 03:21:08 UTC (rev 45119) +++ brlcad/trunk/include/raytrace.h 2011-06-20 14:50:08 UTC (rev 45120) @@ -2063,7 +2063,7 @@ void (*ft_curve)(struct curvature *cvp, struct hit *hitp, struct soltab *stp); - int (*ft_classify)(const struct soltab */*stp*/, const vect_t /*min*/, const vect_t /*max*/, const struct bn_tol * /*tol*/); + int (*ft_classify)(const struct soltab * /*stp*/, const vect_t /*min*/, const vect_t /*max*/, const struct bn_tol * /*tol*/); void (*ft_free)(struct soltab * /*stp*/); int (*ft_plot)(struct bu_list * /*vhead*/, struct rt_db_internal * /*ip*/, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bhi...@us...> - 2011-06-24 00:08:15
|
Revision: 45225 http://brlcad.svn.sourceforge.net/brlcad/?rev=45225&view=rev Author: bhinesley Date: 2011-06-24 00:08:09 +0000 (Fri, 24 Jun 2011) Log Message: ----------- we have a DB_FULL_PATH_CUR_DIR, so why not add a DB_FULL_PATH_DOOR_DIR, too. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-24 00:06:30 UTC (rev 45224) +++ brlcad/trunk/include/raytrace.h 2011-06-24 00:08:09 UTC (rev 45225) @@ -232,6 +232,7 @@ #define DB_FULL_PATH_POP(_pp) { \ (_pp)->fp_len--; \ } +#define DB_FULL_PATH_ROOT_DIR(_pp) ((_pp)->fp_names[0]) #define DB_FULL_PATH_CUR_DIR(_pp) ((_pp)->fp_names[(_pp)->fp_len-1]) #define DB_FULL_PATH_GET(_pp, _i) ((_pp)->fp_names[(_i)]) #define RT_CK_FULL_PATH(_p) BU_CKMAG(_p, DB_FULL_PATH_MAGIC, "db_full_path") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bhi...@us...> - 2011-06-24 00:31:58
|
Revision: 45227 http://brlcad.svn.sourceforge.net/brlcad/?rev=45227&view=rev Author: bhinesley Date: 2011-06-24 00:31:51 +0000 (Fri, 24 Jun 2011) Log Message: ----------- r45225 added DB_FULL_PATH_ROOT_DIR, not DB_FULL_PATH_DOOR_DIR Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-06-24 00:10:22 UTC (rev 45226) +++ brlcad/trunk/include/raytrace.h 2011-06-24 00:31:51 UTC (rev 45227) @@ -232,8 +232,8 @@ #define DB_FULL_PATH_POP(_pp) { \ (_pp)->fp_len--; \ } +#define DB_FULL_PATH_CUR_DIR(_pp) ((_pp)->fp_names[(_pp)->fp_len-1]) #define DB_FULL_PATH_ROOT_DIR(_pp) ((_pp)->fp_names[0]) -#define DB_FULL_PATH_CUR_DIR(_pp) ((_pp)->fp_names[(_pp)->fp_len-1]) #define DB_FULL_PATH_GET(_pp, _i) ((_pp)->fp_names[(_i)]) #define RT_CK_FULL_PATH(_p) BU_CKMAG(_p, DB_FULL_PATH_MAGIC, "db_full_path") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <r_...@us...> - 2011-08-03 17:28:07
|
Revision: 45769 http://brlcad.svn.sourceforge.net/brlcad/?rev=45769&view=rev Author: r_weiss Date: 2011-08-03 17:28:01 +0000 (Wed, 03 Aug 2011) Log Message: ----------- Added an entry into the 'raytrace.h' header for a new function 'nmg_keu_zl' which removes all zero length edgeuse from an nmg shell. This function is disabled by default and is a work in progress. This function supports the prototype version of 'nmg_triangulate_fu'. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-08-03 17:22:48 UTC (rev 45768) +++ brlcad/trunk/include/raytrace.h 2011-08-03 17:28:01 UTC (rev 45769) @@ -3742,6 +3742,10 @@ RT_EXPORT extern int nmg_kfu(struct faceuse *fu1); RT_EXPORT extern int nmg_klu(struct loopuse *lu1); RT_EXPORT extern int nmg_keu(struct edgeuse *eu); +#ifdef TRI_PROTOTYPE +RT_EXPORT extern int nmg_keu_zl(struct shell *s, + const struct bn_tol *tol); +#endif RT_EXPORT extern int nmg_ks(struct shell *s); RT_EXPORT extern int nmg_kr(struct nmgregion *r); RT_EXPORT extern void nmg_km(struct model *m); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-08-08 16:28:41
|
Revision: 45811 http://brlcad.svn.sourceforge.net/brlcad/?rev=45811&view=rev Author: brlcad Date: 2011-08-08 16:28:34 +0000 (Mon, 08 Aug 2011) Log Message: ----------- add a new type, rt_curve, for use by sketch and extrude definitions. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-08-08 16:27:18 UTC (rev 45810) +++ brlcad/trunk/include/raytrace.h 2011-08-08 16:28:34 UTC (rev 45811) @@ -1969,6 +1969,18 @@ /** + * container for a set of sketch segments + */ +struct rt_curve { + size_t count; /**< number of segments in this curve */ + int *reverse; /**< array of boolean flags indicating if + * segment should be reversed + */ + genptr_t *segment; /**< array of curve segment pointers */ +}; + + +/** * L I N E _ S E G, C A R C _ S E G, N U R B _ S E G * * used by the sketch and solid of extrusion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-08-17 02:36:40
|
Revision: 46188 http://brlcad.svn.sourceforge.net/brlcad/?rev=46188&view=rev Author: brlcad Date: 2011-08-17 02:36:34 +0000 (Wed, 17 Aug 2011) Log Message: ----------- oops, this file goes with r46187. move bbox to the end. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-08-17 02:35:44 UTC (rev 46187) +++ brlcad/trunk/include/raytrace.h 2011-08-17 02:36:34 UTC (rev 46188) @@ -2062,10 +2062,6 @@ const struct db_i * /*dbip*/, struct resource * /*resp*/); void (*ft_ifree)(struct rt_db_internal * /*ip*/); - /* Axis aligned bounding box */ - int (*ft_bbox)(struct rt_db_internal * /*ip*/, - point_t * /*min X, Y, Z of bounding RPP*/, - point_t * /*max X, Y, Z of bounding RPP*/); int (*ft_describe)(struct bu_vls * /*str*/, const struct rt_db_internal * /*ip*/, int /*verbose*/, @@ -2085,6 +2081,10 @@ void (*ft_make)(const struct rt_functab *, struct rt_db_internal * /*ip*/); int (*ft_params)(struct pc_pc_set *, const struct rt_db_internal * /*ip*/); + /* Axis aligned bounding box */ + int (*ft_bbox)(struct rt_db_internal * /*ip*/, + point_t * /*min X, Y, Z of bounding RPP*/, + point_t * /*max X, Y, Z of bounding RPP*/); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abh...@us...> - 2011-08-17 16:20:27
|
Revision: 46202 http://brlcad.svn.sourceforge.net/brlcad/?rev=46202&view=rev Author: abhi2011 Date: 2011-08-17 16:20:20 +0000 (Wed, 17 Aug 2011) Log Message: ----------- Updated declaration for the bb function as well Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-08-17 16:10:53 UTC (rev 46201) +++ brlcad/trunk/include/raytrace.h 2011-08-17 16:20:20 UTC (rev 46202) @@ -2590,8 +2590,8 @@ /* Find the bounding box given a struct rt_db_internal : bbox.c */ RT_EXPORT extern int rt_bound_internal(struct rt_db_internal *ip, - point_t *rpp_min, - point_t *rpp_max); + point_t rpp_min, + point_t rpp_max); /* cmd.c */ /* Read semi-colon terminated line */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <r_...@us...> - 2011-08-17 21:55:19
|
Revision: 46233 http://brlcad.svn.sourceforge.net/brlcad/?rev=46233&view=rev Author: r_weiss Date: 2011-08-17 21:55:12 +0000 (Wed, 17 Aug 2011) Log Message: ----------- Updated include file 'raytrace.h' to add the new function 'nmg_isect_2faceuse'. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-08-17 21:49:57 UTC (rev 46232) +++ brlcad/trunk/include/raytrace.h 2011-08-17 21:55:12 UTC (rev 46233) @@ -4862,6 +4862,11 @@ const uint32_t *assoc_use); RT_EXPORT extern void nmg_isect2d_cleanup(struct nmg_inter_struct *is); RT_EXPORT extern void nmg_isect2d_final_cleanup(); +RT_EXPORT extern int nmg_isect_2faceuse(point_t pt, + vect_t dir, + struct faceuse *fu1, + struct faceuse *fu2, + const struct bn_tol *tol); RT_EXPORT extern void nmg_isect_vert2p_face2p(struct nmg_inter_struct *is, struct vertexuse *vu1, struct faceuse *fu2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-09-01 00:54:55
|
Revision: 46519 http://brlcad.svn.sourceforge.net/brlcad/?rev=46519&view=rev Author: starseeker Date: 2011-09-01 00:54:48 +0000 (Thu, 01 Sep 2011) Log Message: ----------- fix the rt_bound_internal header definition Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-09-01 00:33:22 UTC (rev 46518) +++ brlcad/trunk/include/raytrace.h 2011-09-01 00:54:48 UTC (rev 46519) @@ -2605,9 +2605,10 @@ RT_EXPORT extern void rt_cut_clean(struct rt_i *rtip); /* Find the bounding box given a struct rt_db_internal : bbox.c */ -RT_EXPORT extern int rt_bound_internal(struct rt_db_internal *ip, - point_t rpp_min, - point_t rpp_max); +RT_EXPORT extern int rt_bound_internal(struct db_i *dbip, + struct directory *dp, + point_t rpp_min, + point_t rpp_max); /* cmd.c */ /* Read semi-colon terminated line */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-09-09 15:44:42
|
Revision: 46634 http://brlcad.svn.sourceforge.net/brlcad/?rev=46634&view=rev Author: brlcad Date: 2011-09-09 15:44:36 +0000 (Fri, 09 Sep 2011) Log Message: ----------- migrated command doc from impl to header for db_search_formplan() Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-09-09 15:44:03 UTC (rev 46633) +++ brlcad/trunk/include/raytrace.h 2011-09-09 15:44:36 UTC (rev 46634) @@ -2787,6 +2787,10 @@ RT_EXPORT extern void db_free_full_path_list(struct db_full_path_list *path_list); +/** + * process the command line and create a "plan" corresponding to the + * command arguments. + */ RT_EXPORT extern void *db_search_formplan(char **argv, struct db_i *dbip, struct rt_wdb *wdbp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <r_...@us...> - 2011-09-09 21:40:42
|
Revision: 46653 http://brlcad.svn.sourceforge.net/brlcad/?rev=46653&view=rev Author: r_weiss Date: 2011-09-09 21:40:35 +0000 (Fri, 09 Sep 2011) Log Message: ----------- Updated raytrace.h to turn on the prototype triangulation of nmg primitives. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2011-09-09 21:38:46 UTC (rev 46652) +++ brlcad/trunk/include/raytrace.h 2011-09-09 21:40:35 UTC (rev 46653) @@ -3725,10 +3725,8 @@ RT_EXPORT extern int nmg_kfu(struct faceuse *fu1); RT_EXPORT extern int nmg_klu(struct loopuse *lu1); RT_EXPORT extern int nmg_keu(struct edgeuse *eu); -#ifdef TRI_PROTOTYPE RT_EXPORT extern int nmg_keu_zl(struct shell *s, const struct bn_tol *tol); -#endif RT_EXPORT extern int nmg_ks(struct shell *s); RT_EXPORT extern int nmg_kr(struct nmgregion *r); RT_EXPORT extern void nmg_km(struct model *m); @@ -4375,9 +4373,7 @@ const struct bn_tol *tol); RT_EXPORT extern void nmg_triangulate_fu(struct faceuse *fu, const struct bn_tol *tol); -#ifdef TRI_PROTOTYPE RT_EXPORT extern void nmg_dump_model(struct model *m); -#endif /* nmg_tri_mc.c */ RT_EXPORT extern void nmg_triangulate_model_mc(struct model *m, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bo...@us...> - 2012-01-12 16:45:18
|
Revision: 48520 http://brlcad.svn.sourceforge.net/brlcad/?rev=48520&view=rev Author: bob1961 Date: 2012-01-12 16:45:11 +0000 (Thu, 12 Jan 2012) Log Message: ----------- Added RT_CURVATURE_INIT_ZERO. Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2012-01-12 16:37:45 UTC (rev 48519) +++ brlcad/trunk/include/raytrace.h 2012-01-12 16:45:11 UTC (rev 48520) @@ -343,6 +343,7 @@ fastf_t crv_c2; /**< @brief curvature in other direction */ }; #define CURVE_NULL ((struct curvature *)0) +#define RT_CURVATURE_INIT_ZERO { VINIT_ZERO, 0.0, 0.0 }; /** * Use this macro after having computed the normal, to compute the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tbr...@us...> - 2012-01-15 19:46:15
|
Revision: 48861 http://brlcad.svn.sourceforge.net/brlcad/?rev=48861&view=rev Author: tbrowder2 Date: 2012-01-15 19:46:08 +0000 (Sun, 15 Jan 2012) Log Message: ----------- correct typo Modified Paths: -------------- brlcad/trunk/include/raytrace.h Modified: brlcad/trunk/include/raytrace.h =================================================================== --- brlcad/trunk/include/raytrace.h 2012-01-15 18:46:49 UTC (rev 48860) +++ brlcad/trunk/include/raytrace.h 2012-01-15 19:46:08 UTC (rev 48861) @@ -63,7 +63,7 @@ /** * D E B U G * - * Each type of debugging support is independently controled, by a + * Each type of debugging support is independently controlled, by a * separate bit in the word RT_G_DEBUG * * For programs based on the "RT" program, these flags follow the "-x" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |