[brlcad-commits] SF.net SVN: brlcad:[54087] brlcad/trunk/src/tclscripts/archer/ SketchEditFrame.tcl
Revision: 54087
http://brlcad.svn.sourceforge.net/brlcad/?rev=54087view=rev
Author: bob1961
Date: 2012-12-19 13:12:03 + (Wed, 19 Dec 2012)
Log Message:
---
Copious mods to streamline the workflow in Archer's sketch editor. More to
follow.
Modified Paths:
--
brlcad/trunk/src/tclscripts/archer/SketchEditFrame.tcl
Modified: brlcad/trunk/src/tclscripts/archer/SketchEditFrame.tcl
===
--- brlcad/trunk/src/tclscripts/archer/SketchEditFrame.tcl 2012-12-18
21:06:18 UTC (rev 54086)
+++ brlcad/trunk/src/tclscripts/archer/SketchEditFrame.tcl 2012-12-19
13:12:03 UTC (rev 54087)
@@ -94,6 +94,9 @@
variable SL {}
variable mPickTol 11
+ variable mLastIndex -1
+ variable mEscapeCreate 1
+ variable mCallingFromEndBezier 0
variable myscale 1.0
variable vert_radius 3
variable tobase 1.0
@@ -162,8 +165,12 @@
method create_line {}
method end_arc {_mx _my}
method end_arc_radius_adjust {_segment _mx _my}
- method end_bezier {_segment}
+ method end_bezier {_segment _cflag}
+ method escape_arc {}
+ method escape_bezier {_segment}
+ method escape_line {}
method fix_vertex_references {_unused_vindices}
+ method handle_escape {}
method item_pick_highlight {_sx _sy}
method next_bezier {_segment _mx _my}
method pick_arbitrary {_mx _my}
@@ -180,7 +187,7 @@
method start_bezier {_x _y}
method start_circle {_coord_type _x _y}
method start_line {_x _y}
- method start_line_guts {}
+ method start_line_guts {{_mx } {_my }}
method start_move_arbitrary {_sx _sy _rflag}
method start_move_point {_sx _sy}
method start_move_segment {_sx _sy _rflag}
@@ -213,6 +220,9 @@
::canvas $parent.sketchcanvas
}
+bind $itk_component(canvas) Enter {::focus %W}
+bind $itk_component(canvas) Escape [::itcl::code $this handle_escape]
+
set tolocal [$::ArcherCore::application gedCmd base2local]
set tobase [expr {1.0 / $tolocal}]
}
@@ -314,6 +324,10 @@
createSegments
drawSegments
clear_canvas_bindings
+set mEscapeCreate 1
+set mEditMode 0
+set mPrevEditMode 0
+set mLastIndex -1
update idletasks
set canv_height [winfo height $itk_component(canvas)]
@@ -328,24 +342,6 @@
} else {
do_scale $tmp_scale2
}
-
-return
-
-loadTables $_gdata
-
-GeometryEditFrame::initGeometry $_gdata
-
-if {$itk_option(-geometryObject) != $itk_option(-prevGeometryObject)} {
- set mCurrentSketchPoints
- set mCurrentSketchEdges
- set mCurrentSketchFaces
- set itk_option(-prevGeometryObject) $itk_option(-geometryObject)
-
- $itk_component(edgeTab) unselectAllRows
- $itk_component(faceTab) unselectAllRows
-}
-
-selectCurrentSketchPoints
}
@@ -821,6 +817,12 @@
::itcl::body SketchEditFrame::clear_canvas_bindings {} {
+bind $itk_component(canvas) a [::itcl::code $this create_arc]
+bind $itk_component(canvas) b [::itcl::code $this create_bezier]
+bind $itk_component(canvas) c [::itcl::code $this create_circle]
+bind $itk_component(canvas) l [::itcl::code $this create_line]
+bind $itk_component(canvas) m [::itcl::code $this setup_move_arbitrary]
+
bind $itk_component(canvas) B1-Motion {}
bind $itk_component(canvas) ButtonPress-1 {}
bind $itk_component(canvas) Shift-ButtonPress-1 {}
@@ -932,7 +934,7 @@
set ex [expr {[$itk_component(canvas) canvasx $_mx] / $myscale}]
set ey [expr {-[$itk_component(canvas) canvasy $_my] / $myscale}]
- if {$_state == 2} {
+ if {$_state == 1} {
# need to create a new vertex
set index2 [llength $VL]
lappend VL $ex $ey
@@ -955,27 +957,10 @@
$_segment draw
$itk_component(canvas) configure -scrollregion [$itk_component(canvas)
bbox all]
-if {$_state == 1} {
+if {$_state == 2} {
$itk_component(canvas) configure -cursor crosshair
create_line
write_sketch_to_db
-} elseif {$_state == 3} {
- set vert [lindex $VL $index2]
- set ex [lindex $vert 0]
- set ey [lindex $vert 1]
-
- if {$_coord_type != 2} {
- # The new segment is using a new vertex for its start point
- set index1 [expr {[llength $VL] - 1}]
- } else {
- # The new segment is using an existing vertex for its start point
- set index1 $index2
- }
-
- set index2 $index1
-
- start_line_guts
- write_sketch_to_db
}
drawVertices
@@ -985,7 +970,7 @@
::itcl::body SketchEditFrame::continue_line_pick {_segment _state _mx _my} {
set index [pick_vertex $_mx $_my p$index2]
if {$index == -1} {
- if {$_state == 2} {
+ if {$_state == 1} {
[brlcad-commits] SF.net SVN: brlcad:[54088] brlcad/trunk/src/tclscripts/archer/ GeometryEditFrame.tcl
Revision: 54088 http://brlcad.svn.sourceforge.net/brlcad/?rev=54088view=rev Author: bob1961 Date: 2012-12-19 13:14:00 + (Wed, 19 Dec 2012) Log Message: --- Added a class variable to the GeometryEditFrame class (i.e., mPrevEditMode). Modified Paths: -- brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl Modified: brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl === --- brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl2012-12-19 13:12:03 UTC (rev 54087) +++ brlcad/trunk/src/tclscripts/archer/GeometryEditFrame.tcl2012-12-19 13:14:00 UTC (rev 54088) @@ -52,6 +52,7 @@ common EDIT_CLASS_TRANS 3 common mEditMode 0 + common mPrevEditMode 0 common mEditClass $EDIT_CLASS_NONE common mEditCommand common mEditParam1 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[54089] brlcad/trunk/TODO
Revision: 54089 http://brlcad.svn.sourceforge.net/brlcad/?rev=54089view=rev Author: brlcad Date: 2012-12-19 14:15:53 + (Wed, 19 Dec 2012) Log Message: --- making push stop at various levels rears its head once again. Modified Paths: -- brlcad/trunk/TODO Modified: brlcad/trunk/TODO === --- brlcad/trunk/TODO 2012-12-19 13:14:00 UTC (rev 54088) +++ brlcad/trunk/TODO 2012-12-19 14:15:53 UTC (rev 54089) @@ -42,6 +42,11 @@ THESE ARE UNSCHEDULED BACKLOG TASKS --- +* add option to push/xpush to stop at the region level, to stop before + primitives, to stop after N levels, to stop before N levels. + +* consolidate push/xpush together + * make rt_dirbuild()+rt_dirbuild() work without vomiting error messages about duplicate geometry. should be able to open the same database multiple times without running into rt_uniresource @@ -744,10 +749,6 @@ normals. Consider adding an option to smoothly interpolate normals (per face or vertex). -* add option to push/xpush to stop at the region level. - -* consolidate push/xpush together - * modify g_qa to search for 1 region flag in a tree path. * the binary windows installer is missing headers for our external This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[54090] brlcad/trunk
Revision: 54090 http://brlcad.svn.sourceforge.net/brlcad/?rev=54090view=rev Author: brlcad Date: 2012-12-19 20:29:40 + (Wed, 19 Dec 2012) Log Message: --- fix a slew of spelling mistake corrections from Gauravjeet Singh (http://www.google-melange.com/gci/task/view/google/gci2012/8033204), 20+ in 5+ files Modified Paths: -- brlcad/trunk/AUTHORS brlcad/trunk/ChangeLog brlcad/trunk/doc/TODO.BREP brlcad/trunk/doc/bison_to_lemon.txt brlcad/trunk/doc/docbook/books/README brlcad/trunk/doc/docbook/specifications/en/BRL_CAD_g_format_V5.xml brlcad/trunk/doc/docbook/system/man1/en/anim_script.xml brlcad/trunk/doc/history.txt brlcad/trunk/doc/html/ReleaseNotes/Rel5.0/new_cmds.html brlcad/trunk/doc/html/manuals/Anim_Tutorial/chapt3.html brlcad/trunk/src/conv/dbclean.sh brlcad/trunk/src/conv/iges/orient_loops.c brlcad/trunk/src/conv/obj-g.c brlcad/trunk/src/external/ProEngineer/proe_brl.res Modified: brlcad/trunk/AUTHORS === --- brlcad/trunk/AUTHORS2012-12-19 14:15:53 UTC (rev 54089) +++ brlcad/trunk/AUTHORS2012-12-19 20:29:40 UTC (rev 54090) @@ -639,10 +639,14 @@ Open Source (GCI) Keesing, Aaron -2102 December +2012 December Open Source (GCI) +Singh, Gauravjeet +2012 December +Open Source (GCI) + SPECIAL THANKS -- Modified: brlcad/trunk/ChangeLog === --- brlcad/trunk/ChangeLog 2012-12-19 14:15:53 UTC (rev 54089) +++ brlcad/trunk/ChangeLog 2012-12-19 20:29:40 UTC (rev 54090) @@ -48,7 +48,7 @@ parent doc for changed paths) added missing AUTHOR, COPYRIGHT, and BUG REPORTS sections - deleted any suprious, single quotation marks in header comments + deleted any spurious, single quotation marks in header comments corrected internal file names where needed ensured AUTHOR, COPYRIGHT, and BUG REPORTS sections are at the end @@ -188,7 +188,7 @@ parent doc for changed paths) added missing AUTHOR, COPYRIGHT, and BUG REPORTS sections - deleted any suprious, single quotation marks in header comments + deleted any spurious, single quotation marks in header comments corrected internal file names where needed ensured AUTHOR, COPYRIGHT, and BUG REPORTS sections are at the end Modified: brlcad/trunk/doc/TODO.BREP === --- brlcad/trunk/doc/TODO.BREP 2012-12-19 14:15:53 UTC (rev 54089) +++ brlcad/trunk/doc/TODO.BREP 2012-12-19 20:29:40 UTC (rev 54090) @@ -254,7 +254,7 @@ * Point 2, it finds that it overlaps and may intersect Point 1, but it does NOT overlap Point 3. This means * that Point 1 may intersect Point 2 OR Point 3, but NOT both at the same time. Any assumption of equality * involving any of these three points must decide how to handle this situation, and the decision must be both - * consistent and reproduceable. The possible decisions are: + * consistent and reproducible. The possible decisions are: * * 1 = 2, 1 != 3 * 1 != 2, 1 = 3 Modified: brlcad/trunk/doc/bison_to_lemon.txt === --- brlcad/trunk/doc/bison_to_lemon.txt 2012-12-19 14:15:53 UTC (rev 54089) +++ brlcad/trunk/doc/bison_to_lemon.txt 2012-12-19 20:29:40 UTC (rev 54090) @@ -92,7 +92,7 @@ Parser Resets on Fail| no | yes | yes Strategy: - The normal strategy is to ignore input tokens util valid input is + The normal strategy is to ignore input tokens until valid input is found and parsing can continue. However, if YYERRORSYMBOL is defined, the parser pops tokens from the stack until the special non-terminal 'error' can be shifted onto the stack and parsing can continue. Modified: brlcad/trunk/doc/docbook/books/README === --- brlcad/trunk/doc/docbook/books/README 2012-12-19 14:15:53 UTC (rev 54089) +++ brlcad/trunk/doc/docbook/books/README 2012-12-19 20:29:40 UTC (rev 54090) @@ -1,4 +1,4 @@ -The books subdirectory contains DocBook files intended to serve as +The books sub-directory contains DocBook files intended to serve as both individual books with new content and agglomerations of individual files into larger collections. Modified: brlcad/trunk/doc/docbook/specifications/en/BRL_CAD_g_format_V5.xml === --- brlcad/trunk/doc/docbook/specifications/en/BRL_CAD_g_format_V5.xml 2012-12-19 14:15:53 UTC (rev 54089) +++ brlcad/trunk/doc/docbook/specifications/en/BRL_CAD_g_format_V5.xml 2012-12-19 20:29:40 UTC (rev 54090) @@ -98,7 +98,7 @@
[brlcad-commits] SF.net SVN: brlcad:[54091] brlcad/trunk/AUTHORS
Revision: 54091 http://brlcad.svn.sourceforge.net/brlcad/?rev=54091view=rev Author: brlcad Date: 2012-12-19 20:33:52 + (Wed, 19 Dec 2012) Log Message: --- technically, the spelling corrections from ha and singh are edits to code, but they're not logic and not exactly documentation, so move then under special thanks Modified Paths: -- brlcad/trunk/AUTHORS Modified: brlcad/trunk/AUTHORS === --- brlcad/trunk/AUTHORS2012-12-19 20:29:40 UTC (rev 54090) +++ brlcad/trunk/AUTHORS2012-12-19 20:33:52 UTC (rev 54091) @@ -311,6 +311,7 @@ 2012 November Open Source (GCI) + CODE CONTRIBUTIONS -- @@ -630,10 +631,6 @@ 2012 December Open Source (GCI) -Ha, An Tuan -2012 December -Open Source (GCI) - Calle, Adrián Arroyo 2012 December Open Source (GCI) @@ -642,11 +639,7 @@ 2012 December Open Source (GCI) -Singh, Gauravjeet -2012 December -Open Source (GCI) - SPECIAL THANKS -- @@ -901,7 +894,15 @@ 2012 October Open Source +Ha, An Tuan +2012 December +Open Source (GCI) +Singh, Gauravjeet +2012 December +Open Source (GCI) + + CORPORATE AND ORGANIZATION SUPPORT -- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[54092] brlcad/trunk
Revision: 54092 http://brlcad.svn.sourceforge.net/brlcad/?rev=54092view=rev Author: brlcad Date: 2012-12-19 20:36:51 + (Wed, 19 Dec 2012) Log Message: --- apply another set of spelling corrections from An Ha, GCI task http://www.google-melange.com/gci/task/view/google/gci2012/7959223 Modified Paths: -- brlcad/trunk/doc/html/manuals/mged/animmate/anim_orient.html brlcad/trunk/doc/html/manuals/mged/animmate/animate.html brlcad/trunk/doc/html/manuals/mged/animmate/combine_doc.html brlcad/trunk/doc/html/manuals/mged/animmate/tabinterp.html brlcad/trunk/doc/html/manuals/mged/animmate/track_tut.html brlcad/trunk/doc/html/manuals/mged/animmate/vcurve_doc.html brlcad/trunk/misc/NIST_DENSITIES brlcad/trunk/src/mged/dozoom.c brlcad/trunk/src/mged/edsol.c Modified: brlcad/trunk/doc/html/manuals/mged/animmate/anim_orient.html === --- brlcad/trunk/doc/html/manuals/mged/animmate/anim_orient.html 2012-12-19 20:33:52 UTC (rev 54091) +++ brlcad/trunk/doc/html/manuals/mged/animmate/anim_orient.html 2012-12-19 20:36:51 UTC (rev 54092) @@ -85,7 +85,7 @@ Quaternions, in the order x,y,z,w. This is the default input and output format. The output will always be unit quaternions. For a unit quaternion, the -xyz-vector represents an axis of rotation and and w represents +xyz-vector represents an axis of rotation and w represents cos(omega/2), where omega is the angle to be rotated about the given axis. dt Modified: brlcad/trunk/doc/html/manuals/mged/animmate/animate.html === --- brlcad/trunk/doc/html/manuals/mged/animmate/animate.html2012-12-19 20:33:52 UTC (rev 54091) +++ brlcad/trunk/doc/html/manuals/mged/animmate/animate.html2012-12-19 20:36:51 UTC (rev 54092) @@ -259,7 +259,7 @@ varn-1/var. p dtbClone/b -ddThis button creates a normal table editor containing a copy of the +ddThis button creates a normal table editor containing a copy of the parameters of the view curve. This table editor can be used for all of the table editor operations such as keyboard editing, interpolation, column editing, and time estimation, @@ -586,7 +586,7 @@ Next, the user must specify an initial position and orientation for the eye. For each frame of the output view script, AnimMate moves the view to where the eye would be if it were rigidly -attached to the object, and the object were moved to the +attached to the object, and the object were moved to the position and orientation specified in the animation table. p The eye position and eye yaw, pitch, and roll can be keyboard-edited @@ -909,7 +909,7 @@ names in the list box immediately below the entry box. File names can be removed from the list box by clicking on the name with the left mouse button. p -On the right side of the widget is an entry box which contains a +On the right side of the widget is an entry box which contains a filter string. By default, the filter string is code./*.script/code, specifying the files in the current directory with the code.script/code suffix. @@ -966,7 +966,7 @@ ddThe name of the file containing the animation script pdtbMax frames per second/b ddThe maximum rate at which frames will be shown in the display -window. The display will try to run an the maximum rate, or as fast as +window. The display will try to run at the maximum rate, or as fast as MGED knows how if if no maximum rate is specified. pdtbStart frame/b ddThe frame number of the first frame in the script to be shown. Modified: brlcad/trunk/doc/html/manuals/mged/animmate/combine_doc.html === --- brlcad/trunk/doc/html/manuals/mged/animmate/combine_doc.html 2012-12-19 20:33:52 UTC (rev 54091) +++ brlcad/trunk/doc/html/manuals/mged/animmate/combine_doc.html 2012-12-19 20:36:51 UTC (rev 54092) @@ -16,7 +16,7 @@ names in the list box immediately below the entry box. File names can be removed from the list box by clicking on the name with the left mouse button. p -On the right side of the window is an entry box which contains a +On the right side of the window is an entry box which contains a filter string. By default, the filter string is code./*.script/code, identifying all files in the current directory with the code.script/code suffix. Modified: brlcad/trunk/doc/html/manuals/mged/animmate/tabinterp.html === --- brlcad/trunk/doc/html/manuals/mged/animmate/tabinterp.html 2012-12-19 20:33:52 UTC (rev 54091) +++ brlcad/trunk/doc/html/manuals/mged/animmate/tabinterp.html 2012-12-19 20:36:51 UTC (rev 54092) @@ -74,7 +74,7 @@ After all the bfile/b commands have been given, it is necessary to define over what range of -time all the values just read into the +time all the values just read into the
[brlcad-commits] SF.net SVN: brlcad:[54093] brlcad/trunk/include
Revision: 54093
http://brlcad.svn.sourceforge.net/brlcad/?rev=54093view=rev
Author: brlcad
Date: 2012-12-19 23:25:25 + (Wed, 19 Dec 2012)
Log Message:
---
gcc notices en masse that we assign string literals to non-const struct
elements. fixed by adding const qualifier. undoubtedly will need to propagate
constness elsewhere too.
Modified Paths:
--
brlcad/trunk/include/bu.h
brlcad/trunk/include/raytrace.h
Modified: brlcad/trunk/include/bu.h
===
--- brlcad/trunk/include/bu.h 2012-12-19 20:36:51 UTC (rev 54092)
+++ brlcad/trunk/include/bu.h 2012-12-19 23:25:25 UTC (rev 54093)
@@ -2182,12 +2182,12 @@
* probably shouldn't use this technique.
*/
struct bu_structparse {
-char sp_fmt[4];/** %i or %f, etc. */
+const char sp_fmt[4]; /** %i or %f, etc. */
size_t sp_count; /** number of elements */
-char *sp_name; /** Element's symbolic name */
+const char *sp_name; /** Element's symbolic name */
size_t sp_offset; /** Byte offset in struct */
void (*sp_hook)(); /** Optional hooked function, or indir ptr */
-char *sp_desc; /** description of element */
+const char *sp_desc; /** description of element */
void *sp_default; /** ptr to default value */
};
typedef struct bu_structparse bu_structparse_t;
Modified: brlcad/trunk/include/raytrace.h
===
--- brlcad/trunk/include/raytrace.h 2012-12-19 20:36:51 UTC (rev 54092)
+++ brlcad/trunk/include/raytrace.h 2012-12-19 23:25:25 UTC (rev 54093)
@@ -1632,7 +1632,7 @@
inta_level;/** @brief recursion level
(for printing) */
inta_x;/** @brief Screen X of ray,
if applicable */
inta_y;/** @brief Screen Y of ray,
if applicable */
-char * a_purpose; /** @brief Debug string: purpose of
ray */
+const char * a_purpose; /** @brief Debug string: purpose of
ray */
fastf_ta_rbeam;/** @brief initial beam radius (mm) */
fastf_ta_diverge; /** @brief slope of beam
divergence/mm */
inta_return; /** @brief Return of
a_hit()/a_miss() */
@@ -1923,9 +1923,9 @@
* Table for driving generic command-parsing routines
*/
struct command_tab {
-char *ct_cmd;
-char *ct_parms;
-char *ct_comment;
+const char *ct_cmd;
+const char *ct_parms;
+const char *ct_comment;
int(*ct_func)();
intct_min; /** @brief min number of words in cmd */
intct_max; /** @brief max number of words in cmd */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[54094] brlcad/trunk
Revision: 54094 http://brlcad.svn.sourceforge.net/brlcad/?rev=54094view=rev Author: caen23 Date: 2012-12-19 23:47:45 + (Wed, 19 Dec 2012) Log Message: --- X11 is available if the required files in both include/ and lib/ can be found (GCI: http://www.google-melange.com/gci/task/view/google/gci2012/7999218) Modified Paths: -- brlcad/trunk/CMakeLists.txt brlcad/trunk/src/libfb/tcl.c Modified: brlcad/trunk/CMakeLists.txt === --- brlcad/trunk/CMakeLists.txt 2012-12-19 23:25:25 UTC (rev 54093) +++ brlcad/trunk/CMakeLists.txt 2012-12-19 23:47:45 UTC (rev 54094) @@ -1017,11 +1017,11 @@ option(BRLCAD_ENABLE_X11 Use X11. OFF) else(WIN32) # make everywhere else depend on whether we found a suitable X11 - if(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB) + if(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH) option(BRLCAD_ENABLE_X11 Use X11. ON) - else(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB) + else(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH) option(BRLCAD_ENABLE_X11 Use X11. OFF) - endif(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB) + endif(X11_X11_LIB AND X11_Xext_LIB AND X11_Xi_LIB AND X11_Xlib_INCLUDE_PATH) endif(WIN32) mark_as_advanced(BRLCAD_ENABLE_X11) @@ -1462,13 +1462,6 @@ endif(JNI_FOUND AND JAVA_FOUND) mark_as_advanced(BRLCAD_ENABLE_RTSERVER) -# Mark X11 as available if it is enabled and we find Xlib.h -if(BRLCAD_ENABLE_X11) - if(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE) -set(HAVE_X11_XLIB_H 1) -CONFIG_H_APPEND(BRLCAD #cmakedefine HAVE_X11_XLIB_H 1\n) - endif(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE) -endif(BRLCAD_ENABLE_X11) # math library BRLCAD_CHECK_LIBRARY(M m cos) Modified: brlcad/trunk/src/libfb/tcl.c === --- brlcad/trunk/src/libfb/tcl.c2012-12-19 23:25:25 UTC (rev 54093) +++ brlcad/trunk/src/libfb/tcl.c2012-12-19 23:47:45 UTC (rev 54094) @@ -282,7 +282,7 @@ void #if !defined(IF_X) !defined(IF_WGL) !defined(IF_OGL) !defined(IF_TK) -fb_configureWindow(FBIO *UNUSED(ifp), int UNUSED(width), int UNUSED(height)) +fb_configureWindow(FBIO *ifp, int UNUSED(width), int UNUSED(height)) #else fb_configureWindow(FBIO *ifp, int width, int height) #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[54095] brlcad/trunk/CMakeLists.txt
Revision: 54095 http://brlcad.svn.sourceforge.net/brlcad/?rev=54095view=rev Author: caen23 Date: 2012-12-20 00:50:01 + (Thu, 20 Dec 2012) Log Message: --- Fix previous commit which removed some lines, causing a build failure with X11 enabled Modified Paths: -- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt === --- brlcad/trunk/CMakeLists.txt 2012-12-19 23:47:45 UTC (rev 54094) +++ brlcad/trunk/CMakeLists.txt 2012-12-20 00:50:01 UTC (rev 54095) @@ -1462,6 +1462,13 @@ endif(JNI_FOUND AND JAVA_FOUND) mark_as_advanced(BRLCAD_ENABLE_RTSERVER) +# Mark X11 as available if it is enabled and we find Xlib.h +if(BRLCAD_ENABLE_X11) + if(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE) +set(HAVE_X11_XLIB_H 1) +CONFIG_H_APPEND(BRLCAD #cmakedefine HAVE_X11_XLIB_H 1\n) + endif(X11_Xlib_INCLUDE_PATH AND CONFIG_H_FILE) +endif(BRLCAD_ENABLE_X11) # math library BRLCAD_CHECK_LIBRARY(M m cos) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[54097] brlcad/trunk/include/dvec.h
Revision: 54097 http://brlcad.svn.sourceforge.net/brlcad/?rev=54097view=rev Author: caen23 Date: 2012-12-20 02:43:46 + (Thu, 20 Dec 2012) Log Message: --- Put back float overloadings Modified Paths: -- brlcad/trunk/include/dvec.h Modified: brlcad/trunk/include/dvec.h === --- brlcad/trunk/include/dvec.h 2012-12-20 01:33:04 UTC (rev 54096) +++ brlcad/trunk/include/dvec.h 2012-12-20 02:43:46 UTC (rev 54097) @@ -66,12 +66,15 @@ public: dvec(double s); dvec(const double* vals); + dvec(const float* vals); dvec(const dvecLEN p); dvecLEN operator=(const dvecLEN p); double operator[](int index) const; void u_store(double* arr) const; + void u_store(float* arr) const; void a_store(double* arr) const; + void a_store(float* arr) const; bool operator==(const dvecLEN b) const; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
