[brlcad-commits] SF.net SVN: brlcad:[36267] brlcad/trunk/src/libtclcad/ged_obj.c
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2009-10-28 17:17:18
|
Revision: 36267 http://brlcad.svn.sourceforge.net/brlcad/?rev=36267&view=rev Author: brlcad Date: 2009-10-28 17:17:08 +0000 (Wed, 28 Oct 2009) Log Message: ----------- mass cleanup, reformat, header/decl cleanup to (hopefully) not require x11/tk to compile. remove seemingly unused dg.h header. Modified Paths: -------------- brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libtclcad/ged_obj.c =================================================================== --- brlcad/trunk/src/libtclcad/ged_obj.c 2009-10-28 16:34:16 UTC (rev 36266) +++ brlcad/trunk/src/libtclcad/ged_obj.c 2009-10-28 17:17:08 UTC (rev 36267) @@ -23,8 +23,8 @@ * * A quasi-object-oriented database interface. * - * A GED object contains the attributes and methods for - * controlling a BRL-CAD geometry edit object. + * A GED object contains the attributes and methods for controlling a + * BRL-CAD geometry edit object. * */ /** @} */ @@ -56,481 +56,479 @@ #include "solid.h" #include "dm.h" -#include "dm_xvars.h" -#if defined(DM_X) || defined(DM_TK) +#ifdef DM_X # include "tk.h" # include <X11/Xutil.h> -#endif /* DM_X or DM_TK*/ - -#ifdef DM_X +# include "dm_xvars.h" # include "dm-X.h" #endif /* DM_X */ #ifdef DM_TK +# include "tk.h" +# include <X11/Xutil.h> +# include "dm_xvars.h" # include "dm-tk.h" #endif /* DM_TK */ #ifdef DM_OGL +# include "dm_xvars.h" # include "dm-ogl.h" #endif /* DM_OGL */ #ifdef DM_WGL # include <tkwinport.h> +# include "dm_xvars.h" # include "dm-wgl.h" #endif /* DM_WGL */ -#if 1 -/*XXX Temporary */ -#include "dg.h" -#endif static int go_open_tcl(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv); -static int go_autoview(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_base2local(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_bg(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_blast(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_bounds(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_configure(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_constrain_rmode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_constrain_tmode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -int go_copy(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_init_view_bindings(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_delete_view(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_faceplate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_idle_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_light(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_list_views(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_listen(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_local2base(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_make(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mirror(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_model_axes(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_more_args_callback(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_constrain_rot(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_constrain_trans(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_move_arb_edge(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_move_arb_face(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_orotate(struct ged *gedp, - int argc, - const char *argv[], +static int go_autoview(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_base2local(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_bg(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_blast(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_bounds(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_configure(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_constrain_rmode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_constrain_tmode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +int go_copy(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_init_view_bindings(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_delete_view(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_faceplate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_idle_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_light(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_list_views(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_listen(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_local2base(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_make(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mirror(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_model_axes(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_more_args_callback(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_constrain_rot(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_constrain_trans(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_move_arb_edge(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_move_arb_face(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_orotate(struct ged *gedp, + int argc, + const char *argv[], ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_oscale(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_otranslate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_translate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_ray(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_rot(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_rotate_arb_face(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_scale(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_protate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_pscale(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_ptranslate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_mouse_trans(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_move_arb_edge_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_move_arb_face_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_new_view(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_orotate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_oscale_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_otranslate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_paint_rect_area(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); + const char *usage, + int maxargs); +static int go_mouse_oscale(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_otranslate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_translate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_ray(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_rot(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_rotate_arb_face(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_scale(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_protate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_pscale(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_ptranslate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_mouse_trans(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_move_arb_edge_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_move_arb_face_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_new_view(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_orotate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_oscale_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_otranslate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_paint_rect_area(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); #if defined(DM_OGL) || defined(DM_WGL) -static int go_png(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); +static int go_png(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); #endif -static int go_prim_label(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_refresh(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_refresh_all(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_rotate_arb_face_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_rotate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_rt_gettrees(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_protate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_pscale_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_ptranslate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_scale_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_screen2model(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_screen2view(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_set_coord(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_set_fb_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_translate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_transparency(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_view_axes(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_view_win_size(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_vmake(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_vslew(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_zbuffer(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_zclip(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); +static int go_prim_label(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_refresh(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_refresh_all(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_rotate_arb_face_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_rotate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_rt_gettrees(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_protate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_pscale_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_ptranslate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_scale_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_screen2model(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_screen2view(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_set_coord(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_set_fb_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_translate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_transparency(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_view_axes(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_view_win_size(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_vmake(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_vslew(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_zbuffer(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_zclip(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); /* Wrapper Functions */ -static int go_autoview_func(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_edit_redraw_func(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_more_args_func(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_pass_through_func(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_pass_through_and_refresh_func(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); -static int go_view_func(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs); +static int go_autoview_func(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_edit_redraw_func(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_more_args_func(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_pass_through_func(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_pass_through_and_refresh_func(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); +static int go_view_func(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs); /* Utility Functions */ static void go_drawSolid(struct dm *dmp, struct solid *sp); @@ -559,10 +557,10 @@ #define GO_MAX_RT_ARGS 64 struct go_cmdtab { - char *go_name; - char *go_usage; - int go_maxargs; - go_wrapper_func_ptr go_wrapper_func; + char *go_name; + char *go_usage; + int go_maxargs; + go_wrapper_func_ptr go_wrapper_func; ged_func_ptr go_func; }; @@ -878,31 +876,27 @@ } /** - * G O _ C M D - *@brief + * G O _ C M D + * + * @brief * Generic interface for database commands. * * @par Usage: - * procname cmd ?args? + * procname cmd ?args? * * @return result of ged command. */ static int -go_cmd(ClientData clientData, - Tcl_Interp *interp, - int argc, - char **argv) +go_cmd(ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv) { register struct go_cmdtab *ctp; struct ged_obj *gop = (struct ged_obj *)clientData; Tcl_DString ds; int ret; -#if 0 - char flags[128]; - GED_CHECK_OBJ(gop); -#endif - Tcl_DStringInit(&ds); if (argc < 2) { @@ -998,9 +992,9 @@ * */ int -go_create_cmd(Tcl_Interp *interp, - struct ged_obj *gop, /* pointer to object */ - const char *oname) /* object name */ +go_create_cmd(Tcl_Interp *interp, + struct ged_obj *gop, /* pointer to object */ + const char *oname) /* object name */ { if (gop == GED_OBJ_NULL) { Tcl_AppendResult(interp, "go_create_cmd ", oname, " failed", NULL); @@ -1018,64 +1012,35 @@ return TCL_OK; } -#if 0 -/** - * @brief - * Create an command/object named "oname" in "interp" using "gop" as - * its state. It is presumed that the gop has already been opened. - */ -int -go_init_obj(Tcl_Interp *interp, - struct ged_obj *gop, /* pointer to object */ - const char *oname) /* object name */ -{ - if (gop == GED_OBJ_NULL) { - Tcl_AppendResult(interp, "ged_init_obj ", oname, " failed (ged_init_obj)", NULL); - return TCL_ERROR; - } - /* initialize ged_obj */ - bu_vls_init(&gop->go_name); - bu_vls_strcpy(&gop->go_name, oname); - bu_vls_init(&gop->go_more_args_callback); - - BU_LIST_INIT(&gop->go_observers.l); - gop->go_interp = interp; - - /* append to list of ged_obj */ - BU_LIST_APPEND(&HeadGedObj.l, &gop->l); - - return TCL_OK; -} -#endif - /** - * G E D _ O P E N _ T C L - *@brief - * A TCL interface to wdb_fopen() and wdb_dbopen(). + * G E D _ O P E N _ T C L * - * @par Implicit return - - * Creates a new TCL proc which responds to get/put/etc. arguments - * when invoked. clientData of that proc will be ged_obj pointer - * for this instance of the database. - * Easily allows keeping track of multiple databases. + * @brief + * A TCL interface to wdb_fopen() and wdb_dbopen(). * - * @return wdb pointer, for more traditional C-style interfacing. + * @par Implicit return - + * Creates a new TCL proc which responds to get/put/etc. arguments + * when invoked. clientData of that proc will be ged_obj pointer for + * this instance of the database. Easily allows keeping track of + * multiple databases. * - * @par Example - - * set gop [go_open .inmem inmem $dbip] + * @return wdb pointer, for more traditional C-style interfacing. + * + * @par Example - + * set gop [go_open .inmem inmem $dbip] *@n .inmem get box.s *@n .inmem close * - *@n go_open db file "bob.g" - *@n db get white.r - *@n db close + *@n go_open db file "bob.g" + *@n db get white.r + *@n db close */ static int -go_open_tcl(ClientData clientData, - Tcl_Interp *interp, - int argc, - const char **argv) +go_open_tcl(ClientData clientData, + Tcl_Interp *interp, + int argc, + const char **argv) { struct ged_obj *gop; struct ged *gedp; @@ -1135,12 +1100,12 @@ /*************************** Local Command Functions ***************************/ static int -go_autoview(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_autoview(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -1168,12 +1133,12 @@ } static int -go_base2local(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_base2local(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { /* initialize result */ bu_vls_trunc(&gedp->ged_result_str, 0); @@ -1184,12 +1149,12 @@ } static int -go_bg(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_bg(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int r, g, b; struct ged_dm_view *gdvp; @@ -1248,18 +1213,18 @@ return BRLCAD_OK; -bad_color: + bad_color: bu_vls_printf(&gedp->ged_result_str, "%s: %s %s %s", argv[0], argv[2], argv[3], argv[4]); return BRLCAD_ERROR; } static int -go_blast(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_blast(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; @@ -1274,12 +1239,12 @@ } static int -go_bounds(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_bounds(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { vect_t clipmin; vect_t clipmax; @@ -1334,10 +1299,9 @@ VMOVE(gdvp->gdv_dmp->dm_clipmax, clipmax); /* - * Since dm_bound doesn't appear to be used anywhere, - * I'm going to use it for controlling the location - * of the zclipping plane in dm-ogl.c. dm-X.c uses - * dm_clipmin and dm_clipmax. + * Since dm_bound doesn't appear to be used anywhere, I'm going to + * use it for controlling the location of the zclipping plane in + * dm-ogl.c. dm-X.c uses dm_clipmin and dm_clipmax. */ if (gdvp->gdv_dmp->dm_clipmax[2] <= GED_MAX) gdvp->gdv_dmp->dm_bound = 1.0; @@ -1348,15 +1312,15 @@ } static int -go_configure(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_configure(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; - int status; + int status; /* initialize result */ bu_vls_trunc(&gedp->ged_result_str, 0); @@ -1412,12 +1376,12 @@ } static int -go_constrain_rmode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_constrain_rmode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -1477,12 +1441,12 @@ } static int -go_constrain_tmode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_constrain_tmode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -1542,12 +1506,12 @@ } int -go_copy(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_copy(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged *from_gedp = GED_NULL; struct ged *to_gedp = GED_NULL; @@ -1864,12 +1828,12 @@ } static int -go_init_view_bindings(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_init_view_bindings(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -1903,12 +1867,12 @@ } static int -go_delete_view(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_delete_view(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -1942,12 +1906,12 @@ } static int -go_faceplate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_faceplate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int i; struct ged_dm_view *gdvp; @@ -2134,18 +2098,18 @@ goto bad; } - bad: + bad: bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); return BRLCAD_ERROR; } static int -go_idle_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_idle_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct bu_vls bindings; struct ged_dm_view *gdvp; @@ -2199,12 +2163,12 @@ } static int -go_light(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_light(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int light; struct ged_dm_view *gdvp; @@ -2257,12 +2221,12 @@ } static int -go_list_views(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_list_views(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -2281,12 +2245,12 @@ } static int -go_listen(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_listen(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -2347,12 +2311,12 @@ } static int -go_local2base(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_local2base(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { /* initialize result */ bu_vls_trunc(&gedp->ged_result_str, 0); @@ -2363,12 +2327,12 @@ } static int -go_make(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_make(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[3]; @@ -2386,12 +2350,12 @@ } static int -go_mirror(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mirror(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[3]; @@ -2409,12 +2373,12 @@ } static int -go_axes(struct ged *gedp, - struct ged_dm_view *gdvp, - struct ged_axes_state *gasp, - int argc, - const char *argv[], - const char *usage) +go_axes(struct ged *gedp, + struct ged_dm_view *gdvp, + struct ged_axes_state *gasp, + int argc, + const char *argv[], + const char *usage) { if (strcmp(argv[2], "draw") == 0) { @@ -2811,18 +2775,18 @@ goto bad; } - bad: + bad: bu_vls_printf(&gedp->ged_result_str, "Usage: %s %s", argv[0], usage); return BRLCAD_ERROR; } static int -go_model_axes(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_model_axes(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -2854,12 +2818,12 @@ } static int -go_more_args_callback(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_more_args_callback(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { register int i; @@ -2882,12 +2846,12 @@ } static int -go_mouse_constrain_rot(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_constrain_rot(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; int ac; @@ -2959,12 +2923,12 @@ bu_vls_init(&rot_vls); switch (argv[2][0]) { - case 'x': - bu_vls_printf(&rot_vls, "%lf 0 0", sf); - case 'y': - bu_vls_printf(&rot_vls, "0 %lf 0", sf); - case 'z': - bu_vls_printf(&rot_vls, "0 0 %lf", sf); + case 'x': + bu_vls_printf(&rot_vls, "%lf 0 0", sf); + case 'y': + bu_vls_printf(&rot_vls, "0 %lf 0", sf); + case 'z': + bu_vls_printf(&rot_vls, "0 0 %lf", sf); } gedp->ged_gvp = gdvp->gdv_view; @@ -2983,12 +2947,12 @@ } static int -go_mouse_constrain_trans(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_constrain_trans(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; int ac; @@ -3062,12 +3026,12 @@ bu_vls_init(&tran_vls); switch (argv[2][0]) { - case 'x': - bu_vls_printf(&tran_vls, "%lf 0 0", sf); - case 'y': - bu_vls_printf(&tran_vls, "0 %lf 0", sf); - case 'z': - bu_vls_printf(&tran_vls, "0 0 %lf", sf); + case 'x': + bu_vls_printf(&tran_vls, "%lf 0 0", sf); + case 'y': + bu_vls_printf(&tran_vls, "0 %lf 0", sf); + case 'z': + bu_vls_printf(&tran_vls, "0 0 %lf", sf); } gedp->ged_gvp = gdvp->gdv_view; @@ -3086,12 +3050,12 @@ } static int -go_mouse_move_arb_edge(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_move_arb_edge(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -3183,12 +3147,12 @@ } static int -go_mouse_move_arb_face(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_move_arb_face(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -3280,12 +3244,12 @@ } static int -go_mouse_orotate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_orotate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -3383,12 +3347,12 @@ } static int -go_mouse_oscale(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_oscale(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -3450,9 +3414,9 @@ dy *= inv_width * gdvp->gdv_view->gv_sscale; if (fabs(dx) < fabs(dy)) - sf = 1.0 + dy; + sf = 1.0 + dy; else - sf = 1.0 + dx; + sf = 1.0 + dx; bu_vls_init(&sf_vls); bu_vls_printf(&sf_vls, "%lf", sf); @@ -3477,12 +3441,12 @@ } static int -go_mouse_otranslate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_otranslate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -3582,12 +3546,12 @@ } static int -go_mouse_ray(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_ray(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { #if 0 int ret; @@ -3649,9 +3613,9 @@ av[2] = "-i"; av[3] = "-u"; - ... + ... - av[n] = (char *)0; + av[n] = (char *)0; } #endif @@ -3663,12 +3627,12 @@ } static int -go_mouse_rot(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_rot(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; int ac; @@ -3747,12 +3711,12 @@ } static int -go_mouse_rotate_arb_face(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_rotate_arb_face(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -3842,12 +3806,12 @@ } static int -go_mouse_scale(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_scale(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[3]; @@ -3931,12 +3895,12 @@ } static int -go_mouse_protate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_protate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -4025,12 +3989,12 @@ } static int -go_mouse_pscale(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_pscale(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -4092,9 +4056,9 @@ dy *= inv_width * gdvp->gdv_view->gv_sscale; if (fabs(dx) < fabs(dy)) - sf = 1.0 + dy; + sf = 1.0 + dy; else - sf = 1.0 + dx; + sf = 1.0 + dx; bu_vls_init(&sf_vls); bu_vls_printf(&sf_vls, "%lf", sf); @@ -4121,12 +4085,12 @@ } static int -go_mouse_ptranslate(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_ptranslate(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; char *av[6]; @@ -4218,12 +4182,12 @@ } static int -go_mouse_trans(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_mouse_trans(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { int ret; int ac; @@ -4304,21 +4268,21 @@ } static int -go_view_cmd(ClientData clientData, - Tcl_Interp *interp, - int argc, - char **argv) +go_view_cmd(ClientData clientData, + Tcl_Interp *interp, + int argc, + char **argv) { return TCL_OK; } static int -go_move_arb_edge_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_move_arb_edge_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -4372,12 +4336,12 @@ } static int -go_move_arb_face_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_move_arb_face_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -4431,12 +4395,12 @@ } static int -go_new_view(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_new_view(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *new_gdvp = BU_LIST_LAST(ged_dm_view, &go_current_gop->go_head_views.l); static const int name_index = 1; @@ -4562,12 +4526,12 @@ } static int -go_orotate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_orotate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -4620,12 +4584,12 @@ } static int -go_oscale_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_oscale_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -4678,12 +4642,12 @@ } static int -go_otranslate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_otranslate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -4736,12 +4700,12 @@ } static int -go_paint_rect_area(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_paint_rect_area(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -4777,12 +4741,12 @@ #if defined(DM_OGL) || defined(DM_WGL) static int -go_png(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_png(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; FILE *fp; @@ -4843,24 +4807,24 @@ return GED_ERROR; } -#if defined(DM_WGL) - if (gdvp->gdv_dmp->dm_type == DM_TYPE_WGL) { -#else - if (gdvp->gdv_dmp->dm_type == DM_TYPE_OGL) { -#endif + if (gdvp->gdv_dmp->dm_type == DM_TYPE_WGL || gdvp->gdv_dmp->dm_type == DM_TYPE_OGL) { + int make_ret = 0; found_valid_dm = 1; width = gdvp->gdv_dmp->dm_width; height = gdvp->gdv_dmp->dm_height; bytes_per_pixel = sizeof(GLuint); #if defined(DM_WGL) - if (!wglMakeCurrent(((struct dm_xvars *)gdvp->gdv_dmp->dm_vars.pub_vars)->hdc, - ((struct wgl_vars *)gdvp->gdv_dmp->dm_vars.priv_vars)->glxc)) { + make_ret = wglMakeCurrent(((struct dm_xvars *)gdvp->gdv_dmp->dm_vars.pub_vars)->hdc, + ((struct wgl_vars *)gdvp->gdv_dmp->dm_vars.priv_vars)->glxc); #else - if (!glXMakeCurrent(((struct dm_xvars *)gdvp->gdv_dmp->dm_vars.pub_vars)->dpy, - ((struct dm_xvars *)gdvp->gdv_dmp->dm_vars.pub_vars)->win, - ((struct ogl_vars *)gdvp->gdv_dmp->dm_vars.priv_vars)->glxc)) { +# if defined(DM_OGL) + make_ret = glXMakeCurrent(((struct dm_xvars *)gdvp->gdv_dmp->dm_vars.pub_vars)->dpy, + ((struct dm_xvars *)gdvp->gdv_dmp->dm_vars.pub_vars)->win, + ((struct ogl_vars *)gdvp->gdv_dmp->dm_vars.priv_vars)->glxc); +# endif #endif + if (!make_ret) { bu_vls_printf(&gedp->ged_result_str, "%s: Couldn't make context current\n", argv[0]); fclose(fp); return GED_ERROR; @@ -4874,7 +4838,7 @@ unsigned int green_mask = 0x00ff0000; unsigned int blue_mask = 0x0000ff00; unsigned int alpha_mask = 0x000000ff; - int big_endian; + int big_endian, swap_bytes; int bytes_per_line = gdvp->gdv_dmp->dm_width * bytes_per_pixel; GLuint *pixels = bu_calloc(width * height, bytes_per_pixel, "pixels"); @@ -4883,10 +4847,18 @@ else big_endian = 0; +#if defined(DM_WGL) + /* WTF */ + swap_bytes = !big_endian; +#else + swap_bytes = big_endian; +#endif + glReadBuffer(GL_FRONT); #if defined(DM_WGL) - /*XXX GL_UNSIGNED_INT_8_8_8_8 is currently not available on windows. - * Need to update when it becomes available. + /* XXX GL_UNSIGNED_INT_8_8_8_8 is currently not + * available on windows. Need to update when it + * becomes available. */ glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); #else @@ -4917,11 +4889,7 @@ *dbyte2 = (pixel & blue_mask) >> 8; *dbyte3 = pixel & alpha_mask; -#if defined(DM_WGL) - if (!big_endian) { -#else - if (big_endian) { -#endif + if (swap_bytes) { unsigned char tmp_byte; /* swap byte1 and byte2 */ @@ -4968,28 +4936,18 @@ #endif static int -go_prim_label(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_prim_label(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { register int i; /* initialize result */ bu_vls_trunc(&gedp->ged_result_str, 0); -#if 0 - /* Get the list of primitives scheduled for labeling */ - if (argc == 1) { - for (i = 0; i < go_current_gop->go_prim_label_list_size; ++i) - bu_vls_printf(&gedp->ged_result_str, "%s ", bu_vls_addr(&go_current_gop->go_prim_label_list[i])); - - return BRLCAD_OK; - } -#endif - /* Free the previous list of primitives scheduled for labeling */ if (go_current_gop->go_prim_label_list_size) { for (i = 0; i < go_current_gop->go_prim_label_list_size; ++i) @@ -5014,12 +4972,12 @@ } static int -go_refresh(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_refresh(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { struct ged_dm_view *gdvp; @@ -5037,10 +4995,6 @@ return BRLCAD_ERROR; } -#if 0 - GED_CHECK_DRAWABLE(gedp, BRLCAD_ERROR); -#endif - for (BU_LIST_FOR(gdvp, ged_dm_view, &go_current_gop->go_head_views.l)) { if (!strcmp(bu_vls_addr(&gdvp->gdv_name), argv[1])) break; @@ -5057,12 +5011,12 @@ } static int -go_refresh_all(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_refresh_all(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { if (argc != 1) { bu_vls_printf(&gedp->ged_result_str, "Usage: %s", argv[0]); @@ -5075,12 +5029,12 @@ } static int -go_rotate_arb_face_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_rotate_arb_face_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -5135,12 +5089,12 @@ } static int -go_rotate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_rotate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -5192,15 +5146,16 @@ } /** - * GO _ D E L E T E P R O C _ R T + * GO _ D E L E T E P R O C _ R T + * *@brief - * Called when the named proc created by rt_gettrees() is destroyed. + * Called when the named proc created by rt_gettrees() is destroyed. */ static void go_deleteProc_rt(ClientData clientData) { - struct application *ap = (struct application *)clientData; - struct rt_i *rtip; + struct application *ap = (struct application *)clientData; + struct rt_i *rtip; RT_AP_CHECK(ap); rtip = ap->a_rt_i; @@ -5209,32 +5164,32 @@ rt_free_rti(rtip); ap->a_rt_i = (struct rt_i *)NULL; - bu_free( (genptr_t)ap, "struct application" ); + bu_free((genptr_t)ap, "struct application"); } /** - * G O _ R T _ G E T T R E E S - *@brief - * Given an instance of a database and the name of some treetops, - * create a named "ray-tracing" object (proc) which will respond to - * subsequent operations. - * Returns new proc name as result. + * G O _ R T _ G E T T R E E S * + * @brief + * Given an instance of a database and the name of some treetops, + * create a named "ray-tracing" object (proc) which will respond to + * subsequent operations. Returns new proc name as result. + * * @par Example: * .inmem rt_gettrees .rt all.g light.r */ int -go_rt_gettrees(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_rt_gettrees(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { - struct rt_i *rtip; - struct application *ap; - struct resource *resp; - char *newprocname; + struct rt_i *rtip; + struct application *ap; + struct resource *resp; + char *newprocname; /* initialize result */ bu_vls_trunc(&gedp->ged_result_str, 0); @@ -5257,7 +5212,7 @@ (void)Tcl_DeleteCommand(go_current_gop->go_interp, newprocname); while (argv[2][0] == '-') { - if (strcmp( argv[2], "-i") == 0) { + if (strcmp(argv[2], "-i") == 0) { rtip->rti_dont_instance = 1; argc--; argv++; @@ -5282,17 +5237,17 @@ rtip->rti_hasty_prep = 1; /* Tcl isn't going to fire many rays */ /* - * In case of multiple instances of the library, make sure that - * each instance has a separate resource structure, - * because the bit vector lengths depend on # of solids. - * And the "overwrite" sequence in Tcl is to create the new - * proc before running the Tcl_CmdDeleteProc on the old one, - * which in this case would trash rt_uniresource. - * Once on the rti_resources list, rt_clean() will clean 'em up. + * In case of multiple instances of the library, make sure that + * each instance has a separate resource structure, because the + * bit vector lengths depend on # of solids. And the "overwrite" + * sequence in Tcl is to create the new proc before running the + * Tcl_CmdDeleteProc on the old one, which in this case would + * trash rt_uniresource. Once on the rti_resources list, + * rt_clean() will clean 'em up. */ BU_GETSTRUCT(resp, resource); rt_init_resource(resp, 0, rtip); - BU_ASSERT_PTR( BU_PTBL_GET(&rtip->rti_resources, 0), !=, NULL ); + BU_ASSERT_PTR(BU_PTBL_GET(&rtip->rti_resources, 0), !=, NULL); ap = (struct application *)bu_malloc(sizeof(struct application), "go_rt_gettrees: ap"); RT_APPLICATION_INIT(ap); @@ -5315,12 +5270,12 @@ } static int -go_protate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_protate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -5374,12 +5329,12 @@ } static int -go_pscale_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_pscale_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -5433,12 +5388,12 @@ } static int -go_ptranslate_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_ptranslate_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -5492,12 +5447,12 @@ } static int -go_scale_mode(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_scale_mode(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs) { fastf_t x, y; struct bu_vls bindings; @@ -5549,12 +5504,12 @@ } static int -go_screen2model(struct ged *gedp, - int argc, - const char *argv[], - ged_func_ptr func, - const char *usage, - int maxargs) +go_screen2model(struct ged *gedp, + int argc, + const char *argv[], + ged_func_ptr func, + const char *usage, + int maxargs... [truncated message content] |