Revision: 49147 http://brlcad.svn.sourceforge.net/brlcad/?rev=49147&view=rev Author: bob1961 Date: 2012-01-30 22:57:19 +0000 (Mon, 30 Jan 2012) Log Message: ----------- Moved struct ged_dm_view and struct ged_obj to tclcad.h. Moved declaration of go_refresh() and go_refresh_draw() to tclcad.h. Added ged_create_dlist_callback and ged_free_dlist_callback to struct ged.
Modified Paths: -------------- brlcad/trunk/include/ged.h brlcad/trunk/include/obj.h brlcad/trunk/include/tclcad.h Modified: brlcad/trunk/include/ged.h =================================================================== --- brlcad/trunk/include/ged.h 2012-01-30 22:37:01 UTC (rev 49146) +++ brlcad/trunk/include/ged.h 2012-01-30 22:57:19 UTC (rev 49147) @@ -82,6 +82,8 @@ #define GED_FUNC_PTR_NULL ((ged_func_ptr)0) #define GED_REFRESH_CALLBACK_PTR_NULL ((ged_refresh_callback_ptr)0) +#define GED_CREATE_VLIST_CALLBACK_PTR_NULL ((ged_create_vlist_callback_ptr)0) +#define GED_FREE_VLIST_CALLBACK_PTR_NULL ((ged_free_vlist_callback_ptr)0) /** * S E M A P H O R E S @@ -547,6 +549,8 @@ void (*ged_refresh_handler)(); /**< @brief function for handling refresh requests */ void (*ged_output_handler)(); /**< @brief function for handling output */ char *ged_output_script; /**< @brief script for use by the outputHandler */ + void (*ged_create_vlist_callback)(); /**< @brief function to call after creating a vlist */ + void (*ged_free_vlist_callback)(); /**< @brief function to call after freeing a vlist */ /* FIXME -- this ugly hack needs to die. the result string should be stored before the call. */ int ged_internal_call; @@ -560,6 +564,8 @@ typedef int (*ged_func_ptr)(struct ged *, int, const char *[]); typedef void (*ged_refresh_callback_ptr)(void *); +typedef void (*ged_create_vlist_callback_ptr)(struct solid *); +typedef void (*ged_free_vlist_callback_ptr)(unsigned int, int); /** @@ -578,19 +584,6 @@ }; -/* FIXME: this shouldn't be part of libged API (libged shouldn't know - * about libdm or libfb types, should be managed through callbacks). - */ -struct ged_dm_view { - struct bu_list l; - struct bu_vls gdv_callback; - struct bu_vls gdv_name; - struct ged_view *gdv_view; - struct dm *gdv_dmp; - struct fbserv_obj gdv_fbs; /* FIXME: this shouldn't be here */ - struct ged_obj *gdv_gop; /* FIXME: this shouldn't be here */ -}; - /* defined in adc.c */ GED_EXPORT extern void ged_calc_adc_pos(struct ged_view *gvp); GED_EXPORT extern void ged_calc_adc_a1(struct ged_view *gvp); Modified: brlcad/trunk/include/obj.h =================================================================== --- brlcad/trunk/include/obj.h 2012-01-30 22:37:01 UTC (rev 49146) +++ brlcad/trunk/include/obj.h 2012-01-30 22:57:19 UTC (rev 49147) @@ -69,21 +69,6 @@ }; #define GED_VIEW_OBJ_NULL ((struct view_obj *)0) -struct ged_obj { - struct ged *go_gedp; - struct ged_dm_view go_head_views; - struct bu_vls go_name; - struct bu_observer go_observers; - struct bu_vls go_more_args_callback; - struct bu_vls go_rt_end_callback; - struct bu_vls *go_prim_label_list; - int go_prim_label_list_size; - int go_refresh_on; - Tcl_Interp *interp; -}; -#define GED_OBJ_NULL ((struct ged_obj *)0) - - /* DEPRECATED * DEPRECATED * DEPRECATED * DEPRECATED * DEPRECATED * DEPRECATED * * DEPRECATED * * DEPRECATED * * DEPRECATED * Everything in this file should not be used. * DEPRECATED * @@ -104,13 +89,7 @@ GED_EXPORT extern int wdb_stub_cmd(struct rt_wdb *wdbp, int argc, const char *argv[]); GED_EXPORT extern int wdb_rt_gettrees_cmd(struct rt_wdb *wdbp, int argc, const char *argv[]); -/* go_refresh.c */ -GED_EXPORT extern void go_refresh(struct ged_obj *gop, - struct ged_dm_view *gdvp); -GED_EXPORT extern void go_refresh_draw(struct ged_obj *gop, - struct ged_dm_view *gdvp); - __END_DECLS #endif /* __GED_H__ */ Modified: brlcad/trunk/include/tclcad.h =================================================================== --- brlcad/trunk/include/tclcad.h 2012-01-30 22:37:01 UTC (rev 49146) +++ brlcad/trunk/include/tclcad.h 2012-01-30 22:57:19 UTC (rev 49147) @@ -81,6 +81,31 @@ #define TCLCAD_OBJ_FB_MODE_INTERLAY 2 #define TCLCAD_OBJ_FB_MODE_OVERLAY 3 +struct ged_dm_view { + struct bu_list l; + struct bu_vls gdv_callback; + struct bu_vls gdv_name; + struct ged_view *gdv_view; + struct dm *gdv_dmp; + struct fbserv_obj gdv_fbs; + struct ged_obj *gdv_gop; +}; + +struct ged_obj { + struct ged *go_gedp; + struct ged_dm_view go_head_views; + struct bu_vls go_name; + struct bu_observer go_observers; + struct bu_vls go_more_args_callback; + struct bu_vls go_rt_end_callback; + struct bu_vls *go_prim_label_list; + int go_prim_label_list_size; + int go_refresh_on; + Tcl_Interp *interp; +}; +#define GED_OBJ_NULL ((struct ged_obj *)0) + + struct tclcad_obj { struct bu_list l; struct ged_obj *to_gop; @@ -103,6 +128,10 @@ TCLCAD_EXPORT extern struct application *to_rt_gettrees_application(struct ged *gedp, int argc, const char *argv[]); +TCLCAD_EXPORT extern void go_refresh(struct ged_obj *gop, + struct ged_dm_view *gdvp); +TCLCAD_EXPORT extern void go_refresh_draw(struct ged_obj *gop, + struct ged_dm_view *gdvp); /* defined in cmdhist_obj.c */ TCLCAD_EXPORT extern int Cho_Init(Tcl_Interp *interp); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits